correct deployment: qmake requires { to be in same line is "isEmpty"

adapt clickable.json file
smurfy · Jan 6, 2018 · 00a48cb · 00a48cb
1 parent c5d61b6
commit 00a48cb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/.clickable/
 /.make.cache
 /Makefile
 /bld.inf

diff --git a/clickable.json b/clickable.json
@@ -3,6 +3,6 @@
   "arch": "armhf",
   "chroot": false,
   "template": "custom",
-  "build": "bash -c 'cd .. ; qt5-qmake-arm-linux-gnueabihf CONFIG+=ubuntu clickBuildFolder=click_build; make install'",
+  "build": "bash -c 'cd .. ; qt5-qmake-arm-linux-gnueabihf CONFIG+=ubuntu clickBuildFolder=click_build; make clean ; make install'",
   "dependencies": [ "libcurl4-gnutls-dev" ]
 }
diff --git a/deployment.pri b/deployment.pri
@@ -111,10 +111,11 @@ symbian {
         export(splash.path)
         INSTALLS += splash
     } else:ubuntu {
-        isEmpty(clickBuildFolder)
-        {
+
+        isEmpty(clickBuildFolder){
           clickBuildFolder = /
         }
+
         installPrefix = $${clickBuildFolder}
         desktopfile.files = data/$${TARGET}_ubuntu.desktop
         desktopfile.path = $${clickBuildFolder}

diff --git a/ubuntuBuildWithinContainer.sh b/ubuntuBuildWithinContainer.sh
@@ -2,10 +2,11 @@
 
 # build inside libertine container on the phone
 
-buildDir=$(readlink -f "./click_build")
+buildDirName="click_build"
+buildDir=$(readlink -f "./$buildDirName")
 echo "builddir is $buildDir"
 mkdir -p "$buildDir"
-qmake . CONFIG+=ubuntu
+qmake . CONFIG+=ubuntu clickBuildFolder=$buildDirName
 make clean
 make install
 cd "$buildDir"