Merge lp:~ricmm/qtubuntu/build-multiple-binary-fix into lp:qtubuntu

[Ricardo Mendoza]

Clean up build rules to allow for correct building of multiple binary packages from the same source.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:202
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/107/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-ci/18/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/107/rebuild

review: Approve (continuous-integration)

[lp:~ricmm/qtubuntu/build-multiple-binary-fix]

203. By Ricardo Mendoza on 2014-01-30

Split installation sets so that we can pull non-object files from the base source.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:203
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/108/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-ci/19/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/108/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Good, tested with SF and it works again.

review: Approve

=== modified file 'debian/rules' (properties changed: +x to -x)
--- debian/rules	2013-12-09 17:31:20 +0000
+++ debian/rules	2014-01-30 14:58:00 +0000
@@ -5,16 +5,33 @@
 
 ANDROID_DIR = build-android
 DESKTOP_DIR = build-desktop
+TMP1_DIR = $(CURDIR)/debian/tmp1
+TMP2_DIR = $(CURDIR)/debian/tmp2
 
 %:
-	dh $@ --builddirectory=$(ANDROID_DIR) --parallel
-	dh $@ --builddirectory=$(DESKTOP_DIR) --parallel
+	dh $@
+
+override_dh_clean:
+	rm -rf $(TMP1_DIR)
+	rm -rf $(TMP2_DIR)
+	dh_clean
 
 override_dh_auto_configure:
-	mkdir -p $(ANDROID_DIR) && dh_auto_configure -- "CONFIG+=mirserver" "CONFIG+=mirclient" "CONFIG+=hybris" "QMAKE_CXXFLAGS=-g" $(CURDIR)
-	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -- "CONFIG+=mirserver" "CONFIG+=mirclient" "QMAKE_CXXFLAGS=-g" $(CURDIR)
+	mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- "CONFIG+=mirserver" "CONFIG+=mirclient" "CONFIG+=hybris" "QMAKE_CXXFLAGS=-g" $(CURDIR)
+	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- "CONFIG+=mirserver" "CONFIG+=mirclient" "QMAKE_CXXFLAGS=-g" $(CURDIR)
+
+override_dh_auto_build:
+	dh_auto_build -B$(ANDROID_DIR)
+	dh_auto_build -B$(DESKTOP_DIR)
+
+override_dh_auto_install:
+	rm -f debian/*/usr/lib/*/qt5/examples/qtubuntu/qmlscene-ubuntu
+	mkdir -p $(TMP1_DIR) && cd $(ANDROID_DIR) && INSTALL_ROOT=$(TMP1_DIR) make install
+	cd $(CURDIR)
+	mkdir -p $(TMP2_DIR) && cd $(DESKTOP_DIR) && INSTALL_ROOT=$(TMP2_DIR) make install
+	cd $(CURDIR)
 
 override_dh_install:
-	rm -f debian/*/usr/lib/*/qt5/examples/qtubuntu/qmlscene-ubuntu
-	dh_install --fail-missing
+	dh_install --sourcedir=$(TMP1_DIR) -pqtubuntu-android
+	dh_install --sourcedir=$(TMP2_DIR) -pqtubuntu-desktop
 

=== modified file 'src/modules/application/application.pro'
--- src/modules/application/application.pro	2013-11-22 15:24:44 +0000
+++ src/modules/application/application.pro	2014-01-30 14:58:00 +0000
@@ -37,6 +37,9 @@
 
 LIBS += -lubuntu_application_api
 
-target.files += libunityapplicationplugin.so qmldir OSKController.qml
 target.path += $$[QT_INSTALL_IMPORTS]/Unity/Application
 INSTALLS += target
+
+assets.files = qmldir OSKController.qml
+assets.path = $$[QT_INSTALL_IMPORTS]/Unity/Application
+INSTALLS += assets