=== modified file 'CMakeLists.txt' --- CMakeLists.txt 2014-04-09 18:30:57 +0000 +++ CMakeLists.txt 2014-04-22 23:20:58 +0000 @@ -11,7 +11,7 @@ option(CLICK_MODE "Installs to a contained location" off) set(APP_NAME reminders) -set(DESKTOP_FILE "${PROJECT_NAME}.desktop") +set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop") set(ICON ${APP_NAME}.png) set(AUTOPILOT_DIR reminders) set(APP_HARDCODE reminders) @@ -20,40 +20,40 @@ if(CLICK_MODE) if(NOT DEFINED BZR_SOURCE) - set(BZR_SOURCE "lp:${APP_HARDCODE}") - message("-- Setting BZR_SOURCE to ${BZR_SOURCE}") + set(BZR_SOURCE "lp:${APP_HARDCODE}") + message("-- Setting BZR_SOURCE to ${BZR_SOURCE}") endif(NOT DEFINED BZR_SOURCE) execute_process( - COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH - OUTPUT_VARIABLE ARCH_TRIPLET - OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH + OUTPUT_VARIABLE ARCH_TRIPLET + OUTPUT_STRIP_TRAILING_WHITESPACE ) set(CMAKE_INSTALL_PREFIX /) set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}") - set(BIN_DIR /lib/${ARCH_TRIPLET}/bin) - set(DATA_DIR /) - set(DESKTOP_DIR ${DATA_DIR}) - install(FILES manifest.json apparmor.json DESTINATION ${CMAKE_INSTALL_PREFIX}) + set(BIN_DIR /lib/${ARCH_TRIPLET}/bin) + set(DATA_DIR /) + set(DESKTOP_DIR ${DATA_DIR}) else(CLICK_MODE) - # components PATH - execute_process( - COMMAND qmake -query QT_INSTALL_QML - OUTPUT_VARIABLE QT_IMPORTS_DIR - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE}) - set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}") - set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications) + # components PATH + execute_process( + COMMAND qmake -query QT_INSTALL_QML + OUTPUT_VARIABLE QT_IMPORTS_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE}) + set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}") + set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications) endif(CLICK_MODE) file(GLOB_RECURSE I18N_SRC_FILES - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - src/app/qml/*.qml *.desktop.in) + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + src/app/qml/*.qml *.desktop.in) list(SORT I18N_SRC_FILES) + file(GLOB SRC_FILES - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - *.qml *.js *.png *.js) + 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}) @@ -62,6 +62,7 @@ # Tests enable_testing() +add_subdirectory(click) add_subdirectory(po) add_subdirectory(tests) add_subdirectory(3rdParty) === added directory 'click' === added file 'click/CMakeLists.txt' --- click/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ click/CMakeLists.txt 2014-04-22 23:20:58 +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.json' => 'click/apparmor.json' === renamed file 'manifest.json' => 'click/manifest.json.in' --- manifest.json 2014-04-09 13:57:06 +0000 +++ click/manifest.json.in 2014-04-22 23:20:58 +0000 @@ -3,20 +3,20 @@ "framework": "ubuntu-sdk-14.04-dev1", "architecture": "armhf", "hooks": { - "reminders": { + "@APP_NAME@": { "apparmor": "apparmor.json", - "desktop": "com.ubuntu.reminders.desktop" + "desktop": "@DESKTOP_FILE@" } }, "maintainer": "Ubuntu Reminders app developers ", - "name": "com.ubuntu.reminders", + "name": "@PROJECT_NAME@", "title": "Reminders", - "version": "0.5", + "version": "0.5.@BZR_REVNO@", "x-source": { - "vcs-bzr": "lp:reminders", - "vcs-bzr-revno": "latest" + "vcs-bzr": "@BZR_SOURCE@", + "vcs-bzr-revno": "@BZR_REVNO@" }, "x-test": { - "autopilot": "reminders" + "autopilot": "@AUTOPILOT_DIR@" } } === renamed file 'com.ubuntu.reminders.desktop.in' => 'com.ubuntu.reminders_reminders.desktop.in' === modified file 'src/app/main.cpp' --- src/app/main.cpp 2014-04-09 13:29:27 +0000 +++ src/app/main.cpp 2014-04-22 23:20:58 +0000 @@ -27,7 +27,6 @@ #include #include #include -#include #include @@ -78,6 +77,7 @@ } } + qDebug() << "Running from " << QDir::currentPath(); view.engine()->rootContext()->setContextProperty("tablet", QVariant(false)); view.engine()->rootContext()->setContextProperty("phone", QVariant(false)); if (args.contains("-t") || args.contains("--tablet")) { @@ -104,9 +104,11 @@ QString qmlfile; const QString filePath = QLatin1String("qml/reminders.qml"); QStringList paths = QStandardPaths::standardLocations(QStandardPaths::DataLocation); - paths.prepend(QDir::currentPath()); + paths.prepend(QCoreApplication::applicationDirPath()); + paths.append("/opt/click.ubuntu.com/.click/users/phablet/com.ubuntu.reminders/"); Q_FOREACH (const QString &path, paths) { QString myPath = path + QLatin1Char('/') + filePath; + qDebug() << "Checking for qml in " << myPath << " using path " << path; if (QFile::exists(myPath)) { qmlfile = myPath; break; === modified file 'tests/autopilot/reminders/tests/__init__.py' --- tests/autopilot/reminders/tests/__init__.py 2014-04-04 06:09:17 +0000 +++ tests/autopilot/reminders/tests/__init__.py 2014-04-22 23:20:58 +0000 @@ -71,14 +71,11 @@ def launch_test_installed(self): return self.launch_test_application( self.installed_location_binary, - '-q ' + self.installed_location_qml, - '--desktop_file_hint=/usr/share/applications/' - 'reminders.desktop', app_type='qt', emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase) @autopilot_logging.log_action(logger.info) def launch_test_click(self): return self.launch_click_package( - 'com.ubuntu.reminders-app', + 'com.ubuntu.reminders', emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)