diff options
| author | axis <qt-info@nokia.com> | 2010-02-23 14:51:12 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-23 14:54:45 (GMT) |
| commit | 3fc0b4194bffae9a0d7c7d87f97bb4d1e96e773b (patch) | |
| tree | 9672a9193db2f87b501a7a221fa29ed990c1d935 /src/tools/bootstrap | |
| parent | 734596c1986f84f4c565f30fd436de94cf3cee1f (diff) | |
| download | Qt-3fc0b4194bffae9a0d7c7d87f97bb4d1e96e773b.zip Qt-3fc0b4194bffae9a0d7c7d87f97bb4d1e96e773b.tar.gz Qt-3fc0b4194bffae9a0d7c7d87f97bb4d1e96e773b.tar.bz2 | |
Implemented recursive "sis" target and enabled sis_targets feature.
The sis target will depend on the main build target of each project,
which should make it possible to simply run "make sis" in the root of
a clean tree (after configure, of course), and have sis packages
generated for everything. It works at least for Qt.
This required some changes to the dependency generation in Qt, to
make sure that s60installs builds its package after all of Qt, and
that fluidlauncher has all the required files before building a
package.
In addition, all the sis target code was moved into its own qmake
feature file, called sis_targets. It is currently enabled by default
for Symbian.
Diffstat (limited to 'src/tools/bootstrap')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 5 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index c29d59d..c5e1e1c 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -62,3 +62,8 @@ mac { LIBS += -framework CoreServices } +# Make dummy "sis" target to keep recursive "make sis" working. +sis_target.target = sis +sis_target.commands = +sis_target.depends = first +QMAKE_EXTRA_TARGETS += sis_target diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 0dbb90f..d211f47 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -113,3 +113,9 @@ contains(QT_CONFIG, zlib) { lib.CONFIG = dummy_install INSTALLS += lib + +# Make dummy "sis" target to keep recursive "make sis" working. +sis_target.target = sis +sis_target.commands = +sis_target.depends = first +QMAKE_EXTRA_TARGETS += sis_target |