Merge lp:~thomas-voss/platform-api/add-package-config into lp:platform-api

[Thomas Voß]

 * Add a pkgconfig file for the platform API
 * Adjust installation of header files to account for version

 * Add a pkgconfig file for the platform API
 * Adjust installation of header files to account for version

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/platform-api-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/37/rebuild

review: Approve (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

the -dev package is multi-arched: same
So, the pkgconfig file should be installed in: /usr/lib/(triplet)/pkgconfig rather than /usr/lib/pkgconfig.

Otherwise good, work, the header having major version doesn't make my eyes bleeding :)

review: Needs Fixing

[lp:~thomas-voss/platform-api/add-package-config]

69. By Thomas Voß on 2013-06-13

 * Adjust pkgconfig installation to account for architecture triplet.

[Thomas Voß (thomas-voss)]

> the -dev package is multi-arched: same
> So, the pkgconfig file should be installed in: /usr/lib/(triplet)/pkgconfig
> rather than /usr/lib/pkgconfig.
>

Fixed.

> Otherwise good, work, the header having major version doesn't make my eyes
> bleeding :)

Thx :)

[Didier Roche-Tolomelli (didrocks)]

Perfect! approved for me :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:69
http://jenkins.qa.ubuntu.com/job/platform-api-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/38/rebuild

review: Approve (continuous-integration)

[lp:~thomas-voss/platform-api/add-package-config]

70. By Thomas Voß on 2013-06-20

[ Gerry Boland ]
* Add mir suport.
[ Robert Carr ]
* Add mir suport.
[ Ubuntu daily release ]
* Automatic snapshot from revision 69
[ Ricardo Mendoza ]
* Allow remote App Manager to take care of signalling processes.
[ Ubuntu daily release ]
* Automatic snapshot from revision 67

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/platform-api-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/45/rebuild

review: Approve (continuous-integration)

[Ricardo Mendoza (ricmm)]

Builds, runs, work fine on flipped container with Mir and hybris.

review: Approve

[Ricardo Salveti (rsalveti)]

76 +Architecture: any
85 +Architecture: any

As we don't have hybris for powerpc I'm not sure if moving to any is the right choice.

138 - DESTINATION include/ubuntu/application/sensors/event
139 + DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/sensors/event

150 - DESTINATION include/ubuntu/application/ui
151 + DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/ui

164 - DESTINATION include/ubuntu/application/ui/input
165 + DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/ui/input

175 - DESTINATION include/ubuntu/ui
176 + DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/ui

Before moving this forward, please have MRs for all the consumers as well (or create a temporarily link while you get the rest fixed).

Otherwise this will create a ton of FTBFS.

review: Needs Fixing

[Thomas Voß (thomas-voss)]

> 76 +Architecture: any
> 85 +Architecture: any
>
> As we don't have hybris for powerpc I'm not sure if moving to any is the right
> choice.

I will cross-check with didrocks.

>
> 138 - DESTINATION include/ubuntu/application/sensors/event
> 139 + DESTINATION
> include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/sensors/event
>
> 150 - DESTINATION include/ubuntu/application/ui
> 151 + DESTINATION
> include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/ui
>
> 164 - DESTINATION include/ubuntu/application/ui/input
> 165 + DESTINATION
> include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/ui/input
>
> 175 - DESTINATION include/ubuntu/ui
> 176 + DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/ui
>
> Before moving this forward, please have MRs for all the consumers as well (or
> create a temporarily link while you get the rest fixed).
>

I would rather prefer not releasing this version as there are likely more packaging changes coming down the pipe. I'm happy to provide patches for the consumers, but I would propose to do that in one go after we are happy with the packaging of the platform API.

> Otherwise this will create a ton of FTBFS.

Agreed :)

review: Approve

[Ricardo Salveti (rsalveti)]

You could change and have a temporarily link to still be compatible with current costumers, otherwise having MRs for everyone at the same time might be just too painful.

[lp:~thomas-voss/platform-api/add-package-config]

71. By Thomas Voß on 2013-06-30

 * Add unversioned header directory as link to keep consumers working for now.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/platform-api-ci/56/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-amd64-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-i386-ci/26/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/56/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/platform-api/add-package-config]

72. By Thomas Voß on 2013-07-03

[ Ricardo Mendoza ]
* Add guards for NULL sensors.
[ Ubuntu daily release ]
* Automatic snapshot from revision 79
[ Didier Roche ]
* minor cosmetic cleanups as we detect the archs we can't build for in
  daily release now.
[ Ubuntu daily release ]
* Automatic snapshot from revision 77
[ Ricardo Mendoza ]
* GCC 4.8 introduces a change for ARM AAPCS calling conventions, this
  breaks ABI for us because the Android library is built with GCC 4.7.
  Revert to building platform-api with GCC 4.7 until we can update the
  Android build. .
[ Ubuntu daily release ]
* Automatic snapshot from revision 75
[ Robert Carr ]
* Add missing mir stub (ua_ui_session_properties_set_remote_pid).
[ Ubuntu daily release ]
* Automatic snapshot from revision 73
[ Ubuntu daily release ]
* debian/*symbols: auto-update new symbols to released version
[ Didier Roche ]
* Add a symbol files with unmangled C++ symbols to track ABI.
[ Dmitrijs Ledkovs ]
* Add a symbol files with unmangled C++ symbols to track ABI.
[ Ubuntu daily release ]
* Automatic snapshot from revision 71

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:72
http://jenkins.qa.ubuntu.com/job/platform-api-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-i386-ci/31

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/61/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

71 + dh_link include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR} include/ubuntu

debian/rules doesn't know about UBUNTU_PLATFORM_API_VERSION_MAJOR.

Also, while you're on it, mind cleaning debian/rules to remove the -DUSE_GLES part?

Follows a suggestion for a fix:
"""
=== added file 'debian/libplatform-api-headers.links'
--- debian/libplatform-api-headers.links 1970-01-01 00:00:00 +0000
+++ debian/libplatform-api-headers.links 2013-07-04 04:43:51 +0000
@@ -0,0 +1,1 @@
+usr/include/ubuntu-1 usr/include/ubuntu

=== modified file 'debian/rules'
--- debian/rules 2013-07-03 07:23:59 +0000
+++ debian/rules 2013-07-04 04:44:23 +0000
@@ -4,19 +4,8 @@

 export CXX=g++-4.7

-gles2_architectures := armhf
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
- use_gles=1
-else
- use_gles=0
-endif
-
 %:
  dh $@

-override_dh_auto_configure:
- dh_auto_configure -- -DUSE_GLES=$(use_gles)
-
 overrid_dh_install:
  dh_install --fail-missing
- dh_link include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR} include/ubuntu

"""

You don't need to worry much about the hardcoded major version as this is just a temporary fix while we rebuild/fix the other packages.

review: Needs Fixing

[lp:~thomas-voss/platform-api/add-package-config]

73. By Thomas Voß on 2013-07-04

 * Remove obsolete USE_GLES mechanisms.
 * Add a links file to create temporary symbolic link for the header directory.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:73
http://jenkins.qa.ubuntu.com/job/platform-api-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/32/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-i386-ci/32

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/62/rebuild

review: Approve (continuous-integration)

[lp:~thomas-voss/platform-api/add-package-config]

74. By Thomas Voß on 2013-07-04

 * Install status and unit headers.

[Ricardo Salveti (rsalveti)]

Good, built qtubuntu, worked fine.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:74
http://jenkins.qa.ubuntu.com/job/platform-api-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-i386-ci/33

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/63/rebuild

review: Approve (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

looks good to me as well, I can see a small simplification in debian/rules still, but will do it later on :)

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-07-01 14:04:18 +0000
+++ CMakeLists.txt	2013-07-04 06:26:26 +0000
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 
-project(ubuntu_platform_api)
+project(ubuntu-platform-api)
 
 set(UBUNTU_PLATFORM_API_VERSION_MAJOR 1)
 set(UBUNTU_PLATFORM_API_VERSION_MINOR 0)
@@ -87,6 +87,7 @@
 include_directories(include)
 include_directories(android/include)
 
+add_subdirectory(data/)
 add_subdirectory(doc/)
 add_subdirectory(include/)
 add_subdirectory(src/)
 
=== added directory 'data'
=== added file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ data/CMakeLists.txt	2013-07-04 06:26:26 +0000
@@ -0,0 +1,8 @@
+configure_file(
+  ubuntu-platform-api.pc.in ubuntu-platform-api.pc @ONLY
+)
+
+install(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-platform-api.pc
+  DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig
+)
 \ No newline at end of file
 
=== added file 'data/ubuntu-platform-api.pc.in'
--- data/ubuntu-platform-api.pc.in	1970-01-01 00:00:00 +0000
+++ data/ubuntu-platform-api.pc.in	2013-07-04 06:26:26 +0000
@@ -0,0 +1,9 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${exec_prefix}/include
+ 
+Name: @CMAKE_PROJECT_NAME@
+Description: Ubuntu's platform abstraction layer.
+Version: @UBUNTU_PLATFORM_API_VERSION_MAJOR@.@UBUNTU_PLATFORM_API_VERSION_MINOR@.@UBUNTU_PLATFORM_API_VERSION_PATCH@
+Cflags: -I${includedir}/ubuntu-@UBUNTU_PLATFORM_API_VERSION_MAJOR@
 
=== modified file 'debian/libplatform-api-headers.install'
--- debian/libplatform-api-headers.install	2013-03-20 12:49:06 +0000
+++ debian/libplatform-api-headers.install	2013-07-04 06:26:26 +0000
@@ -1,1 +1,1 @@
-usr/include
+usr/include/
 
=== added file 'debian/libplatform-api-headers.links'
--- debian/libplatform-api-headers.links	1970-01-01 00:00:00 +0000
+++ debian/libplatform-api-headers.links	2013-07-04 06:26:26 +0000
@@ -0,0 +1,1 @@
+usr/include/ubuntu-1 usr/include/ubuntu
 \ No newline at end of file
 
=== modified file 'debian/libplatform-api1-dev.install'
--- debian/libplatform-api1-dev.install	2013-03-20 12:49:06 +0000
+++ debian/libplatform-api1-dev.install	2013-07-04 06:26:26 +0000
@@ -1,1 +1,2 @@
 usr/lib/*/libubuntu_application_api.so
+usr/lib/*/pkgconfig/ubuntu-platform-api.pc
 
=== modified file 'debian/rules'
--- debian/rules	2013-06-26 19:21:02 +0000
+++ debian/rules	2013-07-04 06:26:26 +0000
@@ -4,18 +4,8 @@
 
 export CXX=g++-4.7
 
-gles2_architectures := armhf
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
-	use_gles=1
-else
-	use_gles=0
-endif
-
 %:
 	dh $@
 
-override_dh_auto_configure:
-	dh_auto_configure -- -DUSE_GLES=$(use_gles)
-
 overrid_dh_install:
 	dh_install --fail-missing
 
=== modified file 'include/ubuntu/CMakeLists.txt'
--- include/ubuntu/CMakeLists.txt	2013-06-11 09:40:30 +0000
+++ include/ubuntu/CMakeLists.txt	2013-07-04 06:26:26 +0000
@@ -1,2 +1,13 @@
+set(
+  UBUNTU_HEADERS
+  status.h
+  unit.h
+)
+
+install(
+  FILES ${UBUNTU_HEADERS}
+  DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}
+)
+
 add_subdirectory(application)
 add_subdirectory(ui)
 \ No newline at end of file
 
=== modified file 'include/ubuntu/application/CMakeLists.txt'
--- include/ubuntu/application/CMakeLists.txt	2013-06-11 09:40:30 +0000
+++ include/ubuntu/application/CMakeLists.txt	2013-07-04 06:26:26 +0000
@@ -12,7 +12,7 @@
 
 install(
   FILES ${UBUNTU_APPLICATION_HEADERS}
-  DESTINATION include/ubuntu/application
+  DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application
 )
 
 add_subdirectory(sensors)
 
=== modified file 'include/ubuntu/application/sensors/CMakeLists.txt'
--- include/ubuntu/application/sensors/CMakeLists.txt	2013-06-11 09:40:30 +0000
+++ include/ubuntu/application/sensors/CMakeLists.txt	2013-07-04 06:26:26 +0000
@@ -8,7 +8,7 @@
 
 install(
   FILES ${UBUNTU_APPLICATION_SENSORS_HEADERS}
-  DESTINATION include/ubuntu/application/sensors
+  DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/sensors
 )
 
 add_subdirectory(event)
 \ No newline at end of file
 
=== modified file 'include/ubuntu/application/sensors/event/CMakeLists.txt'
--- include/ubuntu/application/sensors/event/CMakeLists.txt	2013-06-11 09:40:30 +0000
+++ include/ubuntu/application/sensors/event/CMakeLists.txt	2013-07-04 06:26:26 +0000
@@ -7,5 +7,5 @@
 
 install(
   FILES ${UBUNTU_APPLICATION_SENSORS_EVENT_HEADERS}
-  DESTINATION include/ubuntu/application/sensors/event
+  DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/sensors/event
 )
 \ No newline at end of file
 
=== modified file 'include/ubuntu/application/ui/CMakeLists.txt'
--- include/ubuntu/application/ui/CMakeLists.txt	2013-06-11 09:40:30 +0000
+++ include/ubuntu/application/ui/CMakeLists.txt	2013-07-04 06:26:26 +0000
@@ -19,7 +19,7 @@
 
 install(
   FILES ${UBUNTU_APPLICATION_UI_HEADERS}
-  DESTINATION include/ubuntu/application/ui
+  DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/ui
 )
 
 add_subdirectory(input)
 \ No newline at end of file
 
=== modified file 'include/ubuntu/application/ui/input/CMakeLists.txt'
--- include/ubuntu/application/ui/input/CMakeLists.txt	2013-06-11 09:40:30 +0000
+++ include/ubuntu/application/ui/input/CMakeLists.txt	2013-07-04 06:26:26 +0000
@@ -5,5 +5,5 @@
 
 install(
   FILES ${UBUNTU_APPLICATION_UI_INPUT_HEADERS}
-  DESTINATION include/ubuntu/application/ui/input
+  DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/ui/input
 )
 \ No newline at end of file
 
=== modified file 'include/ubuntu/ui/CMakeLists.txt'
--- include/ubuntu/ui/CMakeLists.txt	2013-06-11 09:40:30 +0000
+++ include/ubuntu/ui/CMakeLists.txt	2013-07-04 06:26:26 +0000
@@ -1,4 +1,4 @@
 install(
   FILES ubuntu_ui_session_service.h
-  DESTINATION include/ubuntu/ui
+  DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/ui
 )
 \ No newline at end of file