diff options
author | axis <qt-info@nokia.com> | 2010-02-19 10:48:45 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2010-02-19 10:48:45 (GMT) |
commit | 1c48ec8f4876db0b4c7b86dd19ab8bb27c082786 (patch) | |
tree | 8ca2723a27ae670b3e84dfb21b6a3a28d3bbe401 /qmake/generators/symbian | |
parent | 0374c15075f98b0b4efbb1c00ef3812b67fabe0f (diff) | |
parent | ade4d096fc2ea145a3d9586e3ab2a9af9c5a9a72 (diff) | |
download | Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.zip Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.tar.gz Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-with-qt-master
Conflicts:
qmake/generators/symbian/symmake.cpp
Diffstat (limited to 'qmake/generators/symbian')
-rw-r--r-- | qmake/generators/symbian/symmake.cpp | 97 | ||||
-rw-r--r-- | qmake/generators/symbian/symmake.h | 1 | ||||
-rw-r--r-- | qmake/generators/symbian/symmake_abld.cpp | 33 | ||||
-rw-r--r-- | qmake/generators/symbian/symmake_abld.h | 1 | ||||
-rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 2 |
5 files changed, 0 insertions, 134 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index 503e443..75b9a6d 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -87,15 +87,6 @@ #define MMP_START_RESOURCE "START RESOURCE" #define MMP_END_RESOURCE "END" -#define SIS_TARGET "sis" -#define INSTALLER_SIS_TARGET "installer_sis" -#define ROM_STUB_SIS_TARGET "stub_sis" -#define OK_SIS_TARGET "ok_sis" -#define OK_INSTALLER_SIS_TARGET "ok_installer_sis" -#define OK_ROM_STUB_SIS_TARGET "ok_stub_sis" -#define FAIL_SIS_NOPKG_TARGET "fail_sis_nopkg" -#define FAIL_SIS_NOCACHE_TARGET "fail_sis_nocache" - QString SymbianMakefileGenerator::fixPathForMmp(const QString& origPath, const QDir& parentDir) { static QString epocRootStr; @@ -1172,94 +1163,6 @@ void SymbianMakefileGenerator::generateCleanCommands(QTextStream& t, } } -void SymbianMakefileGenerator::writeSisTargets(QTextStream &t) -{ - t << "-include " MAKE_CACHE_NAME << endl; - t << endl; - - t << SIS_TARGET ":" << endl; - QString siscommand = QString::fromLatin1("\t$(if $(wildcard %1_template.%2),$(if $(wildcard %3)," \ - "$(MAKE) -s -f $(MAKEFILE) %4," \ - "$(if $(QT_SIS_TARGET),$(MAKE) -s -f $(MAKEFILE) %4," \ - "$(MAKE) -s -f $(MAKEFILE) %5))," \ - "$(MAKE) -s -f $(MAKEFILE) %6)") - .arg(fixedTarget) - .arg("pkg") - .arg(MAKE_CACHE_NAME) - .arg(OK_SIS_TARGET) - .arg(FAIL_SIS_NOCACHE_TARGET) - .arg(FAIL_SIS_NOPKG_TARGET); - t << siscommand << endl; - t << endl; - - t << OK_SIS_TARGET ":" << endl; - - QString pkgcommand = QString::fromLatin1("\tcreatepackage" SCRIPT_EXT " $(QT_SIS_OPTIONS) %1_template.%2 $(QT_SIS_TARGET) " \ - "$(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)") - .arg(fixedTarget) - .arg("pkg"); - t << pkgcommand << endl; - t << endl; - - QString sisName = fixedTarget; - sisName += ".sis"; - - t << sisName << ":" << endl; - t << "\t$(MAKE) -s -f $(MAKEFILE) " SIS_TARGET << endl << endl; - - t << ROM_STUB_SIS_TARGET ":" << endl; - QString stubsiscommand = QString::fromLatin1("\t$(if $(wildcard %1_template.%2),$(if $(wildcard %3)," \ - "$(MAKE) -s -f $(MAKEFILE) %4," \ - "$(if $(QT_SIS_TARGET),$(MAKE) -s -f $(MAKEFILE) %4," \ - "$(MAKE) -s -f $(MAKEFILE) %5))," \ - "$(MAKE) -s -f $(MAKEFILE) %6)") - .arg(fixedTarget) - .arg("pkg") - .arg(MAKE_CACHE_NAME) - .arg(OK_ROM_STUB_SIS_TARGET) - .arg(FAIL_SIS_NOCACHE_TARGET) - .arg(FAIL_SIS_NOPKG_TARGET); - t << stubsiscommand << endl; - t << endl; - - t << OK_ROM_STUB_SIS_TARGET ":" << endl; - - QString stubpkgcommand = QString::fromLatin1("\tcreatepackage" SCRIPT_EXT " -s $(QT_SIS_OPTIONS) %1_template.%2 $(QT_SIS_TARGET) " \ - "$(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)") - .arg(fixedTarget) - .arg("pkg"); - t << stubpkgcommand << endl; - t << endl; - - t << INSTALLER_SIS_TARGET ": " << sisName << endl; - siscommand = QString::fromLatin1("\t$(if $(wildcard %1_installer.%2)," \ - "$(MAKE) -s -f $(MAKEFILE) %3," \ - "$(MAKE) -s -f $(MAKEFILE) %4)") - .arg(fixedTarget) - .arg("pkg") - .arg(OK_INSTALLER_SIS_TARGET) - .arg(FAIL_SIS_NOPKG_TARGET); - t << siscommand << endl; - t << endl; - - t << OK_INSTALLER_SIS_TARGET ": " << endl; - - pkgcommand = QString::fromLatin1("\tcreatepackage.bat $(QT_SIS_OPTIONS) %1_installer.%2 - " \ - "$(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)") - .arg(fixedTarget) - .arg("pkg"); - t << pkgcommand << endl; - t << endl; - - t << FAIL_SIS_NOPKG_TARGET ":" << endl; - t << "\t$(error PKG file does not exist, '" SIS_TARGET "' and '" INSTALLER_SIS_TARGET "' target are only supported for executables or projects with DEPLOYMENT statement)" << endl; - t << endl; - - t << FAIL_SIS_NOCACHE_TARGET ":" << endl; - t << "\t$(error Project has to be built or QT_SIS_TARGET environment variable has to be set before calling 'SIS' target)" << endl; - t << endl; -} - void SymbianMakefileGenerator::generateDistcleanTargets(QTextStream& t) { t << "dodistclean:" << endl; diff --git a/qmake/generators/symbian/symmake.h b/qmake/generators/symbian/symmake.h index 7ff1ce9..b915ba7 100644 --- a/qmake/generators/symbian/symmake.h +++ b/qmake/generators/symbian/symmake.h @@ -119,7 +119,6 @@ protected: const QString& itemPrefix, const QString& itemSuffix); - void writeSisTargets(QTextStream &t); void generateDistcleanTargets(QTextStream& t); void generateExecutionTargets(QTextStream& t, const QStringList& platforms); diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index 10c201c..5dfdacc 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -368,10 +368,6 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool writeDeploymentTargets(t); - writeSisTargets(t); - - writeStoreBuildTarget(t); - generateDistcleanTargets(t); t << "clean: $(ABLD)" << endl; @@ -446,35 +442,6 @@ bool SymbianAbldMakefileGenerator::writeDeploymentTargets(QTextStream &t) return true; } -void SymbianAbldMakefileGenerator::writeStoreBuildTarget(QTextStream &t) -{ -#ifdef Q_OS_WIN -#define HASH "#" -#define EMPTYECHO "." -#else -#define HASH "\\#" -#define EMPTYECHO -#endif - - t << STORE_BUILD_TARGET ":" << endl; - t << "\t@echo " HASH " ============================================================================== > " MAKE_CACHE_NAME << endl; - t << "\t@echo " HASH " This file is generated by make and should not be modified by the user >> " MAKE_CACHE_NAME << endl; - t << "\t@echo " HASH " Name : " << MAKE_CACHE_NAME << " >> " MAKE_CACHE_NAME << endl; - t << "\t@echo " HASH " Part of : " << project->values("TARGET").join(" ") << " >> " MAKE_CACHE_NAME << endl; - t << "\t@echo " HASH " Description : This file is used to cache last build target for >> " MAKE_CACHE_NAME << endl; - t << "\t@echo " HASH " make sis target. >> " MAKE_CACHE_NAME << endl; - t << "\t@echo " HASH " Version : >> " MAKE_CACHE_NAME << endl; - t << "\t@echo " HASH " >> " MAKE_CACHE_NAME << endl; - t << "\t@echo " HASH " ============================================================================== >> " MAKE_CACHE_NAME << endl; - t << "\t@echo" EMPTYECHO " >> " MAKE_CACHE_NAME << endl; - t << "\t@echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> " MAKE_CACHE_NAME << endl; - t << endl; - - generatedFiles << MAKE_CACHE_NAME; -#undef HASH -#undef EMPTYECHO -} - void SymbianAbldMakefileGenerator::writeBldInfMkFilePart(QTextStream& t, bool addDeploymentExtension) { // Normally emulator deployment gets done via regular makefile, but since subdirs diff --git a/qmake/generators/symbian/symmake_abld.h b/qmake/generators/symbian/symmake_abld.h index 25b06bb..d0f38b0 100644 --- a/qmake/generators/symbian/symmake_abld.h +++ b/qmake/generators/symbian/symmake_abld.h @@ -57,7 +57,6 @@ protected: virtual void writeWrapperMakefile(QFile& wrapperFile, bool isPrimaryMakefile); virtual void appendAbldTempDirs(QStringList& sysincspaths, QString includepath); - void writeStoreBuildTarget(QTextStream &t); bool writeDeploymentTargets(QTextStream &t); public: diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index 7ab46e2..421ba15 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -231,8 +231,6 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo qDeleteAll(subtargets); } - writeSisTargets(t); - generateDistcleanTargets(t); t << "clean: " << BLD_INF_FILENAME << endl; |