Build tools, examples and test as extra target.

Change-Id: Iae8949b3f938f5c6251a76b4806151e0262300d2
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
This commit is contained in:
kh1 2012-03-22 17:14:12 +01:00 committed by Karsten Heimrich
parent c885048967
commit b9920bf160
5 changed files with 65 additions and 11 deletions

View File

@ -1,3 +1,22 @@
CONFIG += ordered
TEMPLATE = subdirs
SUBDIRS += testapp
EXTRASUBDIRS = testapp
include(../installerfw.pri)
!isEqual(IFW_SOURCE_TREE, $$IFW_BUILD_TREE) {
for(SUBDIR, EXTRASUBDIRS) {
mkdir.commands += $$QMAKE_MKDIR $$SUBDIR $${IFW_NEWLINE}
}
QMAKE_EXTRA_TARGETS += mkdir
}
for(SUBDIR, EXTRASUBDIRS) {
examples.commands += cd $$SUBDIR && $(QMAKE) -r $$PWD/$$SUBDIR && $(MAKE) $${IFW_NEWLINE}
}
!isEqual(IFW_SOURCE_TREE, $$IFW_BUILD_TREE) {
examples.depends = mkdir
}
QMAKE_EXTRA_TARGETS += examples

View File

@ -2,6 +2,7 @@
error("installerfw.pri already included")
}
IFW_PRI_INCLUDED = 1
IFW_NEWLINE = $$escape_expand(\\n\\t)
defineReplace(toNativeSeparators) {
return($$replace(1, /, $$QMAKE_DIR_SEP))

View File

@ -1,11 +1,5 @@
CONFIG += ordered
TEMPLATE = subdirs
SUBDIRS += src tools
!macx:SUBDIRS += examples
test.target = test
test.depends = $(TARGET)
QMAKE_EXTRA_TARGETS += test
test.commands = (cd tests && $(QMAKE) && $(MAKE))
SUBDIRS += src examples tests tools
include (doc/doc.pri)

View File

@ -1,7 +1,27 @@
CONFIG += ordered
TEMPLATE = subdirs
SUBDIRS += downloadspeed \
EXTRASUBDIRS = \
downloadspeed \
environmentvariable \
extractarchiveoperationtest \
fileengineclient \
fileengineserver
include(../installerfw.pri)
!isEqual(IFW_SOURCE_TREE, $$IFW_BUILD_TREE) {
for(SUBDIR, EXTRASUBDIRS) {
mkdir.commands += $$QMAKE_MKDIR $$SUBDIR $${IFW_NEWLINE}
}
QMAKE_EXTRA_TARGETS += mkdir
}
for(SUBDIR, EXTRASUBDIRS) {
tests.commands += cd $$SUBDIR && $(QMAKE) -r $$PWD/$$SUBDIR && $(MAKE) $${IFW_NEWLINE}
}
!isEqual(IFW_SOURCE_TREE, $$IFW_BUILD_TREE) {
tests.depends = mkdir
}
QMAKE_EXTRA_TARGETS += tests

View File

@ -4,8 +4,28 @@ TEMPLATE = subdirs
SUBDIRS += \
archivegen \
binarycreator \
repogen
EXTRASUBDIRS = \
extractbinarydata \
repocompare \
repogen \
repogenfromonlinerepo
win32:SUBDIRS += maddehelper
win32:EXTRASUBDIRS += maddehelper
include(../installerfw.pri)
!isEqual(IFW_SOURCE_TREE, $$IFW_BUILD_TREE) {
for(SUBDIR, EXTRASUBDIRS) {
mkdir.commands += $$QMAKE_MKDIR $$SUBDIR $${IFW_NEWLINE}
}
QMAKE_EXTRA_TARGETS += mkdir
}
for(SUBDIR, EXTRASUBDIRS) {
tools.commands += cd $$SUBDIR && $(QMAKE) -r $$PWD/$$SUBDIR && $(MAKE) $${IFW_NEWLINE}
}
!isEqual(IFW_SOURCE_TREE, $$IFW_BUILD_TREE) {
tools.depends = mkdir
}
QMAKE_EXTRA_TARGETS += tools