Merge lp:~mzanetti/unity/phablet-better-cmake into lp:unity/phablet

[Michael Zanetti]

use a static python install path for autopilot tests

make determining python install path in cmake a bit more robust and verbose

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:508
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/147/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/148
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/147
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/23/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/351

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/147/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:508
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/166/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/167
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/167/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/166/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/420

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/166/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:508
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/188/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/189
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/189/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/64
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/64/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/441

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/188/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

We need to make sure what's the recommended approach here. We did merge s/python2.7/python/ for debian/control, what all the other projects did, but if this MP is the right solution (I'm inclined to think so - will python == python2 even after python3 becomes default?), we need to apply it across the board.

review: Needs Information

[Michael Zanetti (mzanetti)]

I think this should be ok now...

build-dep is "python" and the call is to "python" too. All references to "python2.7" should be gone and that should also be future-proof for python 3.

[Michael Zanetti (mzanetti)]

The fallback - in case the path could not be determined with the python call - indeed needs to be updated for a specific python version.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:510
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/276/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/277
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/277/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/152
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/152
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/647

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/276/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

I will try and gather some more information, I'm still afraid we'll end up with a broken setup when python becomes python3 by default, if any of autopilot or the tests will not be python3 ready.

[Michi Henning (michihenning)]

The absolute path produced by this prevents make install from working.

See https://bugs.launchpad.net/unity/+bug/1164825

review: Needs Fixing

[Michael Terry (mterry)]

Regarding python/python3, last I checked, Ubuntu has no plans to make python point at python3. "python" == "python2"

[Michał Sawicz (saviq)]

Could we add a enable_localinstall (default OFF) option and install under CMAKE_INSTALL_PREFIX when it's enabled?

review: Needs Information

[Michi Henning (michihenning)]

I don't think we need such an option. This is enough:

if (NOT DEFINED CMAKE_INSTALL_PREFIX)
    set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "" FORCE)
endif()

The idea is that I can test the install target locally by running "make install". This makes it easy to check that everything that should be installed is actually installed, and installed in the correct location.

At any rate, we can't have an absolute path in any of the install targets because that defeats the purpose of CMAKE_INSTALL_PREFIX.

[Michael Zanetti (mzanetti)]

Hey.. I've been thinking about this....

- It seems in case python would be upgraded to 3 there always is the need of manual intervention in some way or the other.
- most likely the tests (and autopilot itself) won't work with python3 anyways. That means having a dynamic install path that would not solve that problem but just causes weirdness => installing always to 2.7 would immediately show the version mismatch.
- those calls to python in cmake etc introduce the problematic dependencies
- As Michi pointed out, it also breaks CMAKE_INSTALL_PATH

=> My conclusion is to remove all the crap and just install it to the python2.7 dir in the .install file.

How does that sound?

[Michi Henning (michihenning)]

> => My conclusion is to remove all the crap and just install it to the
> python2.7 dir in the .install file.
>
> How does that sound?

As long as we have a specific dependency on python2.7, I don't see a problem with that.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:512
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/358/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/359
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/359/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/358
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/234
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/234/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/766

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/358/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

> > => My conclusion is to remove all the crap and just install it to the
> > python2.7 dir in the .install file.
> >
> > How does that sound?
>
> As long as we have a specific dependency on python2.7, I don't see a problem
> with that.

We don't need the build dependency any more... Before it was just there because cmake was executing that python call.

For running the tests, there is an implicit dependency to python through autopilot itself.

[Michał Sawicz (saviq)]

review: Approve

[Michał Sawicz (saviq)]

We should have a proper FindPython module that would determine that path for us while taking CMAKE_INSTALL_PREFIX into account...

=== modified file 'debian/control'
--- debian/control	2013-04-05 09:22:26 +0000
+++ debian/control	2013-04-09 09:46:21 +0000
@@ -22,7 +22,6 @@
                libhud-client1-dev,
                libdee-qt5-dev (>= 3.0),
                demo-assets,
-               python,
 Standards-Version: 3.9.3
 Vcs-Bzr: lp:unity/phablet
 

=== modified file 'debian/qml-phone-shell-autopilot.install'
--- debian/qml-phone-shell-autopilot.install	2013-02-26 15:02:07 +0000
+++ debian/qml-phone-shell-autopilot.install	2013-04-09 09:46:21 +0000
@@ -1,1 +1,1 @@
-usr/lib/python*/dist-packages/qml_phone_shell/*
+tests/autopilot/qml_phone_shell/* usr/lib/python2.7/dist-packages/qml_phone_shell/

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-04-04 20:22:30 +0000
+++ tests/CMakeLists.txt	2013-04-09 09:46:21 +0000
@@ -68,6 +68,5 @@
 
 add_custom_target(alltests)
 
-add_subdirectory(autopilot)
 add_subdirectory(unittests)
 add_subdirectory(qmluitests)

=== removed file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt	2013-03-27 11:12:48 +0000
+++ tests/autopilot/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-set(AUTOPILOT_DIR qml_phone_shell)
-
-execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
-    OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-install(DIRECTORY ${AUTOPILOT_DIR}
-    DESTINATION ${PYTHON_PACKAGE_DIR}
-    )