mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-30 15:52:12 +01:00
No more .svn r/o subdirectories, no need to remove them
This commit is contained in:
parent
af8e7c38f8
commit
2ca0dc72cc
@ -8,14 +8,8 @@ DATACOLLECTIONS = dials models pfd sounds diagrams mapicons
|
|||||||
equals(copydata, 1) {
|
equals(copydata, 1) {
|
||||||
for(dir, DATACOLLECTIONS) {
|
for(dir, DATACOLLECTIONS) {
|
||||||
exists($$GCS_SOURCE_TREE/share/openpilotgcs/$$dir) {
|
exists($$GCS_SOURCE_TREE/share/openpilotgcs/$$dir) {
|
||||||
# remove r/o and hidden attributes from .svn/* files from old build: they prevent copy over with cp -rp
|
|
||||||
win32:data_copy.commands += -@attrib -R -S -H $$targetPath(\"$$GCS_DATA_PATH/$$dir/*\") /S /D >nul 2>&1 $$addNewline()
|
|
||||||
|
|
||||||
macx:data_copy.commands += $(COPY_DIR) $$targetPath(\"$$GCS_SOURCE_TREE/share/openpilotgcs/$$dir\") $$targetPath(\"$$GCS_DATA_PATH/\") $$addNewline()
|
macx:data_copy.commands += $(COPY_DIR) $$targetPath(\"$$GCS_SOURCE_TREE/share/openpilotgcs/$$dir\") $$targetPath(\"$$GCS_DATA_PATH/\") $$addNewline()
|
||||||
!macx:data_copy.commands += $(COPY_DIR) $$targetPath(\"$$GCS_SOURCE_TREE/share/openpilotgcs/$$dir\") $$targetPath(\"$$GCS_DATA_PATH/$$dir\") $$addNewline()
|
!macx:data_copy.commands += $(COPY_DIR) $$targetPath(\"$$GCS_SOURCE_TREE/share/openpilotgcs/$$dir\") $$targetPath(\"$$GCS_DATA_PATH/$$dir\") $$addNewline()
|
||||||
|
|
||||||
# remove r/o and hidden attributes from .svn/* files: they prevent cleaning with rm -rf
|
|
||||||
win32:data_copy.commands += attrib -R -S -H $$targetPath(\"$$GCS_DATA_PATH/$$dir/*\") /S /D $$addNewline()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user