Skip to content
Snippets Groups Projects
Commit e55c346f authored by Alessandro Portale's avatar Alessandro Portale
Browse files

Clean up the deployment part (a bit)

parent 0a43a6fe
No related branches found
No related tags found
No related merge requests found
...@@ -47,9 +47,8 @@ symbian { ...@@ -47,9 +47,8 @@ symbian {
copyCommand = @echo Copying application data... copyCommand = @echo Copying application data...
for(deploymentfolder, DEPLOYMENTFOLDERS) { for(deploymentfolder, DEPLOYMENTFOLDERS) {
source = $$eval($${deploymentfolder}.source) source = $$eval($${deploymentfolder}.source)
target = $$eval($${deploymentfolder}.target)
pathSegments = $$split(source, /) pathSegments = $$split(source, /)
sourceAndTarget = $$PWD/$$source $$OUT_PWD/$$target/$$last(pathSegments) sourceAndTarget = $$PWD/$$source $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(pathSegments)
copyCommand += && $(COPY_DIR) $$replace(sourceAndTarget, /, \\) copyCommand += && $(COPY_DIR) $$replace(sourceAndTarget, /, \\)
} }
copydeploymentfolders.commands = $$copyCommand copydeploymentfolders.commands = $$copyCommand
...@@ -80,10 +79,9 @@ symbian { ...@@ -80,10 +79,9 @@ symbian {
!isEqual(PWD,$$OUT_PWD) { !isEqual(PWD,$$OUT_PWD) {
copyCommand = @echo Copying application data... copyCommand = @echo Copying application data...
for(deploymentfolder, DEPLOYMENTFOLDERS) { for(deploymentfolder, DEPLOYMENTFOLDERS) {
source = $$eval($${deploymentfolder}.source) target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(pathSegments)
copyCommand += && $(MKDIR) $$target copyCommand += && $(MKDIR) $$target
copyCommand += && $(COPY_DIR) $$PWD/$$source $$target copyCommand += && $(COPY_DIR) $$PWD/$$eval($${deploymentfolder}.source) $$target
} }
copydeploymentfolders.commands = $$copyCommand copydeploymentfolders.commands = $$copyCommand
first.depends = $(first) copydeploymentfolders first.depends = $(first) copydeploymentfolders
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment