You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by za...@apache.org on 2015/07/23 13:18:08 UTC
[06/10] cordova-ubuntu git commit: support ubuntu-sdk-15.04
support ubuntu-sdk-15.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/2151c7a7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/2151c7a7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/2151c7a7
Branch: refs/heads/master
Commit: 2151c7a70a256c1dcb61f4597971f143e304130f
Parents: 4696b63
Author: Maxim Ermilov <ma...@canonical.com>
Authored: Thu Jul 9 13:22:50 2015 +0300
Committer: Maxim Ermilov <ma...@canonical.com>
Committed: Thu Jul 23 11:03:21 2015 +0300
----------------------------------------------------------------------
bin/templates/project/cordova/lib/build.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/2151c7a7/bin/templates/project/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/lib/build.js b/bin/templates/project/cordova/lib/build.js
index a8f966b..9d41b07 100644
--- a/bin/templates/project/cordova/lib/build.js
+++ b/bin/templates/project/cordova/lib/build.js
@@ -93,7 +93,7 @@ function buildClickPackage(campoDir, ubuntuDir, nobuild, architecture, framework
cmakeCmd += ' -DADDITIONAL_DEPENDECIES="' + deps + '"';
return Utils.execAsync(cmakeCmd);
}).then(function () {
- if (architecture != "i386")
+ if (architecture != "i386" && framework != "ubuntu-sdk-15.04")
Utils.execSync('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 Utils.execAsync('click chroot -a ' + architecture + ' -f ' + framework + ' run make -j ' + cpuCount());
}).then(function () {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org