Merge lp:~nskaggs/ubuntu-filemanager-app/fix-click-buddy-build into lp:ubuntu-filemanager-app

[Nicholas Skaggs]

[lp:~nskaggs/ubuntu-filemanager-app/fix-click-buddy-build]

162. By Nicholas Skaggs on 2014-04-18

further cmake tweaks

[Carlos Jose Mazieri (carlos-mazieri)]

I cannot test it, it looks OK.

review: Approve

[Nicholas Skaggs (nskaggs)]

Hey Carlos, I don't want to merge this, as it's just for testing at the moment. These changes break qtcreator changes David put in on the last merge. We need to fix it so both things work. Thanks!

[Carlos Jose Mazieri (carlos-mazieri)]

Hi Nicholas, I saw this status " Work in Progress" just after approving it.

I am worried, right now there are building issues breaking File
Manager build/deploy, I would like someone to take a look on that. I
have two other changes to release and I cannot do it because this
problem.

By the way, do you mind removing this MP and propose it only when it is ready?

Thanks,
Carlos

On 4/21/14, Nicholas Skaggs <email address hidden> wrote:
> Hey Carlos, I don't want to merge this, as it's just for testing at the
> moment. These changes break qtcreator changes David put in on the last
> merge. We need to fix it so both things work. Thanks!
> --
> https://code.launchpad.net/~nskaggs/ubuntu-filemanager-app/fix-click-buddy-build/+merge/216478
> You are reviewing the proposed merge of
> lp:~nskaggs/ubuntu-filemanager-app/fix-click-buddy-build into
> lp:ubuntu-filemanager-app.
>

[lp:~nskaggs/ubuntu-filemanager-app/fix-click-buddy-build]

163. By Nicholas Skaggs on 2014-04-22

remove -q option for loading qml

164. By Nicholas Skaggs on 2014-04-22

fix qml name

165. By Nicholas Skaggs on 2014-04-22

add debugging to main.cpp

166. By Nicholas Skaggs on 2014-04-22

debugging file load path

167. By Nicholas Skaggs on 2014-04-22

semicolon

168. By Nicholas Skaggs on 2014-04-22

hardcoding load path

169. By Nicholas Skaggs on 2014-04-22

move qml under bin dir

170. By Nicholas Skaggs on 2014-04-22

cmake tweaks to qml location and desktop file name

171. By Nicholas Skaggs on 2014-04-22

backdate framework

172. By Nicholas Skaggs on 2014-04-22

fix framework

[Nicholas Skaggs (nskaggs)]

Hey Carlos, it's set to Work in progress so you shouldn't be seeing it anywhere. It's nicer to share as an mp, plus I like seeing the diff. My apologies if it's disturbing you. On the build issues, see

https://bugs.launchpad.net/ubuntu-filemanager-app/+bug/1294301

That's what this MP is all about. It should work, but it simply doesn't. David is back tomorrow and we'll keep working on this. Sorry for the trouble. We want to release too!

Unmerged revisions

172. By Nicholas Skaggs on 2014-04-22

fix framework

171. By Nicholas Skaggs on 2014-04-22

backdate framework

170. By Nicholas Skaggs on 2014-04-22

cmake tweaks to qml location and desktop file name

169. By Nicholas Skaggs on 2014-04-22

move qml under bin dir

168. By Nicholas Skaggs on 2014-04-22

hardcoding load path

167. By Nicholas Skaggs on 2014-04-22

semicolon

166. By Nicholas Skaggs on 2014-04-22

debugging file load path

165. By Nicholas Skaggs on 2014-04-22

add debugging to main.cpp

164. By Nicholas Skaggs on 2014-04-22

fix qml name

163. By Nicholas Skaggs on 2014-04-22

remove -q option for loading qml

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-04-09 21:28:47 +0000
+++ CMakeLists.txt	2014-04-22 22:54:39 +0000
@@ -11,13 +11,13 @@
 option(CLICK_MODE "Installs to a contained location" off)
 
 set(APP_NAME filemanager)
-set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
-set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
+set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
+set(ICON ${APP_NAME}64.png)
 set(APP_HARDCODE ubuntu-filemanager-app)
+set(AUTOPILOT_DIR ubuntu_filemanager_app)
 set(MAIN_QML ${APP_HARDCODE}.qml)
-set(ICON_FILE filemanager64.png)
-set(AUTOPILOT_DIR ubuntu_filemanager_app)
 set(EXEC "filemanager")
+set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
 
 if(CLICK_MODE)
     if(NOT DEFINED BZR_SOURCE)
@@ -32,14 +32,11 @@
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     set(CMAKE_INSTALL_PREFIX /)
-    set(CMAKE_INSTALL_BINDIR /)
-    set(DATA_DIR /)
-    set(ICON ${ICON_FILE})
     set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
     set(BIN_DIR /lib/${ARCH_TRIPLET}/bin)
+    set(DATA_DIR /)
     set(DESKTOP_DIR ${DATA_DIR})
     set(URLS_DIR ${DATA_DIR})
-    install(FILES manifest.json apparmor.json DESTINATION ${CMAKE_INSTALL_PREFIX})
 else(CLICK_MODE)
     execute_process(
         COMMAND qmake -query QT_INSTALL_QML
@@ -47,14 +44,14 @@
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
-    set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
+    set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}")
     set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
     set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
 endif(CLICK_MODE)
 
 file(GLOB_RECURSE I18N_SRC_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     src/app/**.qml *.desktop.in)
+     src/app/qml/*.qml *.desktop.in)
 list(SORT I18N_SRC_FILES)
 
 file(GLOB SRC_FILES
@@ -63,14 +60,14 @@
 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})
-
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION ${DESKTOP_DIR})
 install(FILES ${URLS_FILE} DESTINATION ${URLS_DIR})
 
+
 # Tests
 enable_testing()
 
+add_subdirectory(click)
 add_subdirectory(po)
 add_subdirectory(tests)
 add_subdirectory(src)

=== added directory 'click'
=== added file 'click/CMakeLists.txt'
--- click/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ click/CMakeLists.txt	2014-04-22 22:54:39 +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'
--- apparmor.json	2014-04-15 08:19:12 +0000
+++ click/apparmor.json	2014-04-22 22:54:39 +0000
@@ -1,4 +1,5 @@
 {
-    "policy_version": 1.1, 
-    "template": "unconfined"
-}
+    "policy_version": 1.1,
+    "template": "unconfined",
+    "policy_groups": []
+}
\ No newline at end of file

=== renamed file 'manifest.json' => 'click/manifest.json.in'
--- manifest.json	2014-04-15 08:19:12 +0000
+++ click/manifest.json.in	2014-04-22 22:54:39 +0000
@@ -5,20 +5,20 @@
     "hooks": {
         "filemanager": {
             "apparmor": "apparmor.json",
-            "desktop": "com.ubuntu.filemanager.desktop",
-            "urls": "com.ubuntu.filemanager_filemanager.url-dispatcher"
+            "desktop": "@DESKTOP_FILE@",
+            "urls": "@URLS_FILE@"
         }
     },
     "icon": "filemanager64.png",
     "maintainer": "Ubuntu App Cats <[e-mail]>",
-    "name": "com.ubuntu.filemanager",
+    "name": "@PROJECT_NAME@",
     "title": "File Manager",
-    "version": "0.3",
+    "version": "0.3.@BZR_REVNO@",
     "x-source": {
-        "vcs-bzr": "lp:ubuntu-filemanager-app",
-        "vcs-bzr-revno": "latest"
+        "vcs-bzr": "@BZR_SOURCE@",
+        "vcs-bzr-revno": "@BZR_REVNO@"
     },
     "x-test": {
-        "autopilot": "ubuntu_filemanager_app"
+        "autopilot": "@AUTOPILOT_DIR@"
     }
-}
\ No newline at end of file
+}

=== renamed file 'com.ubuntu.filemanager.desktop.in' => 'com.ubuntu.filemanager_filemanager.desktop.in'
=== modified file 'src/app/main.cpp'
--- src/app/main.cpp	2014-04-14 20:54:31 +0000
+++ src/app/main.cpp	2014-04-22 22:54:39 +0000
@@ -45,11 +45,9 @@
         qDebug() << "    -t|--tablet   If running on Desktop, start in a tablet sized window.";
         qDebug() << "    -h|--help     Print this help.";
         qDebug() << "    -I <path>     Give a path for an additional QML import directory. May be used multiple times.";
-        qDebug() << "    -q <qmlfile>  Give an alternative location for the main qml file.";
         return 0;
     }
 
-    QString qmlfile;
     for (int i = 0; i < args.count(); i++) {
         if (args.at(i) == "-I" && args.count() > i + 1) {
             QString addedPath = args.at(i+1);
@@ -58,8 +56,6 @@
                 addedPath.prepend(QDir::currentPath());
             }
             importPathList.append(addedPath);
-        } else if (args.at(i) == "-q" && args.count() > i + 1) {
-            qmlfile = args.at(i+1);
         }
     }
 
@@ -78,6 +74,8 @@
         }
     }
 
+    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")) {
@@ -93,18 +91,22 @@
 
     view.engine()->setImportPathList(importPathList);
 
-    // load the qml file
+    QString qmlfile;
+    const QString filePath = QLatin1String("qml/ubuntu-filemanager-app.qml");
+    QStringList paths = QStandardPaths::standardLocations(QStandardPaths::DataLocation);
+    paths.prepend(QCoreApplication::applicationDirPath());
+    paths.append("/opt/click.ubuntu.com/.click/users/phablet/com.ubuntu.filemanager/");
+    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;
+            }
+        }
+    // sanity check
     if (qmlfile.isEmpty()) {
-        QStringList paths = QStandardPaths::standardLocations(QStandardPaths::DataLocation);
-        paths.prepend(".");
-
-        foreach (const QString &path, paths) {
-            QFileInfo fi(path + "/qml/ubuntu-filemanager-app.qml");
-            if (fi.exists()) {
-                qmlfile = path +  "/qml/ubuntu-filemanager-app.qml";
-                break;
-            }
-        }
+        qFatal("File: %s does not exist at any of the standard paths!", qPrintable(filePath));
     }
     qDebug() << "using main qml file from:" << qmlfile;
     view.setSource(QUrl::fromLocalFile(qmlfile));