Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 52D041830A for ; Thu, 23 Jul 2015 11:18:26 +0000 (UTC) Received: (qmail 39601 invoked by uid 500); 23 Jul 2015 11:18:04 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 39550 invoked by uid 500); 23 Jul 2015 11:18:04 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 39278 invoked by uid 99); 23 Jul 2015 11:18:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jul 2015 11:18:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B122BE41A5; Thu, 23 Jul 2015 11:18:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zaspire@apache.org To: commits@cordova.apache.org Date: Thu, 23 Jul 2015 11:18:08 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Thu Jul 9 13:22:50 2015 +0300 Committer: Maxim Ermilov 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