| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
The makefile build system does not require EPOCROOT to end in a
slash.
RevBy: Jani Hautakangas
|
|
|
|
| |
Reviewed-by: Jani Hautakangas
|
|
|
|
|
|
| |
when using EPOCROOT that contains drive letter.
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
RevBy: Markus Goetz
|
|
|
|
|
|
|
|
|
|
|
| |
Rationale for this is that currently there is no simple way to create
a sis package that can be properly signed via Symbian open signed
mechanism, as 'make sis' will by default use self-signed certificates
and automatically patch capabilities of binaries to remove
non-self-signable ones.
Task-number: QTBUG-11455
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
| |
<app>_installer.pkg produces self-signable packages by default, so
no need to patch it.
Task-number: QTBUG-10746
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
| |
Convert paths in DEPLOYMENT to the rom drive (z:)
Filter out unwanted parts of the header (dependencies)
Task-number: QTBUG-10118
Reviewed-by: Alessandro Portale
|
|
|
|
|
|
|
|
| |
The -n parameter can be used to specify the final sis name when
using createpackage script or "make sis" with QT_SIS_OPTIONS.
Task-number: QTBUG-9400
Reviewed-by: Janne Koskinen
|
|
|
|
| |
Reviewed-by: TrustMe
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Don't autopatch when just preprocessing pkg or creating stub package
- Copy binaries before patching so that originals are preserved.
- Only autopatch the preprocessed file so that original template is
preserved.
- Added clear warning to patch_capabilities.pl to notify users that
patched package is not suitable for distribution.
Task-number: QTBUG-9972
Reviewed-by: Shane Kearns
|
|
|
|
|
|
|
|
|
| |
This was due the patch_capabilities step running too late in the sis
creation process. This led to the package ID being wrong the first
time "make sis" was run, but correct on subsequent runs.
RevBy: Trust me
Task: QTBUG-8770
|
|
|
|
|
|
|
|
|
| |
This allows you to simply call 'make ok_sis' to have a sis package
which is self signed with patched capabilities, ready for install
on an consumer system.
Reviewed-by: Shane Kearns
(cherry picked from commit 1f9e501bf9f3287a424b36915d4436a74cf21847)
|
|
|
|
|
| |
Not strictly necessary for normal building, but nice to catch build
system bugs.
|
|
|
|
| |
This does not work well on case sensitive file systems.
|
|
|
|
|
| |
This was done in order to support signsis on Linux, where relative
paths are required.
|
| |
|
|
|
|
|
| |
This change was done in order to support build systems that do not
use platform and target in the pkg file.
|
|
|
|
|
|
| |
This is a better sentence and has the added benefit of not confusing
emacs' highlighting, causing the last quote mark to generate a string
running through the rest of the file. ;-)
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
qmake - add targets to wrapper make file
make stub_sis
createpackage - use -s or --stub to run makesis with the -s argument
also copies the file to the right place in epoc32\data\system\installs
qt.iby - add qt_stub.sis and qt_webkit_stub.sis
Task-number: QTBUG-6570
Reviewed-by: Miikka Heikkinen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Added make target for creating smart installer packages
- Application sis is automatically generated if missing when
"make installer_sis" is invoked
- No need to specify installer pkg UID if self signing is enough
- Related docs fixed
- Fixed smartinstaller.sis name to be correct
Task-number: QTBUG-8026
Reviewed-by: axis
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Smart installer packages bundle normal application sis with a bootstrap
package that will download a smart installer when the package
is installed. Smart installer in turn will download any dependencies
of the application that are available on remote server, such as
Open C, Qt, and QtWebkit packages, and install them
Smart installer packages are generated when DEPLOYMENT.installer_header
variable is defined in applicatoin .pro file.
This commit is still missing properly signed bootstrap.sis package.
Task-number: QTBUG-7908
Reviewed-by: Shane Kearns
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed the host detection in qmake profiles.
Improving parts of commit 2d8d855d.
qmake: add Linux host support to Symbian generator
Fixed indentation.
Add Linux host support to Symbian mkspecs.
Linux support for platform specific commands in .pro files.
Add createpackage.bat equivalent for Unix systems.
Make all Symbian #includes lower case.
mkspecs: fix warning when calling qmake
Fix portability problems in bin/createpackage.pl.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
bin/createpackage.pl
mkspecs/features/symbian/application_icon.prf
qmake/generators/symbian/symmake_abld.cpp
src/gui/text/qfontdatabase_s60.cpp
src/s60main/s60main.pro
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* Use File::Spec functions to manipulate path components.
* Keep $targetplatform lower case for case sensitive systems.
Signed-off-by: axis <qt-info@nokia.com>
|
|/ /
| |
| |
| | |
Reviewed-by: Trust Me
|
|/
|
|
|
|
|
|
| |
Moved the certificate/key to the src/s60installs path.
Updated createpackage.pl to look in this new location.
Task-number: QTBUG-4553
Reviewed-by: axis
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This commit extends createpackage with capability to sign the SIS
file with several certificates. The certificates need to be listed
in text file. The file can have several certificates, each specified in
separate line. The certificate, key and passphrase in line must be ';'
separated. Lines starting with '#' are treated as a comments. Also
empty lines in the file are ignored. The paths in certificate info file
can be absolute or relative to the given file.
Example syntax for certificateinfo file (mycerts.txt):
# This is comment line, also the empty lines are ignored
rd.cer;rd-key.pem
.\cert\mycert.cer;.\cert\mykey.key;yourpassword
X:\QtS60\selfsigned.cer;X:\QtS60\selfsigned.key
To use this file the creatapackage has to be invokes as follows:
createpackage.pl -c=mycerts.txt templatepkg release-armv5
Reviewed-by: Shane Kearns
Reviewed-by: Miikka Heikkinen
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
| |
All S60 SDK paths in Linux are lowercase.
Reviewed-by: TrustMe
|
|
|
|
|
|
| |
The prerocessing is needed by installer scripts.
Reviewed-by: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Createpackage.bat now accepts also release/debug instead of urel/udeb.
Also the order is swicthed so that now you need to call:
>createpackage.bat [-i] pkgfile release armv5 [certificate key [passphrase]]
instead of
>createpackage.bat [-i] pkgfile armv5 urel [certificate key [passphrase]]
RevBy: Miikka Heikkinen
|
|
This commit changes qmake to generate only one template pkg file,
instead of one for each supported platform and build.
Due to this change createpackage.bat script now need to be called with
two additional parameters - platform and target. Example of needed changes:
Instead of old way:
>createpackage.bat [-i] pkgfile [certificate key [passphrase]]
The new implementation works as:
>createpackage.bat [-i] pkgfile platform build [certificate key [passphrase]]
In addition createpackage.bat backend is replaced by createpackage.pl,
it takes care of preprocesing the pkg file, i.e. expanding the variables with
their values and calling the makesis and signsis with right parameters.
Perl is used to make implementation more cross-platform.
Task: 259037
RevBy: Miikka Heikkinen
|