move mcompositor-test-init.py to mcompositor-utils

...and other packaging improvements:
 * correct dependencies for mcompositor-utils
 * renew tests/functional/functional.pro

5 files changed, 39 insertions, 29 deletions

diff --git a/debian/control b/debian/control
index fc66497..2bed8c0 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Package: mcompositor
 Replaces: duicompositor
 Conflicts: duicompositor
 Architecture: any
-Depends: libmeegotouchcore0, ${shlibs:Depends}
+Depends: ${shlibs:Depends}
 Description: MeeGo Touch UI Compositing Window Manager
  MeeGo Touch UI Compositing Window Manager
  
@@ -27,18 +27,15 @@ Description: MeeGo Touch UI Compositing Window Manager header files
 
 Package: mcompositor-utils
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, mcetools, gconf2, aegis-dss-tools [arm armel]
 Description: commandline tools for testing mcompositor
- . 
-
 
 Package: mcompositor-functional-tests
 Architecture: any
-Depends: libmeegotouchcore0, ci-testing, meego-env-dimming, meego-env-behave, python, contextkit-utils, aegis-dss-tools [arm armel], x11-utils, mcompositor-utils, ${shlibs:Depends}
-XB-Maemo-CI-Packages:  mcompositor
+Depends: mcompositor, ci-testing, meego-env-dimming, meego-env-behave, python, contextkit-utils, x11-utils, mcompositor-utils
+XB-Maemo-CI-Packages: mcompositor
 XB-Maemo-CI-Stage: fast
 Description: mcompositor functional testcases
- . 
 
 Package: mcompositor-l10n-engineering-english
 Section: devel
diff --git a/debian/mcompositor-functional-tests.install b/debian/mcompositor-functional-tests.install
index 0f43550..2318d6e 100644
--- a/debian/mcompositor-functional-tests.install
+++ b/debian/mcompositor-functional-tests.install
@@ -1,3 +1,2 @@
 usr/share/mcompositor-functional-tests
 usr/share/meegotouch/testscripts
-usr/bin/mcompositor-test-init.py
diff --git a/debian/mcompositor-utils.install b/debian/mcompositor-utils.install
index 8f5e9e8..2294376 100644
--- a/debian/mcompositor-utils.install
+++ b/debian/mcompositor-utils.install
@@ -1,3 +1,4 @@
 usr/bin/windowctl
 usr/bin/windowstack
 usr/bin/focus-tracker
+usr/bin/mcompositor-test-init.py
diff --git a/tests/functional/createTestXml b/tests/functional/createTestXml
index e229324..e229324 100644..100755
--- a/tests/functional/createTestXml
+++ b/tests/functional/createTestXml
diff --git a/tests/functional/functional.pro b/tests/functional/functional.pro
index 5a80ff1..9bbb9e4 100644
--- a/tests/functional/functional.pro
+++ b/tests/functional/functional.pro
@@ -1,26 +1,39 @@
-TEMPLATE=subdirs
-
-QMAKE_EXTRA_TARGETS += metadata initScript
-XMLLINT= xmllint --noout --schema /usr/share/test-definition/testdefinition-syntax.xsd --schema /usr/share/test-definition/testdefinition-tm_terms.xsd 
-
+# Definitions
+TD=/usr/share/test-definition/testdefinition
 SUITENAME=mcompositor-functional-tests
-scripts.path=/usr/share/meegotouch/testscripts/$$SUITENAME
-scripts.files += \
-    test*.py \
-
-
-metadata.commands =  ./createTestXml $${scripts.path} $${scripts.files}; 
-metadata.commands +=  $$XMLLINT tests.xml
 
-metadata.target=tests.xml
-
-metadata.path=/usr/share/$$SUITENAME
-
-metadata.files += tests.xml 
-
-metadata.CONFIG += no_check_exist
+# Stupid qmake wants to link everything.
+QMAKE_LINK = @: IGNORE THIS LINE
 
+# The init script will be part of mcompositor-utils.
 initScript.files = mcompositor-test-init.py
 initScript.path = /usr/bin
-
-INSTALLS += metadata scripts initScript
+PRE_TARGETDEPS += $${initScript.files}
+INSTALLS += initScript
+
+# Install all test scripts.
+scripts.files += test*.py
+scripts.path = /usr/share/meegotouch/testscripts/$$SUITENAME
+INSTALLS += scripts
+
+# Simple and easy way to build tests.xml.
+metadata.target = tests.xml
+metadata.depends = $${scripts.files} setandsuite.testdata
+metadata.input = $${metadata.depends}
+metadata.output = $${metadata.target}
+metadata.commands = ./createTestXml $${scripts.path} $${metadata.input};
+metadata.commands += xmllint --noout --schema $$TD-syntax.xsd --schema $$TD-tm_terms.xsd $${metadata.output};
+QMAKE_EXTRA_COMPILERS += metadata
+QMAKE_EXTRA_TARGETS += metadata
+PRE_TARGETDEPS += $${metadata.output}
+
+# Make make clean work.
+clean.depends += compiler_metadata_clean
+QMAKE_EXTRA_TARGETS += clean
+
+# If we added metadata to INSTALLS it would regenerate tests.xml every
+# time you install.
+mdinst.depends = $${metadata.output}
+mdinst.files = $${metadata.output}
+mdinst.path = /usr/share/$$SUITENAME
+INSTALLS += mdinst