FCL/sf/mw/qt: comparison qmake/generators/symbian/symmake

equal deleted inserted replaced

-:41300fa6a67c
+:f7bc934e204c
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qdir.h>
 #include <qdatetime.h>
 #include <qdebug.h>
+// Included from tools/shared
+#include <symbian/epocroot.h>
 SymbianSbsv2MakefileGenerator::SymbianSbsv2MakefileGenerator() : SymbianMakefileGenerator() { }
 SymbianSbsv2MakefileGenerator::~SymbianSbsv2MakefileGenerator() { }
 #define FLM_DEST_DIR "epoc32/tools/makefile_templates/qt"
 }
 flmExportDone = true;
 }
 }
+void SymbianSbsv2MakefileGenerator::writeSbsDeploymentList(const DeploymentList& depList, QTextStream& t)
+{
+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("\\", "/");
+#if defined(Q_OS_WIN)
+toItem.prepend(QDir::current().absolutePath().left(2)); // add drive
+#endif
+t << "OPTION DEPLOY_SOURCE " << fromItem << endl;
+t << "OPTION DEPLOY_TARGET " << toItem << endl;
+t << "END" << endl;
+}
+}
 void SymbianSbsv2MakefileGenerator::writeMkFile(const QString& wrapperFileName, bool deploymentOnly)
 {
 // Can't use extension makefile with sbsv2
 Q_UNUSED(wrapperFileName);
 Q_UNUSED(deploymentOnly);
 QStringList debugPlatforms = allPlatforms;
 QStringList releasePlatforms = allPlatforms;
 releasePlatforms.removeAll("winscw"); // No release for emulator
 QString testClause;
-if (project->values("CONFIG").contains("symbian_test", Qt::CaseInsensitive))
+if (project->isActiveConfig(SYMBIAN_TEST_CONFIG))
 testClause = QLatin1String(".test");
 else
 testClause = QLatin1String("");
 QTextStream t(&wrapperFile);
 t << endl;
 t << "MAKEFILE          = " << wrapperFile.fileName() << endl;
 t << "QMAKE             = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl;
 t << "DEL_FILE          = " << var("QMAKE_DEL_FILE") << endl;
 t << "DEL_DIR           = " << var("QMAKE_DEL_DIR") << endl;
+t << "CHK_DIR_EXISTS    = " << var("QMAKE_CHK_DIR_EXISTS") << endl;
+t << "MKDIR             = " << var("QMAKE_MKDIR") << endl;
 t << "MOVE              = " << var("QMAKE_MOVE") << endl;
 t << "DEBUG_PLATFORMS   = " << debugPlatforms.join(" ") << endl;
 t << "RELEASE_PLATFORMS = " << releasePlatforms.join(" ") << endl;
 t << "MAKE              = make" << endl;
 t << "SBS               = sbs" << endl;
 t << endl;
 t << BLD_INF_FILENAME ":" << endl;
 t << "\t$(QMAKE)" << endl;
 t << endl;
+QString winscw("winscw");
 t << "debug: " << BLD_INF_FILENAME << endl;
+t << "\t$(SBS)";
 foreach(QString item, debugPlatforms) {
-t << "\t$(SBS) -c " << item << "_udeb" << testClause << endl;
+if(QString::compare(item, winscw) == 0)
+t << " -c " << item << "_udeb.mwccinc" << testClause;
+else
+t << " -c " << item << "_udeb" << testClause;
 }
 t << endl;
 t << "release: " << BLD_INF_FILENAME << endl;
+t << "\t$(SBS)";
 foreach(QString item, releasePlatforms) {
-t << "\t$(SBS) -c " << item << "_urel" << testClause << endl;
+if(QString::compare(item, winscw) == 0)
-}
+t << " -c " << item << "_urel.mwccinc" << testClause;
-t << endl;
+else
+t << " -c " << item << "_urel" << testClause;
-QString winscw("winscw");
+}
+t << endl;
 // For more specific builds, targets are in this form: build-platform, e.g. release-armv5
 foreach(QString item, debugPlatforms) {
 t << "debug-" << item << ": " << BLD_INF_FILENAME << endl;
 if(QString::compare(item, winscw) == 0)
 t << "\t$(SBS) -c " << item << "_udeb.mwccinc" << testClause << endl;
 t << "clean: " << BLD_INF_FILENAME << endl;
 t << "\t-$(SBS) reallyclean" << endl;
 t << endl;
-// create execution target
+t << "clean-debug: " << BLD_INF_FILENAME << endl;
-if (debugPlatforms.contains("winscw") && targetType == TypeExe) {
+t << "\t$(SBS) reallyclean";
-t << "run:" << endl;
+foreach(QString item, debugPlatforms) {
-t << "\t-call " << epocRoot() << "epoc32/release/winscw/udeb/" << fixedTarget << ".exe" << endl << endl;
+t << " -c " << item << "_udeb" << testClause;
 }
+t << endl;
+t << "clean-release: " << BLD_INF_FILENAME << endl;
+t << "\t$(SBS) reallyclean";
+foreach(QString item, releasePlatforms) {
+t << " -c " << item << "_urel" << testClause;
+}
+t << endl;
+// For more specific builds, targets are in this form: clean-build-platform, e.g. clean-release-armv5
+foreach(QString item, debugPlatforms) {
+t << "clean-debug-" << item << ": " << BLD_INF_FILENAME << endl;
+t << "\t$(SBS) reallyclean -c " << item << "_udeb" << testClause << endl;
+}
+foreach(QString item, releasePlatforms) {
+t << "clean-release-" << item << ": " << BLD_INF_FILENAME << endl;
+t << "\t$(SBS) reallyclean -c " << item << "_urel" << testClause << endl;
+}
+t << endl;
+generateExecutionTargets(t, debugPlatforms);
 }
 void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t, const QString &iconTargetFile)
 {
 // Makes sure we have needed FLMs in place.
 absoluteDeps.append(fileInfo(depItem).absoluteFilePath());
 absoluteDeps.append(" ");
 }
 }
-t << "START EXTENSION qt/qmake_extra_pre_targetdep" << endl;
+t << "START EXTENSION qt/qmake_extra_pre_targetdep.export" << endl;
 t << "OPTION PREDEP_TARGET " << absoluteTarget << endl;
 t << "OPTION DEPS " << absoluteDeps << endl;
 if (commandItem.indexOf("$(INCPATH)") != -1)
 commandItem.replace("$(INCPATH)", incPath.join(" "));
 QString translationFilename = project->first("TRANSLATIONS");
 if (!project->values("SYMBIANTRANSLATIONS").isEmpty() && !translationFilename.isEmpty()) {
 QStringList symbianTranslations = project->values("SYMBIANTRANSLATIONS");
 QString symbianTrPath = project->first("SYMBIANTRANSLATIONDIR");
+QString symbianTrSrcPath = project->first("SYMBIANTRANSLATIONSRCDIR");
+QString symbianWinscwUdebQmPath = project->first("SYMBIANWINSCWUDEBTRANSLATIONDIR");
+QString symbianWinscwUrelQmPath = project->first("SYMBIANWINSCWURELTRANSLATIONDIR");
 foreach (const QString &symbianTrans, symbianTranslations) {
 QString translationTsFilename(translationFilename);
 translationTsFilename.chop(3);
 translationTsFilename.insert(0,symbianTrPath);
 translationTsFilename.append(QString::fromLatin1("_"));
 translationTsFilename.append(symbianTrans);
 QString translationQmFilename(translationTsFilename);
-translationTsFilename.append(QString::fromLatin1(".ts"));
-translationQmFilename.append(QString::fromLatin1(".qm"));
+translationTsFilename.append(QString::fromLatin1(".ts"));
+// output path for armv5 qm files./epoc32/data/z/resource/qt/translations/
+translationQmFilename.append(QString::fromLatin1(".qm"));
+										// input path for ts files. /epoc32/include/platform/qt/translations/
+QString translationTsSrcFilename(translationFilename);
+translationTsSrcFilename.chop(3);
+translationTsSrcFilename.insert(0,symbianTrSrcPath);
+translationTsSrcFilename.append(QString::fromLatin1("_"));
+translationTsSrcFilename.append(symbianTrans);
+translationTsSrcFilename.append(QString::fromLatin1(".ts"));
+										// output path for winscw qm files. /epoc32/release/winscw/udeb/z/resource/qt/translations/
+QString translationQmWinscwUdebFilename(translationFilename);
+translationQmWinscwUdebFilename.chop(3);
+translationQmWinscwUdebFilename.insert(0,symbianWinscwUdebQmPath);
+translationQmWinscwUdebFilename.append(QString::fromLatin1("_"));
+translationQmWinscwUdebFilename.append(symbianTrans);
+translationQmWinscwUdebFilename.append(QString::fromLatin1(".qm"));
+										// output path for winscw qm files. /epoc32/release/winscw/urel/z/resource/qt/translations/
+QString translationQmWinscwUrelFilename(translationFilename);
+translationQmWinscwUrelFilename.chop(3);
+translationQmWinscwUrelFilename.insert(0,symbianWinscwUrelQmPath);
+translationQmWinscwUrelFilename.append(QString::fromLatin1("_"));
+translationQmWinscwUrelFilename.append(symbianTrans);
+translationQmWinscwUrelFilename.append(QString::fromLatin1(".qm"));
 t << "START EXTENSION qt/ts2qm" << endl;
-t << "OPTION TSFILE " << translationTsFilename << endl;
+t << "OPTION TSFILE " << translationTsSrcFilename << endl;
 t << "OPTION QMFILE " << translationQmFilename << endl;
 t << "END" << endl;
 t << endl;
-}
-}
+//winscw udeb
+t << "START EXTENSION qt/ts2qm" << endl;
-// Write winscw deployment rules
+t << "OPTION TSFILE " << translationTsSrcFilename << endl;
+t << "OPTION QMFILE " << translationQmWinscwUdebFilename << endl;
+t << "END" << endl;
+t << endl;
+//winscw urel
+t << "START EXTENSION qt/ts2qm" << endl;
+t << "OPTION TSFILE " << translationTsSrcFilename << endl;
+t << "OPTION QMFILE " << translationQmWinscwUrelFilename << endl;
+t << "END" << endl;
+t << endl;
+}
+}
+// Write deployment rules
 QString remoteTestPath = epocRoot() + QLatin1String("epoc32/winscw/c/private/") + privateDirUid;
 DeploymentList depList;
-initProjectDeploySymbian(project, depList, remoteTestPath, false, QLatin1String("winscw"), QLatin1String("udeb"), generatedDirs, generatedFiles);
+//write emulator deployment
-//:QTP:QTPROD-92 Deployment of plugins requires WINSCW build before ARM build
 t << "#if defined(WINSCW)" << endl;
-//write WINSCW deployment
+initProjectDeploySymbian(project, depList, remoteTestPath, false,
-writeSbsDeploymentList(depList, t);
+QLatin1String(EMULATOR_DEPLOYMENT_PLATFORM), QString(), generatedDirs, generatedFiles);
-t << "#else" << endl;
-//write ARMV5 deployment
-	remoteTestPath = epocRoot() + QLatin1String("epoc32/data/z/private/") + privateDirUid;
-depList.clear();
-generatedDirs.clear();
-generatedFiles.clear();
-initProjectDeploySymbian(project, depList, remoteTestPath, false, QLatin1String("armv5"), QLatin1String("urel"), generatedDirs, generatedFiles);
 writeSbsDeploymentList(depList, t);
 t << "#endif" << endl;
+//write ROM deployment
+remoteTestPath = epocRoot() + QLatin1String("epoc32/data/z/private/") + privateDirUid;
+depList.clear();
+initProjectDeploySymbian(project, depList, remoteTestPath, false,
+QLatin1String(ROM_DEPLOYMENT_PLATFORM), QString(), generatedDirs, generatedFiles);
+writeSbsDeploymentList(depList, t);
 t << endl;
 // Write post link rules
 if (!project->isEmpty("QMAKE_POST_LINK")) {
 t << "START EXTENSION qt/qmake_post_link" << endl;
 t << "OPTION TARGETFILE " << iconTarget << endl;
 t << "OPTION SVGENCODINGVERSION 3" << endl; // Compatibility with S60 3.1 devices and up
 t << "END" << endl;
 }
-/* :QTP:QTPROD-155: Don't write .make.cache during the compilation, it causes dependency problems in
-* the parallel build clusters
 t << "START EXTENSION qt/qmake_store_build" << endl;
 t << "END" << endl;
 t << endl;
-*/
 t << endl;
 }
 void SymbianSbsv2MakefileGenerator::writeBldInfMkFilePart(QTextStream& t, bool addDeploymentExtension)

changeset 7	f7bc934e204c
parent 3	41300fa6a67c