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

This reverts commit 6326dc3187f4c40ec938b03d256befb6d9dfc333. This breaks
shadow builds.  Need to check with creator sources how to do it properly.

Change-Id: I0a9edf31abcee93b1b323ac8d8b80cc492226e29
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>

15 files changed, 124 insertions, 79 deletions

diff --git a/examples/downloadspeed/downloadspeed.pro b/examples/downloadspeed/downloadspeed.pro
index 18495317e..e082c1f65 100644
--- a/examples/downloadspeed/downloadspeed.pro
+++ b/examples/downloadspeed/downloadspeed.pro
@@ -1,5 +1,4 @@
-include(../../installerbuilder/installerbuilder.pri)
-
+include(../../installerbuilder/libinstaller/libinstaller.pri)
 DEPENDPATH += ../../installerbuilder/libinstaller ../../installerbuilder/common
 INCLUDEPATH += ../../installerbuilder/libinstaller ../../installerbuilder/common
 
@@ -10,5 +9,6 @@ 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 72ae3f837..48ac2b0b2 100644
--- a/examples/testapp/testapp.pro
+++ b/examples/testapp/testapp.pro
@@ -1,12 +1,20 @@
-include( ../../installerbuilder/installerbuilder.pri )
-
 TEMPLATE = app
+TARGET =
+
+include( ../../installerbuilder/libinstaller/libinstaller.pri )
+LIBS = -L$$OUT_PWD/../../installerbuilder/lib -linstaller $$LIBS
+
 DESTDIR = packages/com.nokia.testapp/data
 
-CONFIG += uitools help
 QT += script network xml sql
+CONFIG += uitools help
+contains(CONFIG, static): {
+    QTPLUGIN += qsqlite
+    DEFINES += USE_STATIC_SQLITE_PLUGIN
+}
 
 # Input
+FORMS += componentselectiondialog.ui updatesettingsdialog.ui updatesettingswidget.ui
 HEADERS += mainwindow.h \
     componentselectiondialog.h \
     updatesettingsdialog.h \
@@ -18,8 +26,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 2c04380b7..6ee903da7 100644
--- a/installerbuilder/archivegen/archivegen.pro
+++ b/installerbuilder/archivegen/archivegen.pro
@@ -1,16 +1,17 @@
-include(../installerbuilder.pri)
-
-INCLUDEPATH += . ..
-DEPENDPATH += . .. ../common
-
 TEMPLATE = app
 TARGET = archivegen
+DEPENDPATH += . .. ../common
+INCLUDEPATH += . ..
+
+DESTDIR = ../bin
 
 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 6d006e6aa..237ce9952 100644
--- a/installerbuilder/binarycreator/binarycreator.pro
+++ b/installerbuilder/binarycreator/binarycreator.pro
@@ -1,14 +1,16 @@
-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
@@ -18,3 +20,6 @@ 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 08b9fd7ff..e489f7452 100644
--- a/installerbuilder/installerbase/installerbase.pro
+++ b/installerbuilder/installerbase/installerbase.pro
@@ -1,5 +1,3 @@
-include(../installerbuilder.pri)
-
 TEMPLATE = app
 TARGET = installerbase
 
@@ -12,9 +10,14 @@ 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) {
@@ -27,9 +30,10 @@ 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
deleted file mode 100644
index 316a12f5f..000000000
--- a/installerbuilder/installerbuilder.pri
+++ /dev/null
@@ -1,41 +0,0 @@
-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 288bcb872..efed02013 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.target = test
-test.depends = $(TARGET)
-test.commands = (cd tests && $(MAKE) test)
+test.commands=(cd tests && $(MAKE) test)
 
+test.target=test
+test.depends = $(TARGET)
 QMAKE_EXTRA_TARGETS += test
 
 TRANSLATIONS += installerbase/translations/de_de.ts \
diff --git a/installerbuilder/libinstaller/libinstaller.pri b/installerbuilder/libinstaller/libinstaller.pri
new file mode 100644
index 000000000..8d0389d3b
--- /dev/null
+++ b/installerbuilder/libinstaller/libinstaller.pri
@@ -0,0 +1,46 @@
+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 7c8455664..7d656e656 100644
--- a/installerbuilder/repogen/repogen.pro
+++ b/installerbuilder/repogen/repogen.pro
@@ -1,16 +1,17 @@
-include(../installerbuilder.pri)
-
 TEMPLATE = app
 TARGET = repogen
-
-INCLUDEPATH += . ..
 DEPENDPATH += . .. ../common
+INCLUDEPATH += . ..
+
+DESTDIR = ../bin
 
 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 e7398984d..704cf8ff6 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,5 +11,10 @@ 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 afe6f1285..11ccc3474 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,5 +11,10 @@ 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 de1e7c93f..7d3a262a6 100644
--- a/installerfw.pro
+++ b/installerfw.pro
@@ -3,10 +3,9 @@ CONFIG += ordered
 SUBDIRS += installerbuilder examples tools
 mac:SUBDIRS -= examples
 
-test.target = test
+test.target=test
+test.commands=(cd installerbuilder && $(MAKE) 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 5dd649dbf..fe30f20b2 100644
--- a/tools/extractbinarydata/extractbinarydata.pro
+++ b/tools/extractbinarydata/extractbinarydata.pro
@@ -1,13 +1,17 @@
-include(../../installerbuilder/installerbuilder.pri)
-
 TEMPLATE = app
-INCLUDEPATH += . ..
 DEPENDPATH += . .. ../../installerbuilder/common
+INCLUDEPATH += . ..
+
+DESTDIR = ../../installerbuilder/bin
 
 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 6f9ecbff7..8946813ae 100644
--- a/tools/fileengineclient/fileengineclient.pro
+++ b/tools/fileengineclient/fileengineclient.pro
@@ -1,13 +1,17 @@
-include(../../installerbuilder/installerbuilder.pri)
-
 TEMPLATE = app
-INCLUDEPATH += . ..
 DEPENDPATH += . .. ../../installerbuilder/common
+INCLUDEPATH += . ..
+
+DESTDIR = ../../installerbuilder/bin
 
 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 c087b9ec0..89cd0ffc9 100644
--- a/tools/fileengineserver/fileengineserver.pro
+++ b/tools/fileengineserver/fileengineserver.pro
@@ -1,11 +1,15 @@
-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