diff options
| author | axis <qt-info@nokia.com> | 2010-07-26 13:22:22 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-07-26 13:35:35 (GMT) |
| commit | bf9aaa5e3e8d8310c3797e03de2b19e4143ae913 (patch) | |
| tree | 0dc82f396793fec8138916d27917e43a6de653c8 | |
| parent | 55625badfab6bfe49c60ab5cd9a586c6bd511579 (diff) | |
| download | Qt-bf9aaa5e3e8d8310c3797e03de2b19e4143ae913.zip Qt-bf9aaa5e3e8d8310c3797e03de2b19e4143ae913.tar.gz Qt-bf9aaa5e3e8d8310c3797e03de2b19e4143ae913.tar.bz2 | |
Fixed package creation when shadow building.
RevBy: Markus Goetz
| -rwxr-xr-x | bin/createpackage.pl | 3 | ||||
| -rw-r--r-- | mkspecs/features/sis_targets.prf | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/bin/createpackage.pl b/bin/createpackage.pl index 8b787cb..984c1fd 100755 --- a/bin/createpackage.pl +++ b/bin/createpackage.pl @@ -300,7 +300,8 @@ if($stub) { && $templatepkg !~ m/_installer\.pkg$/i && !$onlyUnsigned) { print("Auto-patching capabilities for self signed package.\n"); - system ("patch_capabilities $pkgoutput"); + my $patch_capabilities = File::Spec->catfile(dirname($0), "patch_capabilities"); + system ("$patch_capabilities $pkgoutput"); } # Create SIS. diff --git a/mkspecs/features/sis_targets.prf b/mkspecs/features/sis_targets.prf index 615bbe5..f7e633c 100644 --- a/mkspecs/features/sis_targets.prf +++ b/mkspecs/features/sis_targets.prf @@ -125,25 +125,27 @@ equals(GENERATE_SIS_TARGETS, true) { QMAKE_EXTRA_TARGETS += store_build_target } } else { + qtPrepareTool(QMAKE_CREATEPACKAGE, createpackage) + sis_destdir = $$DESTDIR isEmpty(sis_destdir):sis_destdir = . baseTarget = $$basename(TARGET) !equals(TARGET, "$$baseTarget"):sis_destdir = $$sis_destdir/$$dirname(TARGET) sis_target.target = sis - sis_target.commands = createpackage $(QT_SIS_OPTIONS) $${baseTarget}_template.pkg \ + sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) $${baseTarget}_template.pkg \ - $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) sis_target.depends = first unsigned_sis_target.target = unsigned_sis - unsigned_sis_target.commands = createpackage $(QT_SIS_OPTIONS) -o $${baseTarget}_template.pkg + unsigned_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) -o $${baseTarget}_template.pkg unsigned_sis_target.depends = first target_sis_target.target = $${sis_destdir}/$${baseTarget}.sis target_sis_target.commands = $(MAKE) -f $(MAKEFILE) sis installer_sis_target.target = installer_sis - installer_sis_target.commands = createpackage $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \ + installer_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \ $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) installer_sis_target.depends = $${sis_destdir}/$${baseTarget}.sis |