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:44 UTC
[11/15] git commit: change default to ubuntu-sdk-14.04
change default to 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/040c8981
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/040c8981
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/040c8981
Branch: refs/heads/master
Commit: 040c8981e11bbe6ca4f9b2648b194368a5bc744d
Parents: fb39616
Author: Maxim Ermilov <ma...@canonical.com>
Authored: Sat Jun 28 08:08:49 2014 +0400
Committer: Maxim Ermilov <ma...@canonical.com>
Committed: Tue Aug 19 14:20:23 2014 +0400
----------------------------------------------------------------------
Cordovaqt/CordovaViewInternal.qml | 1 -
bin/build/lib/ubuntu.js | 6 ++++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/040c8981/Cordovaqt/CordovaViewInternal.qml
----------------------------------------------------------------------
diff --git a/Cordovaqt/CordovaViewInternal.qml b/Cordovaqt/CordovaViewInternal.qml
index bdfbbc9..f662cc8 100644
--- a/Cordovaqt/CordovaViewInternal.qml
+++ b/Cordovaqt/CordovaViewInternal.qml
@@ -121,7 +121,6 @@ Item {
webView.experimental.evaluateJavaScript(js);
}
onQmlExecNeeded: {
- console.log("2345");
eval(src);
}
onPluginWantsToBeAdded: {
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/040c8981/bin/build/lib/ubuntu.js
----------------------------------------------------------------------
diff --git a/bin/build/lib/ubuntu.js b/bin/build/lib/ubuntu.js
index 9283ed5..3fcd02e 100644
--- a/bin/build/lib/ubuntu.js
+++ b/bin/build/lib/ubuntu.js
@@ -28,6 +28,8 @@ var colors = require('colors');
var Q = require("q");
var os = require("os");
+var DEFAULT_FRAMEWORK = "ubuntu-sdk-14.04";
+
function exec(cmd, silent) {
console.log(cmd.green);
@@ -346,7 +348,7 @@ module.exports.build = function(rootDir, target, nobuild, architecture, framewor
if (!architecture)
architecture = 'armhf';
if (!framework)
- framework = "ubuntu-sdk-13.10";
+ framework = DEFAULT_FRAMEWORK;
assert.ok(fs.existsSync(ubuntuDir));
assert.ok(fs.existsSync(campoDir));
@@ -476,7 +478,7 @@ module.exports.run = function(rootDir, desktop, debug, target, nobuild, emulator
}
if (!framework)
- framework = "ubuntu-sdk-13.10";
+ framework = DEFAULT_FRAMEWORK;
if (!target) {
var devices = deviceList();