summaryrefslogtreecommitdiffstats
path: root/mkspecs/symbian-sbsv2
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year to 2011.Jason McDonald2011-01-116-6/+6
| | | | | Reviewed-by: Trust Me (cherry picked from commit ac5c099cc3c5b8c7eec7a49fdeb8a21037230350)
* Prepend epocroot to extra target tools if they start with /epoc32/Miikka Heikkinen2010-10-181-0/+4
| | | | | | | | | | | | | | This makes it possible to define extra targets and extra compilers commands that use tools under EPOCROOT without having to worry whether EPOCROOT contains drive letter or not, which is demanded by sbsv2 toolchain. For example, if command to be used is "%EPOCROOT%epoc32/tools/foobar.exe", the EPOCROOT should be omitted in .pro file and the command be given simply as "/epoc32/tools/foobar.exe". Reviewed-by: Janne Koskinen
* Added --remove-destination to qmake_emulator_deployment.flmMiikka Heikkinen2010-10-131-1/+1
| | | | | | | This will fix the issue with deploying files when destination is owned by another user. Reviewed-by: TrustMe
* Fix gcce building of apps using static libraries in symbian-sbsv2Miikka Heikkinen2010-08-312-2/+1
| | | | | | | | | Removed usage of buggy .release_gcce target from symbian-sbsv2 generated makefiles. Now gcce builds like armv5 as it is supposed to when using Raptor. Task-number: QTBUG-13307 Reviewed-by: axis
* Gcce building support for symbian-sbsv2Miikka Heikkinen2010-08-112-1/+2
| | | | | | | | | It is now possible to use "release-gcce" and "debug-gcce" targets in symbian-sbsv2 mkspec. Exports and cleans should also now work properly for all target platforms under symbian-sbsv2. Task-number: QTBUG-12762 Reviewed-by: Jason Barron
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-03-181-0/+2
|\ | | | | | | | | Conflicts: qmake/generators/symbian/symmake_abld.cpp
| * Make sure target path exists in qmake_extra_pre_targetdep.flmMiikka Heikkinen2010-03-161-0/+2
| | | | | | | | | | | | | | | | | | | | Since newer versions of Raptor delete all empty parent directories when cleaning up the files, qmake created moc output directories get also deleted when sbs clean is invoked. Fixed by always creating the extra compiler target directory during build. Task-number: QTBUG-6795 Reviewed-by: Janne Koskinen
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-161-0/+43
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/embedded/anomaly/anomaly.pro demos/embedded/flightinfo/flightinfo.pro demos/embedded/lightmaps/lightmaps.pro demos/embedded/weatherinfo/weatherinfo.pro examples/network/fortuneclient/fortuneclient.pro examples/network/fortuneserver/fortuneserver.pro examples/network/network-chat/network-chat.pro mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/platform_paths.prf qmake/generators/symbian/symmake.cpp qmake/generators/symbian/symmake.h src/s60installs/s60installs.pro
| * \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-151-0/+43
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| | * Added forwarding headers for qplatformdefs.h in Symbian mkspecsMiikka Heikkinen2010-03-101-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | Missing qplatformdefs.h file caused configure to fail on Linux environments. Part of QtP delta reduction effort. Reviewed-by: axis
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-111-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-261-0/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits) fix "configure -fast" on Windows for other maketools than nmake Get qmake to add pdb files to install target in debug configuration. add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX give symbian an own platform mode deprecate -win32/-unix/-macx which set both host and target mode decouple host platform mode from target platform mode factor out applyHostMode() make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins use QDir::separator() instead of Option::dir_sep where appropriate simplify string ops sanitize evaluation of OS scopes instead of hard-coding recursion for symbian, add it to the specs add possibility to request project recursion from within a pro file fix ts-assistant target use QList::reserve() as appropriate optimize appending of (empty) lists to (empty) lists suppress pointer aliasing warnings Fix compilation with namespace. Assistant: Make ~AbstractHelpViewer() virtual. Prepare German translations for 4.7 (except Quick). ...
| | * instead of hard-coding recursion for symbian, add it to the specsOswald Buddenhagen2010-02-261-0/+1
| | | | | | | | | | | | Reviewed-by: mariusSO
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-015-13/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/symbian/symbian.conf qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.cpp qmake/generators/symbian/symmake_sbsv2.cpp src/plugins/plugins.pro
| * | Misc fixes to FLM filesMiikka Heikkinen2010-02-255-13/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 1) FLMs should not have more than one phase dependency -> removed extra dependencies, leaving only what is actually necessary. 2) -include $(FLMHOME)/metaflm.mk statements vere removed as obsolete 3) Added FORCESUCCESS to startrule call in qmake_extra_pre_targetdep.flm so that unrelated components can continue building instead of halting the whole build at EXPORT phase. 4) Added .export to qmake_extra_pre_targetdep interface so that it is actually executed in EXPORT phase where it should be. Task-number: QTBUG-8513 Reviewed-by: Janne Koskinen
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-215-5/+5
|\ \ | |/ | | | | | | Conflicts: mkspecs/features/symbian/platform_paths.prf
| * Update copyright year to 2010Jason McDonald2010-01-065-5/+5
| | | | | | | | Reviewed-by: Trust Me
* | Reorganized the Symbian build system profiles.axis2010-01-121-1/+1
|/ | | | | | Now we try share as much as possible between the different Symbian build systems, so that changes made to the MMP systems will also work in the makefile based one.
* Remove temp dirs workaround for raptor builds onlyShane Kearns2009-11-092-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | Webkit cannot build because of too long command lines in the sbsv2 config. There is an alternative workaround in raptor for the relative include paths problem, i.e. "sbs -c winscw_udeb.mwccinc" Removing the temp dirs from being created and added to systeminclude makes the command line short enough again that webkit can be compiled. Reviewed-By: Miikka Heikkinen Based on following commit from the no-tmp-dirs branch: commit 33e8c420bb40ca6194d29f96ef2fbd0f18340e6b Author: Iain <qt-info@nokia.com> Date: Wed Oct 7 13:45:48 2009 +0200 First attempt at removing the tmp dirs workaround on Symbian OS I may not have caught all the places where it is used, but MMP files look OK afterwards. TODO: Slightly concerned that I've trimmed too much from the abld generator as I think that the bit I cut was also used for other temp dirs
* Fixed .make.cache write collision on symbian-sbsv2 buildsMiikka Heikkinen2009-10-211-0/+9
| | | | | | | | | | If a project was built for more than one target with single sbs command, .make.cache generation could sometime fail because multiple jobs attempted to write into it simultaneously. Now only one of the specified targets will be used to generate .make.cache, making collisions impossible. Reviewed-by: Janne Anttila
* Fix "make sis" target for -xplatform symbian-sbsv2Shane Kearns2009-09-221-2/+3
| | | | | | | | CFG_PATH evaluates as "udeb", not "UDEB" when building the debug-armv5 target. So changed the FLM to check for that. Also changed the variable redefinition to ifeq/else/endif. Reviewed-by: Iain
* Renamed make 'sisx' target to 'sis' and QT_SISX_* variables to QT_SIS_*Janne Anttila2009-09-031-2/+2
| | | | | | Renaming done based feedback. Reviewed-by: TrustMe
* Changed createpackage parameters to be more consistent with make targets.Janne Anttila2009-08-281-2/+6
| | | | | | | | | | | | | | | | | | 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
* Various small fixes and cleanups for symbian qmake generator.Janne Anttila2009-08-281-2/+2
| | | | | | | | | | | | | | | The included fixes / cleanups: - QtLibs PKG filename changed - Component name in Qt libs pkg changed to "Qt for S60" * Done in order to make SISX upgrade possible after pre-release. - Removed passing of 'fixedTarget' member variable as an argument - Removed whitespaces from generated file names - Fixed 'make sisx' calling syntax when custom makefile name used - Fixed MAKEFILE variable content in generated makefiles - Changed names of environment variables used by 'make sisx' * Nee variables have 'QT_SISX_' prefix Reviewed-By: Miikka Heikkinen
* Added support for 'make sisx' target in Symbian OS.Janne Anttila2009-08-272-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f189e00 added support for template PKG file. This commit extends the template PKG file usage with new make target, i.e. the commit adds a new make target called sisx, which can be used to generate signed sisx files. The sisx target is basically wrapper for calling createpackage.bat, but it also adds support for default platform/target and environment variables. Default platform/target feature means that SIS packages are automatically created for last build target. For example: >qmake >make release-armv5 >make sisx <- Creates sisx for release-armv5 It is also possible to override the platform and target for which the SISX is created as follows: >qmake >make release-armv5 debug-winscw >make sisx PLATFORM=ARMV5 TARGET=UREL <- Creates sisx for release-armv5 Since PLATFORM and TARGET are make variables they can also be defined as an environment variables instead of passing them for make. I.e. the following is indentical to previous example: >set PLATFORM=ARMV5 >set TARGET=UREL >qmake >make release-armv5 debug-winscw >make sisx <- Creates sisx for release-armv5 The environment variables are also useful if you have your own developer certificate what you want to use for signing SIS files. For example: >set CERTIFICATE=mycert.cer >set KEY=mykey.key >qmake >make release-armv5 >make sisx The above example creates release-armv5 SIS package with custom certificate and key (key without password). If certificate and key are not defined, the same logic as in old createpackage.bat will be used i.e. if RD cert is available in Qt root it will be used, and if not self-signed cerfificate will be used. The environment variables supported by 'make sisx' are: PLATFORM TARGET CERTIFICATE KEY PASSPHRASE The createpackage.bat can still be called directly but preferred way is to use new make target directly as examples above demonstrated. Task: 259037 RevBy: Miikka Heikkinen
* Update schema version number for SBSv2 Qt integrationIain2009-08-191-1/+1
| | | | | | | New version of SBSv2 build schema release, but no impact on our file, so just update the version number. Reviewed-by: TrustMe
* Update license headers according to commit 858c70f768e.axis2009-08-065-5/+5
| | | | RevBy: Trust me
* Added temporary include file generation to symbian-sbsv2 generatorMiikka Heikkinen2009-07-012-0/+27
| | | | and cleaned related functionality up a bit.
* Minor optimization to symbian-sbsv2 extra target predeps generation.Miikka Heikkinen2009-04-271-1/+1
|
* Fixed emulator deployment for symbian-sbsv2Miikka Heikkinen2009-04-271-8/+13
|
* Long live Qt for S60!axis2009-04-245-0/+149
generated by cgit v0.12 at 2024-12-28 05:24:35 (GMT)