Reorganize libinstaller.pri -> installerbuilder.pri file includes.

- reorganize libinstaller.pri
- move and rename libinstaller.pri
- adjust all files that formerly included libinstaller.pri

Change-Id: I8d92ad783872fed67d6e06359ff5db46704de274
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>

15 files changed, 79 insertions, 124 deletions

diff --git a/examples/downloadspeed/downloadspeed.pro b/examples/downloadspeed/downloadspeed.pro
index e082c1f65..18495317e 100644
--- a/examples/downloadspeed/downloadspeed.pro
+++ b/examples/downloadspeed/downloadspeed.pro
@@ -1,4 +1,5 @@
-include(../../installerbuilder/libinstaller/libinstaller.pri)
+include(../../installerbuilder/installerbuilder.pri)
+
 DEPENDPATH += ../../installerbuilder/libinstaller ../../installerbuilder/common
 INCLUDEPATH += ../../installerbuilder/libinstaller ../../installerbuilder/common
 
@@ -9,6 +10,5 @@ TARGET = downloadspeed
 
 QT -= gui
 QT += core network
-LIBS = -L$$OUT_PWD/../../installerbuilder/lib -linstaller $$LIBS
 
 SOURCES += main.cpp
diff --git a/examples/testapp/testapp.pro b/examples/testapp/testapp.pro
index 4b1ada531..72ae3f837 100644
--- a/examples/testapp/testapp.pro
+++ b/examples/testapp/testapp.pro
@@ -1,20 +1,12 @@
-TEMPLATE = app
-TARGET = 
-
-include( ../../installerbuilder/libinstaller/libinstaller.pri )
-LIBS = -L$$OUT_PWD/../../installerbuilder/lib -linstaller $$LIBS
+include( ../../installerbuilder/installerbuilder.pri )
 
+TEMPLATE = app
 DESTDIR = packages/com.nokia.testapp/data
 
-QT += script network xml sql
 CONFIG += uitools help
-contains(CONFIG, static): {
-    QTPLUGIN += qsqlite
-    DEFINES += USE_STATIC_SQLITE_PLUGIN
-}
+QT += script network xml sql
 
 # Input
-FORMS += componentselectiondialog.ui updatesettingsdialog.ui updatesettingswidget.ui
 HEADERS += mainwindow.h \
     componentselectiondialog.h \
     updatesettingsdialog.h \
@@ -26,8 +18,8 @@ SOURCES += main.cpp mainwindow.cpp \
     updatesettingsdialog.cpp \
     updateagent.cpp \
     updatesettingswidget.cpp
-
 RESOURCES += testapp.qrc
+FORMS += componentselectiondialog.ui updatesettingsdialog.ui updatesettingswidget.ui
 
 macx:QMAKE_POST_LINK = ($$OUT_PWD/../../installerbuilder/bin/binarycreator -p packages -c config -t ../../installerbuilder/bin/installerbase TestAppInstaller.app com.nokia.testapp)
 win32:QMAKE_POST_LINK = ($$OUT_PWD\\..\\..\\installerbuilder\\bin\\binarycreator.exe -p $$PWD\\packages -c $$PWD\\config -t $$OUT_PWD\\..\\..\\installerbuilder\\bin\\installerbase.exe TestAppInstaller.exe com.nokia.testapp)
diff --git a/installerbuilder/archivegen/archivegen.pro b/installerbuilder/archivegen/archivegen.pro
index 6ee903da7..2c04380b7 100644
--- a/installerbuilder/archivegen/archivegen.pro
+++ b/installerbuilder/archivegen/archivegen.pro
@@ -1,17 +1,16 @@
-TEMPLATE = app
-TARGET = archivegen
-DEPENDPATH += . .. ../common
+include(../installerbuilder.pri)
+
 INCLUDEPATH += . ..
+DEPENDPATH += . .. ../common
 
-DESTDIR = ../bin
+TEMPLATE = app
+TARGET = archivegen
 
 CONFIG += console
 CONFIG -= app_bundle
 
 QT += xml
 
-include(../libinstaller/libinstaller.pri)
-
 # Input
 SOURCES += archive.cpp \
            ../common/repositorygen.cpp
diff --git a/installerbuilder/binarycreator/binarycreator.pro b/installerbuilder/binarycreator/binarycreator.pro
index 237ce9952..6d006e6aa 100644
--- a/installerbuilder/binarycreator/binarycreator.pro
+++ b/installerbuilder/binarycreator/binarycreator.pro
@@ -1,16 +1,14 @@
+include(../installerbuilder.pri)
+
 TEMPLATE = app
 TARGET = binarycreator
 
 DEPENDPATH += . ..
 INCLUDEPATH += . .. rcc
 
-DESTDIR = ../bin
-
 CONFIG += console
 CONFIG -= app_bundle
 
-include(../libinstaller/libinstaller.pri)
-
 RESOURCES += binarycreator.qrc
 
 # Input
@@ -20,6 +18,3 @@ SOURCES = binarycreator.cpp \
           ../common/repositorygen.cpp 
 
 HEADERS = rcc/rcc.h
-
-win32:OBJECTS_DIR = .obj
-win32:LIBS += Shell32.lib
diff --git a/installerbuilder/installerbase/installerbase.pro b/installerbuilder/installerbase/installerbase.pro
index e489f7452..08b9fd7ff 100644
--- a/installerbuilder/installerbase/installerbase.pro
+++ b/installerbuilder/installerbase/installerbase.pro
@@ -1,3 +1,5 @@
+include(../installerbuilder.pri)
+
 TEMPLATE = app
 TARGET = installerbase
 
@@ -10,14 +12,9 @@ DEFINES += QT_NO_CAST_FROM_ASCII "_GIT_SHA1_=$$GIT_SHA1"
 
 win32:RC_FILE = installerbase.rc
 
-DESTDIR = ../bin
-
 CONFIG += help
-
 CONFIG -= app_bundle
 
-include(../libinstaller/libinstaller.pri)
-
 QM_FILES = qt_de.qm de_de.qm
 defineTest(testQmFiles) {
     for(file, QM_FILES) {
@@ -30,10 +27,9 @@ defineTest(testQmFiles) {
 }
 
 if (testQmFiles()) {
-RESOURCES += installerbase.qrc
+    RESOURCES += installerbase.qrc
 }
 
-
 QT += network
 
 FORMS += settingsdialog.ui
diff --git a/installerbuilder/installerbuilder.pri b/installerbuilder/installerbuilder.pri
new file mode 100644
index 000000000..316a12f5f
--- /dev/null
+++ b/installerbuilder/installerbuilder.pri
@@ -0,0 +1,41 @@
+INCLUDEPATH += $$PWD \
+    $$PWD/libinstaller \
+    $$PWD/libinstaller/3rdparty/kdtools \
+    $$PWD/libinstaller/3rdparty/p7zip_9.04 \
+    $$PWD/libinstaller/3rdparty/p7zip_9.04/unix/CPP
+
+DEPENDPATH += $$PWD \
+    $$PWD/libinstaller \
+    $$PWD/libinstaller/3rdparty/p7zip_9.04 \
+    $$PWD/libinstaller/3rdparty/p7zip_9.04/unix/CPP \
+    $$PWD/libinstaller/3rdparty/kdtools
+
+QT += script
+CONFIG += uitools help
+
+DESTDIR = $$PWD/bin
+LIBS = -L$$PWD/lib -linstaller $$LIBS
+
+contains(CONFIG, static): {
+    QTPLUGIN += qsqlite
+    DEFINES += USE_STATIC_SQLITE_PLUGIN
+}
+
+CONFIG(shared, static|shared): {
+    DEFINES += LIB_INSTALLER_SHARED KDTOOLS_SHARED
+}
+
+unix:!macx:LIBS += -lutil
+macx:LIBS += -framework Security
+macx:DEFINES += _LZMA_UINT32_IS_ULONG
+win32:LIBS += -lole32 -lUser32 -loleaut32 -lshell32
+
+static {
+    unix {
+        exists($$PWD/lib/libinstaller.a):POST_TARGETDEPS += $$PWD/lib/libinstaller.a
+    }
+    win32 {
+        exists($$PWD/lib/installer.lib):POST_TARGETDEPS += $$PWD/lib/installer.lib
+    }
+}
+
diff --git a/installerbuilder/installerbuilder.pro b/installerbuilder/installerbuilder.pro
index efed02013..288bcb872 100644
--- a/installerbuilder/installerbuilder.pro
+++ b/installerbuilder/installerbuilder.pro
@@ -2,10 +2,10 @@ TEMPLATE = subdirs
 CONFIG += ordered
 SUBDIRS += libinstaller installerbase binarycreator repogen archivegen tests
 
-test.commands=(cd tests && $(MAKE) test)
-
-test.target=test
+test.target = test
 test.depends = $(TARGET)
+test.commands = (cd tests && $(MAKE) test)
+
 QMAKE_EXTRA_TARGETS += test
 
 TRANSLATIONS += installerbase/translations/de_de.ts \
diff --git a/installerbuilder/libinstaller/libinstaller.pri b/installerbuilder/libinstaller/libinstaller.pri
deleted file mode 100644
index f4fa4cde5..000000000
--- a/installerbuilder/libinstaller/libinstaller.pri
+++ /dev/null
@@ -1,46 +0,0 @@
-macx:DEFINES += _LZMA_UINT32_IS_ULONG
-
-DEFINES += FSENGINE_TCP
-
-INCLUDEPATH += $$PWD \
-    $$PWD/.. \
-    $$PWD/3rdparty/kdtools \
-    $$PWD/3rdparty/p7zip_9.04 \
-    $$PWD/3rdparty/p7zip_9.04/unix/CPP
-
-DEPENDPATH += $$PWD \
-    $$PWD/.. \
-    $$PWD/3rdparty/p7zip_9.04 \
-    $$PWD/3rdparty/p7zip_9.04/unix/CPP \
-    $$PWD/3rdparty/kdtools 
-
-CONFIG( shared, static|shared ):DEFINES += LIB_INSTALLER_SHARED
-CONFIG( shared, static|shared ):DEFINES += KDTOOLS_SHARED
-
-CONFIG += uitools help
-
-contains(CONFIG, static): {
-    QTPLUGIN += qsqlite
-    DEFINES += USE_STATIC_SQLITE_PLUGIN
-}
-
-QT += script
-QT += gui # gui needed for KDUpdater include (compareVersion), which indirectly include QTreeWidget
-
-LIBS = -L$$OUT_PWD/../lib -L$$OUT_PWD/../../lib -linstaller $$LIBS
-
-win32:LIBS += -lole32 -lUser32 -loleaut32 -lshell32
-macx:LIBS += -framework Security
-unix:!macx:LIBS += -lutil
-
-static {
-    unix {
-        exists($$OUT_PWD/../lib/libinstaller.a):POST_TARGETDEPS += $$OUT_PWD/../lib/libinstaller.a
-        exists($$OUT_PWD/../../lib/libinstaller.a):POST_TARGETDEPS += $$OUT_PWD/../../lib/libinstaller.a
-    }
-    win32 {
-        exists($$OUT_PWD/../lib/installer.lib):POST_TARGETDEPS += $$OUT_PWD/../lib/installer.lib
-        exists($$OUT_PWD/../../lib/installer.lib):POST_TARGETDEPS += $$OUT_PWD/../../lib/installer.lib
-    }
-}
-
diff --git a/installerbuilder/repogen/repogen.pro b/installerbuilder/repogen/repogen.pro
index 7d656e656..7c8455664 100644
--- a/installerbuilder/repogen/repogen.pro
+++ b/installerbuilder/repogen/repogen.pro
@@ -1,17 +1,16 @@
+include(../installerbuilder.pri)
+
 TEMPLATE = app
 TARGET = repogen
-DEPENDPATH += . .. ../common
-INCLUDEPATH += . ..
 
-DESTDIR = ../bin
+INCLUDEPATH += . ..
+DEPENDPATH += . .. ../common
 
 CONFIG += console
 CONFIG -= app_bundle
 
 QT += xml
 
-include(../libinstaller/libinstaller.pri)
-
 # Input
 SOURCES += repogen.cpp \
            ../common/repositorygen.cpp
diff --git a/installerbuilder/tests/environmentvariable/environmentvariable.pro b/installerbuilder/tests/environmentvariable/environmentvariable.pro
index 704cf8ff6..e7398984d 100644
--- a/installerbuilder/tests/environmentvariable/environmentvariable.pro
+++ b/installerbuilder/tests/environmentvariable/environmentvariable.pro
@@ -1,8 +1,8 @@
+include(../../installerbuilder.pri)
+
 TEMPLATE = app
 TARGET = tst_environmentvariable
 
-DESTDIR = bin
-
 CONFIG -= app_bundle
 
 QT += testlib script
@@ -11,10 +11,5 @@ QT -= gui
 INCLUDEPATH += ../../libinstaller ..
 DEPENDPATH += ../../libinstaller ../../common
 
-include(../../libinstaller/libinstaller.pri)
-
 SOURCES = environmentvariabletest.cpp
 HEADERS = environmentvariabletest.h 
-
-win32:LIBS += ole32.lib oleaut32.lib user32.lib
-win32:OBJECTS_DIR = .obj
diff --git a/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.pro b/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.pro
index 11ccc3474..afe6f1285 100644
--- a/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.pro
+++ b/installerbuilder/tests/extractarchiveoperationtest/extractarchiveoperationtest.pro
@@ -1,8 +1,8 @@
+include(../../installerbuilder.pri)
+
 TEMPLATE = app
 TARGET = extractarchiveoperationtest
 
-DESTDIR = bin
-
 CONFIG -= app_bundle
 
 QT += testlib script
@@ -11,10 +11,5 @@ QT -= gui
 INCLUDEPATH += ../../libinstaller ..
 DEPENDPATH += ../../libinstaller ../../common
 
-include(../../libinstaller/libinstaller.pri)
-
 SOURCES = extractarchiveoperationtest.cpp
 HEADERS = extractarchiveoperationtest.h 
-
-win32:LIBS += ole32.lib oleaut32.lib user32.lib
-win32:OBJECTS_DIR = .obj
diff --git a/installerfw.pro b/installerfw.pro
index 7d3a262a6..de1e7c93f 100644
--- a/installerfw.pro
+++ b/installerfw.pro
@@ -3,9 +3,10 @@ CONFIG += ordered
 SUBDIRS += installerbuilder examples tools
 mac:SUBDIRS -= examples
 
-test.target=test
-test.commands=(cd installerbuilder && $(MAKE) test)
+test.target = test
 test.depends = $(TARGET)
+test.commands = (cd installerbuilder && $(MAKE) test)
+
 QMAKE_EXTRA_TARGETS += test
 
 include (doc/doc.pri)
diff --git a/tools/extractbinarydata/extractbinarydata.pro b/tools/extractbinarydata/extractbinarydata.pro
index fe30f20b2..5dd649dbf 100644
--- a/tools/extractbinarydata/extractbinarydata.pro
+++ b/tools/extractbinarydata/extractbinarydata.pro
@@ -1,17 +1,13 @@
+include(../../installerbuilder/installerbuilder.pri)
+
 TEMPLATE = app
-DEPENDPATH += . .. ../../installerbuilder/common
 INCLUDEPATH += . ..
-
-DESTDIR = ../../installerbuilder/bin
+DEPENDPATH += . .. ../../installerbuilder/common
 
 CONFIG += console
 CONFIG -= app_bundle
 
-include(../../installerbuilder/libinstaller/libinstaller.pri)
-
 # Input
 SOURCES += main.cpp
 
 HEADERS +=
-
-LIBS = -L../../installerbuilder/lib -linstaller $$LIBS
diff --git a/tools/fileengineclient/fileengineclient.pro b/tools/fileengineclient/fileengineclient.pro
index 8946813ae..6f9ecbff7 100644
--- a/tools/fileengineclient/fileengineclient.pro
+++ b/tools/fileengineclient/fileengineclient.pro
@@ -1,17 +1,13 @@
+include(../../installerbuilder/installerbuilder.pri)
+
 TEMPLATE = app
-DEPENDPATH += . .. ../../installerbuilder/common
 INCLUDEPATH += . ..
-
-DESTDIR = ../../installerbuilder/bin
+DEPENDPATH += . .. ../../installerbuilder/common
 
 CONFIG += console
 CONFIG -= app_bundle
 
 QT += network
 
-include(../../installerbuilder/libinstaller/libinstaller.pri)
-
 # Input
 SOURCES += fileengineclient.cpp
-
-LIBS = -L../../installerbuilder/lib -linstaller $$LIBS
diff --git a/tools/fileengineserver/fileengineserver.pro b/tools/fileengineserver/fileengineserver.pro
index 89cd0ffc9..c087b9ec0 100644
--- a/tools/fileengineserver/fileengineserver.pro
+++ b/tools/fileengineserver/fileengineserver.pro
@@ -1,15 +1,11 @@
+include(../../installerbuilder/installerbuilder.pri)
+
 TEMPLATE = app
 DEPENDPATH += . .. ../../installerbuilder/common
 INCLUDEPATH += . ..
 
-DESTDIR = ../../installerbuilder/bin
-
 CONFIG += console
 CONFIG -= app_bundle
 
-include(../../installerbuilder/libinstaller/libinstaller.pri)
-
 # Input
 SOURCES += fileengineserver.cpp
-
-LIBS = -L../../installerbuilder/lib -linstaller $$LIBS