You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2014/08/26 22:46:41 UTC
[08/15] git commit: fix build problem with ubuntu-sdk-14.04
fix build problem with ubuntu-sdk-14.04
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/89786384
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/89786384
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/89786384
Branch: refs/heads/master
Commit: 89786384bf9da4f92ef2af63fb38516d0e6b1c6a
Parents: 042ecbe
Author: Maxim Ermilov <ma...@canonical.com>
Authored: Tue Jun 10 00:28:11 2014 +0400
Committer: Maxim Ermilov <ma...@canonical.com>
Committed: Tue Aug 19 14:20:00 2014 +0400
----------------------------------------------------------------------
bin/build/lib/ubuntu.js | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/89786384/bin/build/lib/ubuntu.js
----------------------------------------------------------------------
diff --git a/bin/build/lib/ubuntu.js b/bin/build/lib/ubuntu.js
index d834b79..1a0c9c6 100644
--- a/bin/build/lib/ubuntu.js
+++ b/bin/build/lib/ubuntu.js
@@ -173,10 +173,11 @@ function buildClickPackage(campoDir, ubuntuDir, nobuild, architecture, framework
pushd(path.join(archDir, 'build'));
- return execAsync('click chroot -a' + architecture + ' -f ' + framework + ' run cmake ' + campoDir
- + ' -DCMAKE_TOOLCHAIN_FILE=/etc/dpkg-cross/cmake/CMakeCross.txt -DCMAKE_INSTALL_PREFIX="'
- + prefixDir + '"').then(function () {
-
+ var cmakeCmd = 'click chroot -a' + architecture + ' -f ' + framework + ' run cmake ' + campoDir
+ + ' -DCMAKE_INSTALL_PREFIX="' + prefixDir + '"';
+ if (framework == 'ubuntu-sdk-13.10')
+ cmakeCmd += ' -DCMAKE_TOOLCHAIN_FILE=/etc/dpkg-cross/cmake/CMakeCross.txt';
+ return execAsync(cmakeCmd).then(function () {
if (architecture != "i386")
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 -a' + architecture + ' -f ' + framework + ' run make -j ' + cpuCount());