diff options
| -rw-r--r-- | mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm | 21 | ||||
| -rw-r--r-- | mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm | 2 | ||||
| -rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 4 |
3 files changed, 17 insertions, 10 deletions
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm index 8c5ad9e..354ce26 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm +++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm @@ -10,25 +10,30 @@ include $(FLMHOME)/metaflm.mk SINGLETON:=$(call sanitise,TARGET_$(DEPLOY_TARGET)) +CLEAN_TARGET:= define qmake_emulator_deployment -$(ALLTARGET):: $(DEPLOY_TARGET) -FINAL:: $(DEPLOY_TARGET) +$(ALLTARGET):: $(1) +FINAL::$(1) # Prevent duplicate targets from being created $(SINGLETON):=1 -$(DEPLOY_TARGET): $(DEPLOY_SOURCE) +CLEAN_TARGET:=$(1) + +$(1): $(2) $(call startrule,qmake_emulator_deployment) \ - $(GNUCP) -u -T $(DEPLOY_SOURCE) $(DEPLOY_TARGET) \ - $(call endrule,qmake_emulator_deployment) + $(GNUCP) --no-preserve=mode $(2) "$$@" && \ + $(GNUCHMOD) a+rw "$$@" \ + $(call endrule,qmake_emulator_deployment) endef ifeq ($($(SINGLETON)),) -$(eval $(qmake_emulator_deployment)) +$(eval $(call qmake_emulator_deployment, $(subst $(CHAR_SPACE),\$(CHAR_SPACE),$(DEPLOY_TARGET)), $(subst $(CHAR_SPACE),\$(CHAR_SPACE),$(DEPLOY_SOURCE)))) +$(call makepath,$(dir $(DEPLOY_TARGET))) +$(eval $(call GenerateStandardCleanTarget,$(CLEAN_TARGET),'')) endif -$(call makepathfor,$(DEPLOY_TARGET)) -$(eval $(call GenerateStandardCleanTarget,$(DEPLOY_TARGET),'')) + diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm index b6f5961..9dc529f 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm +++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm @@ -28,8 +28,8 @@ endef ifeq ($($(SINGLETON)),) $(eval $(qmake_extra_pre_targetdep)) +$(eval $(call GenerateStandardCleanTarget,$(PREDEP_TARGET),'')) endif -$(eval $(call GenerateStandardCleanTarget,$(PREDEP_TARGET),'')) diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index 2a15ee5..541226f 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -350,16 +350,18 @@ bool SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t DeploymentList depList; initProjectDeploySymbian( project, depList, remoteTestPath, false, QLatin1String("winscw"), QLatin1String("udeb"), generatedDirs, generatedFiles ); + t << "#if defined(WINSCW)" << endl; for (int i=0; i<depList.size(); ++i) { t << "START EXTENSION qt/qmake_emulator_deployment" << endl; QString fromItem = depList.at(i).from; QString toItem = depList.at(i).to; fromItem.replace("\\", "/"); - toItem.replace("\\", "/"); + toItem.replace("\\", "/").prepend(QDir::current().absolutePath().left(2)); // add drive t << "OPTION DEPLOY_SOURCE " << fromItem << endl; t << "OPTION DEPLOY_TARGET " << toItem << endl; t << "END" << endl; } + t << "#endif" << endl; t << endl; #endif |