Merge lp:~sergiusens/ubuntu-calendar-app/cmake into lp:ubuntu-calendar-app

[Sergio Schvezov]

cmake rules for common building

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:183
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/246/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/755/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/246/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/246/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/80/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/246/rebuild

review: Needs Fixing (continuous-integration)

[lp:~sergiusens/ubuntu-calendar-app/cmake]

184. By Sergio Schvezov on 2014-01-22

Adding cmake to build deps

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:184
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/247/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/756
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/247
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/247
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/81

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/247/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Looks good.

=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2014-01-22 10:19:10 +0000
@@ -0,0 +1,57 @@
+project(com.ubuntu.calendar)
+cmake_minimum_required(VERSION 2.8.9)
+
+# Standard install paths
+include(GNUInstallDirs)
+
+option(INSTALL_TESTS "Install the tests on make install" on)
+option(CLICK_MODE "Installs to a contained location" off)
+
+set(APP_NAME calendar)
+set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
+set(MAIN_QML calendar.qml)
+set(ICON calendar64.png)
+set(AUTOPILOT_DIR calendar_app)
+set(APP_HARDCODE calendar-app)
+
+if(CLICK_MODE)
+    if(NOT DEFINED BZR_SOURCE)
+		set(BZR_SOURCE "lp:ubuntu-${APP_HARDCODE}")
+		message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
+    endif(NOT DEFINED BZR_SOURCE)
+    set(CMAKE_INSTALL_PREFIX /)
+    set(CMAKE_INSTALL_BINDIR /)
+	set(DATA_DIR /)
+	set(EXEC "qmlscene %u ${MAIN_QML}")
+	set(DESKTOP_DIR ${DATA_DIR})
+else(CLICK_MODE)
+	set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
+	set(EXEC ${APP_HARDCODE})
+	set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON})
+	configure_file(${APP_HARDCODE}.in
+		${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
+	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
+		DESTINATION ${CMAKE_INSTALL_BINDIR})
+	set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
+endif(CLICK_MODE)
+
+file(GLOB_RECURSE I18N_SRC_FILES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+     rc/**.qml desktop/**.desktop.in)
+list(SORT I18N_SRC_FILES)
+
+
+file(GLOB SRC_FILES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+     *.qml *.js *.png *.js)
+install(FILES ${SRC_FILES}  DESTINATION ${DATA_DIR})
+
+configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION ${DESKTOP_DIR})
+ 
+# Tests
+enable_testing()
+
+add_subdirectory(click)
+add_subdirectory(po)
+add_subdirectory(tests)

=== removed directory 'apparmor'
=== renamed file 'calendar-app' => 'calendar-app.in' (properties changed: +x to -x)
--- calendar-app	2013-06-12 15:23:13 +0000
+++ calendar-app.in	2014-01-22 10:19:10 +0000
@@ -1,2 +1,3 @@
-#!/bin/bash
-qmlscene /usr/share/calendar-app/calendar.qml
+#!/bin/sh
+export QT_SELECT=qt5
+qmlscene @CMAKE_INSTALL_PREFIX@/@DATA_DIR@/@MAIN_QML@

=== added directory 'click'
=== added file 'click/CMakeLists.txt'
--- click/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ click/CMakeLists.txt	2014-01-22 10:19:10 +0000
@@ -0,0 +1,8 @@
+if(CLICK_MODE)
+    if(NOT BZR_REVNO)
+        set(BZR_REVNO "latest")
+    endif(NOT BZR_REVNO)
+    configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json apparmor.json
+            DESTINATION ${CMAKE_INSTALL_PREFIX})
+endif(CLICK_MODE)

=== renamed file 'apparmor/calendar.json' => 'click/apparmor.json'
=== renamed file 'manifest.json' => 'click/manifest.json.in'
--- manifest.json	2013-10-17 06:29:12 +0000
+++ click/manifest.json.in	2014-01-22 10:19:10 +0000
@@ -2,14 +2,21 @@
     "description": "Calendar application for Ubuntu devices",
     "framework": "ubuntu-sdk-13.10",
     "hooks": {
-        "calendar": {
-            "apparmor": "apparmor/calendar.json",
-            "desktop": "calendar-app.desktop"
+        "@APP_NAME@": {
+            "apparmor": "apparmor.json",
+            "desktop": "@DESKTOP_FILE@"
         }
     },
-    "icon": "calendar64.png",
+    "icon": "@ICON@",
     "maintainer": "Ubuntu App Cats <[e-mail]>",
-    "name": "com.ubuntu.calendar",
-    "title": "calendar",
-    "version": "0.4"
+    "name": "@PROJECT_NAME@",
+    "title": "Calendar",
+    "version": "0.4.@BZR_REVNO@",
+    "x-source": {
+        "vcs-bzr": "@BZR_SOURCE@", 
+        "vcs-bzr-revno": "@BZR_REVNO@"
+    },
+	"x-test": {
+		"autopilot": "@AUTOPILOT_DIR@"
+	}
 }

=== renamed file 'calendar-app.desktop' => 'com.ubuntu.calendar_calendar.desktop.in'
--- calendar-app.desktop	2013-10-16 18:43:17 +0000
+++ com.ubuntu.calendar_calendar.desktop.in	2014-01-22 10:19:10 +0000
@@ -2,9 +2,9 @@
 Version=1.0
 Type=Application
 Terminal=false
-Exec=qmlscene %u /usr/share/calendar-app/calendar.qml
-Icon=/usr/share/calendar-app/calendar64.png
+Exec=@EXEC@
+Icon=@ICON@
 Name=Calendar
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Gettext-Domain=com.ubuntu.calendar
+X-Ubuntu-Gettext-Domain=@PROJECT_NAME@

=== modified file 'debian/calendar-app-autopilot.install'
--- debian/calendar-app-autopilot.install	2013-06-12 15:47:15 +0000
+++ debian/calendar-app-autopilot.install	2014-01-22 10:19:10 +0000
@@ -1,1 +1,2 @@
-tests/autopilot/calendar_app/* usr/lib/python2.7/dist-packages/calendar_app/
+usr/lib/*/dist-packages/calendar_app/*
+

=== modified file 'debian/calendar-app.install'
--- debian/calendar-app.install	2013-06-12 15:23:13 +0000
+++ debian/calendar-app.install	2014-01-22 10:19:10 +0000
@@ -1,5 +1,2 @@
-calendar-app usr/bin/
-calendar-app.desktop usr/share/applications/
-*.qml usr/share/calendar-app/
-*.png usr/share/calendar-app/
-*.js usr/share/calendar-app/
+usr/bin/*
+usr/share/*

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-12 15:32:14 +0000
+++ debian/changelog	2014-01-22 10:19:10 +0000
@@ -1,3 +1,9 @@
+calendar-app (0.4ubuntu1) UNRELEASED; urgency=medium
+
+  * Adding cmake 
+
+ -- Sergio Schvezov <[e-mail]>  Sat, 18 Jan 2014 17:05:03 -0300
+
 calendar-app (0.4) raring; urgency=low
 
   * Renamed package

=== modified file 'debian/control'
--- debian/control	2013-10-25 04:07:59 +0000
+++ debian/control	2014-01-22 10:19:10 +0000
@@ -1,7 +1,8 @@
 Source: calendar-app
 Priority: extra
 Maintainer: Ubuntu App Cats <[e-mail]>
-Build-Depends: debhelper (>= 9), 
+Build-Depends: cmake,
+               debhelper (>= 9), 
                qtdeclarative5-dev-tools,
                qt5-default,
                qtdeclarative5-qtquick2-plugin,

=== modified file 'debian/rules'
--- debian/rules	2013-10-16 18:43:17 +0000
+++ debian/rules	2014-01-22 10:19:10 +0000
@@ -9,16 +9,3 @@
 
 override_dh_auto_test:
 	QT_QPA_PLATFORM=minimal qmltestrunner -input tests/unittests/
-
-override_dh_install:
-	dh_install --fail-missing
-	appname=com.ubuntu.calendar; \
-	for pofile in $(shell find ./po -name "*.po"); do \
-		pofilename="$${pofile##*/}"; \
-		langcode="$${pofilename%.*}"; \
-		localedir="usr/share/locale/$$langcode/LC_MESSAGES"; \
-		mofile="$$appname.mo"; \
-		msgfmt -o $$mofile $$pofile; \
-		dh_install $$mofile $$localedir; \
-		rm -f $$mofile; \
-	done

=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2014-01-22 10:19:10 +0000
@@ -0,0 +1,25 @@
+include(FindGettext)
+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
+
+set(DOMAIN ${PROJECT_NAME})
+set(POT_FILE ${DOMAIN}.pot)
+file(GLOB PO_FILES *.po)
+
+add_custom_target(${POT_FILE}
+                  COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
+                          -D ${CMAKE_SOURCE_DIR}
+                          --from-code=UTF-8
+                          --c++ --qt --add-comments=TRANSLATORS
+                          --keyword=tr --keyword=tr:1,2
+						  --package-name='${PROJECT}'
+                          --copyright-holder='Canonical Ltd.'
+                          ${I18N_SRC_FILES})
+
+foreach(PO_FILE ${PO_FILES})
+    get_filename_component(LANG ${PO_FILE} NAME_WE)
+    gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
+    set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
+            DESTINATION ${INSTALL_DIR}
+            RENAME ${DOMAIN}.mo)
+endforeach(PO_FILE)

=== added file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/CMakeLists.txt	2014-01-22 10:19:10 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(autopilot)

=== added file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/autopilot/CMakeLists.txt	2014-01-22 10:19:10 +0000
@@ -0,0 +1,8 @@
+if(INSTALL_TESTS)
+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}
+    )
+endif(INSTALL_TESTS)

=== modified file 'tests/autopilot/calendar_app/tests/__init__.py'
--- tests/autopilot/calendar_app/tests/__init__.py	2013-11-15 16:30:52 +0000
+++ tests/autopilot/calendar_app/tests/__init__.py	2014-01-22 10:19:10 +0000
@@ -80,8 +80,6 @@
         self.app = self.launch_test_application(
             "qmlscene",
             self.installed_location,
-            "--desktop_file_hint=/usr/share/applications/"
-            "calendar-app.desktop",
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)