[06/11] git commit: bin/build: specify framework instead of series for click chroot

[st...@apache.org]

bin/build: specify framework instead of series for click chroot


Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/63bb865c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/63bb865c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/63bb865c

Branch: refs/heads/master
Commit: 63bb865cc4069ce265f157d3c4000737b2a5275a
Parents: e4d4580
Author: Maxim Ermilov <ma...@canonical.com>
Authored: Mon Apr 14 15:30:42 2014 +0400
Committer: Maxim Ermilov <ma...@canonical.com>
Committed: Wed Apr 16 14:28:08 2014 +0400

----------------------------------------------------------------------
 bin/build/lib/ubuntu.js | 7 ++++---
 bin/check_reqs          | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/63bb865c/bin/build/lib/ubuntu.js
----------------------------------------------------------------------
diff --git a/bin/build/lib/ubuntu.js b/bin/build/lib/ubuntu.js
index 4285a21..36b55d6 100644
--- a/bin/build/lib/ubuntu.js
+++ b/bin/build/lib/ubuntu.js
@@ -79,6 +79,7 @@ function popd(dir) {
 function buildArmPackage(campoDir, ubuntuDir, nobuild) {
     var armhfDir = path.join(ubuntuDir, 'armhf');
     var prefixDir = path.join(armhfDir, 'prefix');
+    var framework = "ubuntu-sdk-13.10";
 
     if (nobuild && fs.existsSync(path.join(prefixDir, 'cordova-ubuntu'))) {
         return;
@@ -92,13 +93,13 @@ function buildArmPackage(campoDir, ubuntuDir, nobuild) {
 
     pushd(path.join(armhfDir, 'build'));
 
-    return execAsync('click chroot -aarmhf -s trusty run cmake ' + campoDir
+    return execAsync('click chroot -aarmhf -f ' + framework + ' run cmake ' + campoDir
               + ' -DCMAKE_TOOLCHAIN_FILE=/etc/dpkg-cross/cmake/CMakeCross.txt -DCMAKE_INSTALL_PREFIX="'
               + prefixDir + '"').then(function () {
         exec('find . -name AutomocInfo.cmake | xargs sed -i \'s;AM_QT_MOC_EXECUTABLE .*;AM_QT_MOC_EXECUTABLE "/usr/lib/\'$(dpkg-architecture -qDEB_BUILD_MULTIARCH)\'/qt5/bin/moc");\'');
-        return execAsync('click chroot -aarmhf -s trusty run make -j 6');
+        return execAsync('click chroot -aarmhf -f ' + framework + ' run make -j 6');
     }).then(function () {
-        return execAsync('click chroot -aarmhf -s trusty run make install');
+        return execAsync('click chroot -aarmhf -f ' + framework + ' run make install');
     }).then(function () {
         cp(path.join(ubuntuDir, 'www', '*'), path.join(prefixDir, 'www'));
         cp(path.join(ubuntuDir, 'qml', '*'), path.join(prefixDir, 'qml'));

http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/63bb865c/bin/check_reqs
----------------------------------------------------------------------
diff --git a/bin/check_reqs b/bin/check_reqs
index 01e2f01..2340fdd 100755
--- a/bin/check_reqs
+++ b/bin/check_reqs
@@ -24,7 +24,7 @@ var exec = require('child_process').exec;
 // FIXME: check for armhf
 var deps = "cmake libicu-dev pkg-config qtbase5-dev qtchooser qtdeclarative5-dev qtfeedback5-dev qtlocation5-dev qtmultimedia5-dev qtpim5-dev qtsensors5-dev qtsystems5-dev";
 var depsArm = "cmake libicu-dev:armhf pkg-config qtbase5-dev:armhf qtchooser qtdeclarative5-dev:armhf qtfeedback5-dev:armhf qtlocation5-dev:armhf qtmultimedia5-dev:armhf qtpim5-dev:armhf qtsensors5-dev:armhf qtsystems5-dev:armhf";
-var series = "trusty";
+var framework = "ubuntu-sdk-13.10";
 exec("dpkg-query -Wf'$${db:Status-abbrev}' click " + deps, function(error, stdout, stderr) {
     if (error) {
         console.error("Error: missing dependency " + deps);
@@ -38,13 +38,13 @@ exec("dpkg-query -Wf'$${db:Status-abbrev}' click " + deps, function(error, stdou
             process.exit(error.code);
         }
 
-        exec("click chroot -aarmhf -s " + series + " run dpkg-query -l " + deps, function(error, stdout, stderr) {
+        exec("click chroot -aarmhf -f " + framework + " run dpkg-query -l " + deps, function(error, stdout, stderr) {
             if (error) {
                 console.error("Error: missing armhf chroot");
-// to fix problem click chroot -aarmhf -s trusty maint
+// to fix problem click chroot -aarmhf -f ubuntu-sdk-13.10 maint
 // dpkg --force-overwrite --force-conflicts -i /var/cache/apt/archives/qtbase5-dev_5.0.2+dfsg1-7ubuntu13_amd64.deb
 // apt-get install -f
-                console.error("run:\nclick chroot -aarmhf -s " + series + " create\n click chroot -aarmhf -s " + series + " install " + depsArm);
+                console.error("run:\nclick chroot -aarmhf -f " + framework + " create\n click chroot -aarmhf -f " + framework + " install " + depsArm);
                 process.exit(error.code);
             }
         }