MCL/sf/mw/qt: comparison qmake/generators/symbian/symmake.cpp

equal deleted inserted replaced

-:41300fa6a67c
+:3b1da2848fc7
 /****************************************************************************
 **
-** 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.
 **
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
 #include "symmake.h"
-#include "initprojectdeploy_symbian.h"
 #include <qstring.h>
 #include <qhash.h>
 #include <qstringlist.h>
 #include <qdir.h>
 #include <qdatetime.h>
 #include <stdlib.h>
 #include <qdebug.h>
 #include <qxmlstream.h>
-#include <qsettings>
+#include <QSettings>
 #define RESOURCE_DIRECTORY_MMP "/resource/apps"
 #define RESOURCE_DIRECTORY_RESOURCE "\\\\resource\\\\apps\\\\"
 #define REGISTRATION_RESOURCE_DIRECTORY_HW "/private/10003a3f/import/apps"
 #define PLUGIN_COMMON_DEF_FILE_FOR_MMP "./plugin_common.def"
 #define BLD_INF_RULES_BASE "BLD_INF_RULES."
 #define BLD_INF_TAG_PLATFORMS "prj_platforms"
 #define BLD_INF_TAG_MMPFILES "prj_mmpfiles"
 #define BLD_INF_TAG_TESTMMPFILES "prj_testmmpfiles"
 #define BLD_INF_TAG_EXTENSIONS "prj_extensions"
+#define BLD_INF_TAG_EXPORTS "prj_exports"
 #define RSS_RULES "RSS_RULES"
 #define RSS_RULES_BASE "RSS_RULES."
 #define RSS_TAG_NBROFICONS "number_of_icons"
 #define RSS_TAG_ICONFILE "icon_file"
 #define SIS_TARGET "sis"
 #define OK_SIS_TARGET "ok_sis"
 #define FAIL_SIS_NOPKG_TARGET "fail_sis_nopkg"
 #define FAIL_SIS_NOCACHE_TARGET "fail_sis_nocache"
-#define RESTORE_BUILD_TARGET "restore_build"
 #define PRINT_FILE_CREATE_ERROR(filename) fprintf(stderr, "Error: Could not create '%s'\n", qPrintable(filename));
 QString SymbianMakefileGenerator::fixPathForMmp(const QString& origPath, const QDir& parentDir)
 {
 // Get the application translations and convert to symbian OS lang code, i.e. decical number
 QStringList symbianLangCodes = symbianLangCodesFromTsFiles();
 // Generate pkg files if there are any actual files to deploy
 bool generatePkg = false;
+DeploymentList depList;
 if (targetType == TypeExe) {
 generatePkg = true;
 } else {
 foreach(QString item, project->values("DEPLOYMENT")) {
 if (!project->values(item + ".sources").isEmpty()) {
 }
 }
 }
 if (generatePkg) {
-generatePkgFile(iconFile);
+generatePkgFile(iconFile, depList);
 }
-writeBldInfContent(t, generatePkg, iconFile);
+writeBldInfContent(t, generatePkg, iconFile, depList);
 // Generate empty wrapper makefile here, because wrapper makefile must exist before writeMkFile,
 // but all required data is not yet available.
 bool isPrimaryMakefile = true;
 QString wrapperFileName("Makefile");
 writeWrapperMakefile(wrapperMakefile, isPrimaryMakefile);
 return true;
 }
-void SymbianMakefileGenerator::generatePkgFile(const QString &iconFile)
+void SymbianMakefileGenerator::generatePkgFile(const QString &iconFile, DeploymentList &depList)
 {
 QString pkgFilename = QString("%1_template.%2")
 .arg(fixedTarget)
 .arg("pkg");
 QFile pkgFile(pkgFilename);
 }
 }
 }
 // deploy any additional DEPLOYMENT  files
-DeploymentList depList;
 QString remoteTestPath;
 remoteTestPath = QString("!:\\private\\%1").arg(privateDirUid);
 initProjectDeploySymbian(project, depList, remoteTestPath, true, "$(PLATFORM)", "$(TARGET)", generatedDirs, generatedFiles);
 if (depList.size())
 }
 }
 }
 }
-void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploymentExtension, const QString &iconFile)
+void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploymentExtension, const QString &iconFile, DeploymentList &depList)
 {
 // Read user defined bld inf rules
 QMap<QString, QStringList> userBldInfRules;
 for (QMap<QString, QStringList>::iterator it = project->variables().begin(); it != project->variables().end(); ++it) {
 str.replace(QString(" "), QString("_"));
 }
 void SymbianMakefileGenerator::writeSisTargets(QTextStream &t)
 {
-t << SIS_TARGET ": " RESTORE_BUILD_TARGET << endl;
+t << "-include " MAKE_CACHE_NAME << endl;
+t << endl;
+t << SIS_TARGET ":" << endl;
 QString siscommand = QString("\t$(if $(wildcard %1_template.%2),$(if $(wildcard %3)," \
-"$(MAKE) -s -f $(MAKEFILE) %4,$(MAKE) -s -f $(MAKEFILE) %5)," \
+"$(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)
 t << FAIL_SIS_NOPKG_TARGET ":" << endl;
 t << "\t$(error PKG file does not exist, 'SIS' target is 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 build before calling 'SIS' 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;
-t << RESTORE_BUILD_TARGET ":" << endl;
-t << "-include " MAKE_CACHE_NAME << endl;
 t << endl;
 }
 void SymbianMakefileGenerator::generateDistcleanTargets(QTextStream& t)
 {
 t << endl;
 t << "distclean: clean dodistclean" << endl;
 t << endl;
 }
+void SymbianMakefileGenerator::generateExecutionTargets(QTextStream& t, const QStringList& platforms)
+{
+// create execution targets
+if (targetType == TypeExe) {
+if (platforms.contains("winscw")) {
+t << "run:" << endl;
+t << "\t-call " << epocRoot() << "epoc32/release/winscw/udeb/" << fixedTarget << ".exe " << "$(QT_RUN_OPTIONS)" << endl;
+}
+t << "runonphone: sis" << endl;
+t << "\trunonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis " << fixedTarget << "_$(QT_SIS_TARGET).sis " << fixedTarget << ".exe " << "$(QT_RUN_OPTIONS)" << endl;
+t << endl;
+}
+}

branch	RCL_3
changeset 4	3b1da2848fc7
parent 3	41300fa6a67c
child 5	d3bac044e0f0