| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
| |
Renaming done based feedback.
Reviewed-by: TrustMe
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
| |
New version of SBSv2 build schema release, but no impact on our
file, so just update the version number.
Reviewed-by: TrustMe
|
| |
|
|
| |
RevBy: Trust me
|
| |
|
|
| |
and cleaned related functionality up a bit.
|
| | |
|
| | |
|
| |
|
