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 2014/12/15 14:33:17 UTC
[28/37] cordova-ubuntu git commit: set ubuntu-sdk-14.10 as default
framework
set ubuntu-sdk-14.10 as default framework
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/cd667415
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/cd667415
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/cd667415
Branch: refs/heads/master
Commit: cd667415bc8e7b76881408f18751d669e97775a2
Parents: 1487c66
Author: Maxim Ermilov <ma...@canonical.com>
Authored: Mon Nov 24 03:07:40 2014 +0300
Committer: Maxim Ermilov <ma...@canonical.com>
Committed: Mon Nov 24 03:07:40 2014 +0300
----------------------------------------------------------------------
bin/templates/project/cordova/lib/build.js | 11 ++---------
bin/templates/project/cordova/lib/constants.js | 2 +-
2 files changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/cd667415/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 3b4bf50..403b034 100644
--- a/bin/templates/project/cordova/lib/build.js
+++ b/bin/templates/project/cordova/lib/build.js
@@ -86,9 +86,6 @@ function buildClickPackage(campoDir, ubuntuDir, nobuild, architecture, framework
var cmakeCmd = 'click chroot -a ' + architecture + ' -f ' + framework + ' run cmake ' + campoDir
+ ' -DCMAKE_INSTALL_PREFIX="' + prefixDir + '"' + ' -DCMAKE_BUILD_TYPE=' + buildType;
- if (framework == 'ubuntu-sdk-13.10')
- cmakeCmd += ' -DCMAKE_TOOLCHAIN_FILE=/etc/dpkg-cross/cmake/CMakeCross.txt';
-
var deps = additionalBuildDependencies(ubuntuDir).join(' ').replace(/ARCH/g, architecture);
if (deps.length)
cmakeCmd += ' -DADDITIONAL_DEPENDECIES="' + deps + '"';
@@ -111,10 +108,8 @@ function buildClickPackage(campoDir, ubuntuDir, nobuild, architecture, framework
fs.writeFileSync(path.join(prefixDir, 'manifest.json'), JSON.stringify(content));
content = JSON.parse(fs.readFileSync(path.join(ubuntuDir, 'apparmor.json'), {encoding: "utf8"}));
- if (framework == 'ubuntu-sdk-13.10')
- content.policy_version = 1;
- else
- content.policy_version = 1.1;
+ content.policy_version = 1.2;
+ content.policy_groups.push('webview');
fs.writeFileSync(path.join(prefixDir, 'apparmor.json'), JSON.stringify(content));
Utils.pushd(prefixDir);
@@ -250,8 +245,6 @@ function additionalBuildDependencies(ubuntuDir) {
function checkClickPackage(prefixDir) {
Utils.pushd(prefixDir);
- // 13.10 missing click-reviewers-tools package
- // FIXME: remove this check after EOL
if (fs.existsSync('/usr/bin/click-run-checks')) {
var cmd = '/usr/bin/click-run-checks *.click';
logger.debug(cmd);
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/cd667415/bin/templates/project/cordova/lib/constants.js
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/lib/constants.js b/bin/templates/project/cordova/lib/constants.js
index b6390be..be1d11b 100644
--- a/bin/templates/project/cordova/lib/constants.js
+++ b/bin/templates/project/cordova/lib/constants.js
@@ -19,7 +19,7 @@
*/
module.exports = {
- 'DEFAULT_FRAMEWORK': 'ubuntu-sdk-14.04',
+ 'DEFAULT_FRAMEWORK': 'ubuntu-sdk-14.10',
'DEFAULT_ARCH': 'armhf',
'PLATFORM_TYPES': {
'PHONE': 0,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org