summaryrefslogtreecommitdiffstats
path: root/mkspecs/symbian-sbsv2
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-08-28 07:48:37 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-08-28 07:48:37 (GMT)
commitd7cdd1989081a0da7746fb6ce64896c0fe85e9d5 (patch)
treea13b5f2ae04e3b4f52000e050b31a48d72c81808 /mkspecs/symbian-sbsv2
parent92718f6b01071ff4d4947b5fa8297d7ecf6d9a4b (diff)
downloadQt-d7cdd1989081a0da7746fb6ce64896c0fe85e9d5.zip
Qt-d7cdd1989081a0da7746fb6ce64896c0fe85e9d5.tar.gz
Qt-d7cdd1989081a0da7746fb6ce64896c0fe85e9d5.tar.bz2
Changed createpackage parameters to be more consistent with make targets.
Earlier createpackage required two separate parameters to define the platform and target. For example > createpackage fluidlauncher_template.pkg release armv5 Now it is changed to: > createpackage fluidlauncher_template.pkg release-armv5 This is consistent to make target what is used to do the building i.e.: > make release-armv5 The change also affected environment variables supported by 'make sisx' target. QT_SISX_PLATFORM is not any more supported, and the info is merged QT_SISX_TARGET variable. Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'mkspecs/symbian-sbsv2')
-rw-r--r--mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm8
1 files changed, 6 insertions, 2 deletions
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
index 49d9bab..96eb189 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
@@ -12,6 +12,11 @@ include $(FLMHOME)/metaflm.mk
STORE_BUILD_TARGET:=$(call sanitise,TSTORE_BUILD_$(PLATFORM_PATH)_$(CFG_PATH)_$(EXTENSION_ROOT))
CACHE_FILENAME:=$(EXTENSION_ROOT)/.make.cache
+VISUAL_CFG:=RELEASE
+ifeq "$(CFG_PATH)" "UDEB"
+VISUAL_CFG:=DEBUG
+endif
+
define qmake_store_build
FINAL:: $(STORE_BUILD_TARGET)
@@ -25,8 +30,7 @@ $(STORE_BUILD_TARGET):
echo "# make sisx target." >> $(CACHE_FILENAME) && \
echo "# Version : " >> $(CACHE_FILENAME) && \
echo "# ==============================================================================" >> $(CACHE_FILENAME) && \
- echo QT_SISX_PLATFORM ?= $(PLATFORM_PATH) >> $(CACHE_FILENAME) && \
- echo QT_SISX_TARGET ?= $(CFG_PATH) >> $(CACHE_FILENAME) \
+ echo QT_SISX_TARGET ?= $(VISUAL_CFG)-$(PLATFORM_PATH) >> $(CACHE_FILENAME) \
$(call endrule,qmake_store_build)
endef