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/09/24 05:44:15 UTC
[01/21] js commit: Fixed Windows path issue when trying to set
"navigator.app" in cordova.js
Repository: cordova-js
Updated Branches:
refs/heads/cb-7219 c33a8ef70 -> 8ca0f3b2b (forced update)
Fixed Windows path issue when trying to set "navigator.app" in cordova.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/826be56d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/826be56d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/826be56d
Branch: refs/heads/cb-7219
Commit: 826be56d2f94b0a6ca73a62949d043f96c0e6c4f
Parents: ff0358b
Author: Suraj Pindoria <su...@yahoo.com>
Authored: Mon Aug 18 16:36:06 2014 -0700
Committer: Suraj Pindoria <su...@yahoo.com>
Committed: Mon Aug 18 16:36:06 2014 -0700
----------------------------------------------------------------------
tasks/lib/require-tr.js | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/826be56d/tasks/lib/require-tr.js
----------------------------------------------------------------------
diff --git a/tasks/lib/require-tr.js b/tasks/lib/require-tr.js
index f495e89..12117dd 100644
--- a/tasks/lib/require-tr.js
+++ b/tasks/lib/require-tr.js
@@ -44,7 +44,10 @@ var requireTr = {
function end() {
// SOME BS pre-transforms
- if(file.match(/android\/platform.js$/)) {
+ if(file.match(/android\/platform.js$/) || file.match(/android\\platform.js$/)) {
+
+ // Checking for '\' from the windows path
+ root = root.replace(/\\/g, "/");
data = data.replace(/modulemapper\.clobbers.*\n/,
util.format('navigator.app = require("%s/src/android/plugin/android/app")', root));
}
@@ -77,7 +80,6 @@ var requireTr = {
* visits AST and modifies all the require('cordova/*') and require('org.apache.cordova.*')
*/
function _updateRequires(code) {
-
var ast = UglifyJS.parse(code);
var before = new UglifyJS.TreeTransformer(function(node, descend) {
@@ -86,7 +88,15 @@ function _updateRequires(code) {
if(node instanceof UglifyJS.AST_Call) {
// check if function call is a require('module') call
if(node.expression.name === "require" && node.args.length === 1) {
+
+ // Uglify is not able to recognize Windows style paths using '\' instead of '/'
+ // So replacing all of the '/' back to Windows '\'
+ if (node.args[0].value != undefined && node.args[0].value.indexOf('c:') != -1) {
+ node.args[0].value = node.args[0].value.replace(/\//g, '\\');
+ }
+
var module = node.args[0].value;
+
// make sure require only has one argument and that it starts with cordova (old style require.js)
if(module !== undefined &&
module.indexOf("cordova") === 0) {
[05/21] js commit: Fixed browserify onDeviceReady event not firing on
the browser
Posted by st...@apache.org.
Fixed browserify onDeviceReady event not firing on the browser
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/feb58c41
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/feb58c41
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/feb58c41
Branch: refs/heads/cb-7219
Commit: feb58c41daba2d59caa7adbf4178b24a763472b1
Parents: bf4c4db
Author: Suraj Pindoria <su...@yahoo.com>
Authored: Thu Aug 21 17:08:20 2014 -0700
Committer: Suraj Pindoria <su...@yahoo.com>
Committed: Thu Aug 21 17:08:20 2014 -0700
----------------------------------------------------------------------
src/browser/platform.js | 4 +---
tasks/lib/require-tr.js | 6 ++++++
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/feb58c41/src/browser/platform.js
----------------------------------------------------------------------
diff --git a/src/browser/platform.js b/src/browser/platform.js
index 8015cef..b8f7ac3 100644
--- a/src/browser/platform.js
+++ b/src/browser/platform.js
@@ -30,9 +30,7 @@ module.exports = {
moduleMapper.clobbers('cordova/exec/proxy', 'cordova.commandProxy');
- channel.onPluginsReady.subscribe(function () {
- channel.onNativeReady.fire();
- });
+ channel.onNativeReady.fire();
// FIXME is this the right place to clobber pause/resume? I am guessing not
// FIXME pause/resume should be deprecated IN CORDOVA for pagevisiblity api
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/feb58c41/tasks/lib/require-tr.js
----------------------------------------------------------------------
diff --git a/tasks/lib/require-tr.js b/tasks/lib/require-tr.js
index 6c61b1a..7669993 100644
--- a/tasks/lib/require-tr.js
+++ b/tasks/lib/require-tr.js
@@ -43,6 +43,10 @@ var requireTr = {
}
function end() {
+ if(file.match(/browser\/platform.js$/) || file.match(/browser\\platform.js$/)) {
+ data = data.replace(/moduleMapper\.clobbers.*\n/,
+ util.format('cordova.commandProxy = require("%s/src/common/exec/proxy")', root));
+ }
// SOME BS pre-transforms
if(file.match(/android\/platform.js$/) || file.match(/android\\platform.js$/)) {
@@ -91,6 +95,8 @@ function _updateRequires(code) {
// Uglify is not able to recognize Windows style paths using '\' instead of '/'
// So replacing all of the '/' back to Windows '\'
+
+ // FIXME: need to better handle cases of modulemapper replace
if (node.args[0].value !== undefined && node.args[0].value.indexOf('/android/app') !== -1 && process.platform === 'win32') {
node.args[0].value = node.args[0].value.replace(/\//g, '\\');
}
[16/21] js commit: CB-7219: cordova.version now outputs same value as
cordova.platformVersion
Posted by st...@apache.org.
CB-7219: cordova.version now outputs same value as cordova.platformVersion
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/93faee83
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/93faee83
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/93faee83
Branch: refs/heads/cb-7219
Commit: 93faee833c615086c40cf52bb1b95497e4bbb3d1
Parents: 4a4c544
Author: Steven Gill <st...@gmail.com>
Authored: Tue Aug 12 11:11:31 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Sep 23 19:00:02 2014 -0700
----------------------------------------------------------------------
README.md | 9 +++++++--
src/cordova.js | 2 +-
src/cordova_b.js | 2 +-
tasks/compile.js | 2 +-
tasks/lib/bundle.js | 1 -
tasks/lib/compute-commit-id.js | 2 --
tasks/lib/write-license-header.js | 2 +-
7 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/93faee83/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index b188caa..d8ef976 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,18 @@ Then from the repository root run:
grunt --platformVersion=3.6.0
-To do just one platform, run:
+To compile the js for just one platform, run:
grunt compile:android --platformVersion=3.6.0
-To create the browserify version, run:
+To create the browserify version of the js, run:
grunt compile-browserify --platformVersion=3.6.0
+
+To compile the browserify version of the js for just one platform, run:
+
+ grunt compile-browserify:android --platformVersion=3.6.0
+
For integration, see the 'Integration' section below.
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/93faee83/src/cordova.js
----------------------------------------------------------------------
diff --git a/src/cordova.js b/src/cordova.js
index 4d16516..3602b70 100644
--- a/src/cordova.js
+++ b/src/cordova.js
@@ -93,7 +93,7 @@ function createEvent(type, data) {
var cordova = {
define:define,
require:require,
- //version:CORDOVA_JS_BUILD_LABEL,
+ version:PLATFORM_VERSION_BUILD_LABEL,
platformVersion:PLATFORM_VERSION_BUILD_LABEL,
platformId:platform.id,
/**
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/93faee83/src/cordova_b.js
----------------------------------------------------------------------
diff --git a/src/cordova_b.js b/src/cordova_b.js
index 29177e2..3a9ed6d 100644
--- a/src/cordova_b.js
+++ b/src/cordova_b.js
@@ -92,7 +92,7 @@ function createEvent(type, data) {
var cordova = {
platformVersion:PLATFORM_VERSION_BUILD_LABEL,
- //version:CORDOVA_JS_BUILD_LABEL,
+ version:PLATFORM_VERSION_BUILD_LABEL,
require: function(module) {
if(module === "cordova/exec") {
return cordova.exec;
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/93faee83/tasks/compile.js
----------------------------------------------------------------------
diff --git a/tasks/compile.js b/tasks/compile.js
index 0e8392e..849e909 100644
--- a/tasks/compile.js
+++ b/tasks/compile.js
@@ -36,7 +36,7 @@ module.exports = function(grunt) {
});
if(!platformVersion){
console.log('please add a platform version flag and value');
- console.log('ex: grunt compile-browserify --platformVersion=3.6.0');
+ console.log('ex: grunt compile --platformVersion=3.6.0');
throw new Error("platformVersion is required!");
}
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/93faee83/tasks/lib/bundle.js
----------------------------------------------------------------------
diff --git a/tasks/lib/bundle.js b/tasks/lib/bundle.js
index 3937c51..d3282ec 100644
--- a/tasks/lib/bundle.js
+++ b/tasks/lib/bundle.js
@@ -47,7 +47,6 @@ module.exports = function bundle(platform, debug, commitId, platformVersion) {
// write header
output.push('/*', fs.readFileSync(licensePath, 'utf8'), '*/');
output.push(';(function() {');
- //output.push("var CORDOVA_JS_BUILD_LABEL = '" + commitId + "';");
output.push("var PLATFORM_VERSION_BUILD_LABEL = '" + platformVersion + "';");
// write initial scripts
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/93faee83/tasks/lib/compute-commit-id.js
----------------------------------------------------------------------
diff --git a/tasks/lib/compute-commit-id.js b/tasks/lib/compute-commit-id.js
index d768340..8471a05 100644
--- a/tasks/lib/compute-commit-id.js
+++ b/tasks/lib/compute-commit-id.js
@@ -28,8 +28,6 @@ module.exports = function computeCommitId(callback, cachedGitVersion) {
return;
}
- var versionFileId = fs.readFileSync('VERSION', { encoding: 'utf8' }).trim();
-
if (fs.existsSync('.git')) {
var gitPath = 'git';
var args = 'rev-list HEAD --max-count=1';
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/93faee83/tasks/lib/write-license-header.js
----------------------------------------------------------------------
diff --git a/tasks/lib/write-license-header.js b/tasks/lib/write-license-header.js
index c8d4345..8d7e24e 100644
--- a/tasks/lib/write-license-header.js
+++ b/tasks/lib/write-license-header.js
@@ -9,8 +9,8 @@ module.exports = function(outStream, platform, commitId, platformVersion) {
outStream.write("// Platform: " + platform + "\n", 'utf8');
outStream.write("// " + commitId + "\n", 'utf8');
+ outStream.write("// browserify" + "\n", 'utf8');
outStream.write(licenseText, 'utf8');
- //outStream.write("var CORDOVA_JS_BUILD_LABEL = '" + commitId + "';\n", 'utf8');
outStream.write("var PLATFORM_VERSION_BUILD_LABEL = '" + platformVersion + "';\n", 'utf8');
outStream.write("var define = {moduleMap: []};\n", 'utf8');
[08/21] js commit: Removed old comment
Posted by st...@apache.org.
Removed old comment
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/8520c662
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/8520c662
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/8520c662
Branch: refs/heads/cb-7219
Commit: 8520c66281fd2727d27c6601dbb44a966d3d1892
Parents: de45d81
Author: Suraj Pindoria <su...@yahoo.com>
Authored: Tue Aug 26 10:17:07 2014 -0700
Committer: Suraj Pindoria <su...@yahoo.com>
Committed: Tue Aug 26 10:17:07 2014 -0700
----------------------------------------------------------------------
tasks/lib/require-tr.js | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/8520c662/tasks/lib/require-tr.js
----------------------------------------------------------------------
diff --git a/tasks/lib/require-tr.js b/tasks/lib/require-tr.js
index ed0e95d..c71ab98 100644
--- a/tasks/lib/require-tr.js
+++ b/tasks/lib/require-tr.js
@@ -105,8 +105,6 @@ function _updateRequires(code) {
// Uglify is not able to recognize Windows style paths using '\' instead of '/'
// So replacing all of the '/' back to Windows '\'
-
- // FIXME: need to better handle cases of modulemapper replace
if (node.args[0].value !== undefined && node.args[0].value.indexOf(root) !== -1 && process.platform === 'win32') {
node.args[0].value = node.args[0].value.replace(/\//g, '\\');
}
[15/21] js commit: CB-7219 added platformVersion,
removed cordova.version
Posted by st...@apache.org.
CB-7219 added platformVersion, removed cordova.version
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/4a4c544c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/4a4c544c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/4a4c544c
Branch: refs/heads/cb-7219
Commit: 4a4c544c74b1d43e26cf9a5163536136b6aa5f43
Parents: 6c7a76f
Author: Steven Gill <st...@gmail.com>
Authored: Mon Aug 11 17:31:51 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Sep 23 18:59:47 2014 -0700
----------------------------------------------------------------------
.jshintrc | 2 +-
README.md | 12 ++++++++++--
src/cordova.js | 3 ++-
src/cordova_b.js | 3 ++-
tasks/compile-browserify.js | 18 ++++++++++++++++--
tasks/compile.js | 19 +++++++++++++++++--
tasks/lib/bundle-browserify.js | 5 +++--
tasks/lib/bundle.js | 8 +++++---
tasks/lib/compute-commit-id.js | 16 +++++++---------
tasks/lib/packager-browserify.js | 7 +++----
tasks/lib/packager.js | 6 +++---
tasks/lib/write-license-header.js | 5 +++--
12 files changed, 72 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/4a4c544c/.jshintrc
----------------------------------------------------------------------
diff --git a/.jshintrc b/.jshintrc
index 505f458..b5f288c 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -28,7 +28,7 @@
"dojo": false,
// Custom predefined globals.
- "predef": ["jasmine", "blackberry", "define", "alert", "prompt", "org", "deviceapis", "Osp", "_cordovaExec", "WinJS", "Windows", "MSApp", "PalmSystem", "PalmServiceBridge", "Acceleration", "webworks", "CORDOVA_JS_BUILD_LABEL"],
+ "predef": ["jasmine", "blackberry", "define", "alert", "prompt", "org", "deviceapis", "Osp", "_cordovaExec", "WinJS", "Windows", "MSApp", "PalmSystem", "PalmServiceBridge", "Acceleration", "webworks", "CORDOVA_JS_BUILD_LABEL", "PLATFORM_VERSION_BUILD_LABEL"],
// Development
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/4a4c544c/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 600c90d..b188caa 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,15 @@ All of the build tasks can be run via the `grunt` node module. Install it global
Then from the repository root run:
- grunt
+ grunt --platformVersion=3.6.0
+
+To do just one platform, run:
+
+ grunt compile:android --platformVersion=3.6.0
+
+To create the browserify version, run:
+
+ grunt compile-browserify --platformVersion=3.6.0
For integration, see the 'Integration' section below.
@@ -82,7 +90,7 @@ The `boot` method does all the work. First, it grabs the common platform defini
Tests run in node or the browser. To run the tests in node:
- grunt test
+ grunt test --platformVersion=3.6.0
To run them in the browser:
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/4a4c544c/src/cordova.js
----------------------------------------------------------------------
diff --git a/src/cordova.js b/src/cordova.js
index 3564d45..4d16516 100644
--- a/src/cordova.js
+++ b/src/cordova.js
@@ -93,7 +93,8 @@ function createEvent(type, data) {
var cordova = {
define:define,
require:require,
- version:CORDOVA_JS_BUILD_LABEL,
+ //version:CORDOVA_JS_BUILD_LABEL,
+ platformVersion:PLATFORM_VERSION_BUILD_LABEL,
platformId:platform.id,
/**
* Methods to add/remove your own addEventListener hijacking on document + window.
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/4a4c544c/src/cordova_b.js
----------------------------------------------------------------------
diff --git a/src/cordova_b.js b/src/cordova_b.js
index e4084ee..29177e2 100644
--- a/src/cordova_b.js
+++ b/src/cordova_b.js
@@ -91,7 +91,8 @@ function createEvent(type, data) {
var cordova = {
- version:CORDOVA_JS_BUILD_LABEL,
+ platformVersion:PLATFORM_VERSION_BUILD_LABEL,
+ //version:CORDOVA_JS_BUILD_LABEL,
require: function(module) {
if(module === "cordova/exec") {
return cordova.exec;
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/4a4c544c/tasks/compile-browserify.js
----------------------------------------------------------------------
diff --git a/tasks/compile-browserify.js b/tasks/compile-browserify.js
index 549fc0c..3971d4a 100644
--- a/tasks/compile-browserify.js
+++ b/tasks/compile-browserify.js
@@ -27,10 +27,24 @@ var generate = require('./lib/packager-browserify');
module.exports = function(grunt) {
grunt.registerMultiTask('compile-browserify', 'Packages cordova.js browserify style', function() {
-
var done = this.async();
var platformName = this.target;
var useWindowsLineEndings = this.data.useWindowsLineEndings;
- generate(platformName, useWindowsLineEndings, done);
+
+ //grabs --platformVersion flag
+ var flags = grunt.option.flags();
+ var platformVersion;
+ flags.forEach(function(flag) {
+ if (flag.indexOf('platformVersion') > -1) {
+ var equalIndex = flag.indexOf('=');
+ platformVersion = flag.slice(equalIndex + 1);
+ }
+ });
+ if(!platformVersion){
+ console.log('please add a platform version flag and value');
+ console.log('ex: grunt compile-browserify --platformVersion=3.6.0');
+ throw new Error("platformVersion is required!");
+ }
+ generate(platformName, useWindowsLineEndings, platformVersion, done);
});
}
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/4a4c544c/tasks/compile.js
----------------------------------------------------------------------
diff --git a/tasks/compile.js b/tasks/compile.js
index 58db43c..0e8392e 100644
--- a/tasks/compile.js
+++ b/tasks/compile.js
@@ -20,11 +20,26 @@ var generate = require('./lib/packager');
module.exports = function(grunt) {
grunt.registerMultiTask('compile', 'Packages cordova.js', function() {
-
var done = this.async();
var platformName = this.target;
var useWindowsLineEndings = this.data.useWindowsLineEndings;
+ var platformVersion;
+
+ //grabs --platformVersion flag
+ var flags = grunt.option.flags();
+ var platformVersion;
+ flags.forEach(function(flag) {
+ if (flag.indexOf('platformVersion') > -1) {
+ var equalIndex = flag.indexOf('=');
+ platformVersion = flag.slice(equalIndex + 1);
+ }
+ });
+ if(!platformVersion){
+ console.log('please add a platform version flag and value');
+ console.log('ex: grunt compile-browserify --platformVersion=3.6.0');
+ throw new Error("platformVersion is required!");
+ }
- generate(platformName, useWindowsLineEndings, done);
+ generate(platformName, useWindowsLineEndings, platformVersion, done);
});
}
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/4a4c544c/tasks/lib/bundle-browserify.js
----------------------------------------------------------------------
diff --git a/tasks/lib/bundle-browserify.js b/tasks/lib/bundle-browserify.js
index 1d948fa..f038117 100644
--- a/tasks/lib/bundle-browserify.js
+++ b/tasks/lib/bundle-browserify.js
@@ -23,13 +23,14 @@ var require_tr = require('./require-tr');
var root = path.join(__dirname, '..', '..')
-module.exports = function bundle(platform, debug, commitId) {
+module.exports = function bundle(platform, debug, commitId, platformVersion) {
require_tr.platform = platform;
// FIXME: need to find a way to void ignore missing
var b = browserify({debug: debug});
// XXX plugin_list is not present at this stage
b.ignore(path.join(root, 'src', 'common', 'plugin_list'));
-
+ console.log('commitID: '+ commitId);
+ console.log('platformVersion: ' + platformVersion);
b.transform(require_tr.transform);
b.add(path.join(root, 'src', platform, 'exec.js'));
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/4a4c544c/tasks/lib/bundle.js
----------------------------------------------------------------------
diff --git a/tasks/lib/bundle.js b/tasks/lib/bundle.js
index 8cdf11e..3937c51 100644
--- a/tasks/lib/bundle.js
+++ b/tasks/lib/bundle.js
@@ -24,12 +24,13 @@ var writeModule = require('./write-module');
var writeScript = require('./write-script');
var licensePath = path.join(__dirname, '..', 'templates', 'LICENSE-for-js-file.txt');
-module.exports = function bundle(platform, debug, commitId) {
+module.exports = function bundle(platform, debug, commitId, platformVersion) {
var modules = collectFiles(path.join('src', 'common'));
var scripts = collectFiles(path.join('src', 'scripts'));
modules[''] = path.join('src', 'cordova.js');
copyProps(modules, collectFiles(path.join('src', platform)));
-
+ console.log('commitID: '+ commitId);
+ console.log('platformVersion: ' + platformVersion);
if (platform === 'test') {
// Add any platform-specific modules that have tests to the test bundle.
var testFilesPath = path.join('src', 'android', 'android');
@@ -46,7 +47,8 @@ module.exports = function bundle(platform, debug, commitId) {
// write header
output.push('/*', fs.readFileSync(licensePath, 'utf8'), '*/');
output.push(';(function() {');
- output.push("var CORDOVA_JS_BUILD_LABEL = '" + commitId + "';");
+ //output.push("var CORDOVA_JS_BUILD_LABEL = '" + commitId + "';");
+ output.push("var PLATFORM_VERSION_BUILD_LABEL = '" + platformVersion + "';");
// write initial scripts
if (!scripts['require']) {
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/4a4c544c/tasks/lib/compute-commit-id.js
----------------------------------------------------------------------
diff --git a/tasks/lib/compute-commit-id.js b/tasks/lib/compute-commit-id.js
index 6fb5500..d768340 100644
--- a/tasks/lib/compute-commit-id.js
+++ b/tasks/lib/compute-commit-id.js
@@ -30,9 +30,9 @@ module.exports = function computeCommitId(callback, cachedGitVersion) {
var versionFileId = fs.readFileSync('VERSION', { encoding: 'utf8' }).trim();
- if (/-dev$/.test(versionFileId) && fs.existsSync('.git')) {
+ if (fs.existsSync('.git')) {
var gitPath = 'git';
- var args = 'rev-list HEAD --max-count=1 --abbrev-commit';
+ var args = 'rev-list HEAD --max-count=1';
childProcess.exec(gitPath + ' ' + args, function(err, stdout, stderr) {
var isWindows = process.platform.slice(0, 3) == 'win';
if (err && isWindows) {
@@ -40,21 +40,19 @@ module.exports = function computeCommitId(callback, cachedGitVersion) {
childProcess.exec(gitPath + ' ' + args, function(err, stdout, stderr) {
if (err) {
console.warn('Error during git describe: ' + err);
- done(versionFileId + '-??');
+ done('???');
} else {
- done(versionFileId + '-' + stdout);
+ done(stdout);
}
});
} else if (err) {
console.warn('Error during git describe: ' + err);
- done(versionFileId + '-??');
+ done('???');
} else {
- done(versionFileId + '-' + stdout);
+ done(stdout);
}
});
- } else {
- done(fs.readFileSync('VERSION', { encoding: 'utf8' }));
- }
+ }
function done(stdout) {
var version = stdout.trim();
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/4a4c544c/tasks/lib/packager-browserify.js
----------------------------------------------------------------------
diff --git a/tasks/lib/packager-browserify.js b/tasks/lib/packager-browserify.js
index 3e718c6..4d24592 100644
--- a/tasks/lib/packager-browserify.js
+++ b/tasks/lib/packager-browserify.js
@@ -23,15 +23,14 @@ var bundle = require('./bundle-browserify');
var computeCommitId = require('./compute-commit-id');
var writeLicenseHeader = require('./write-license-header');
-
-module.exports = function generate(platform, useWindowsLineEndings, done) {
+module.exports = function generate(platform, useWindowsLineEndings, platformVersion, done) {
computeCommitId(function(commitId) {
var outReleaseFile, outReleaseFileStream,
outDebugFile, outDebugFileStream,
releaseBundle, debugBundle;
var time = new Date().valueOf();
- var libraryRelease = bundle(platform, false, commitId);
+ var libraryRelease = bundle(platform, false, commitId, platformVersion);
// if we are using windows line endings, we will also add the BOM
// if(useWindowsLineEndings) {
// libraryRelease = "\ufeff" + libraryRelease.split(/\r?\n/).join("\r\n");
@@ -49,7 +48,7 @@ module.exports = function generate(platform, useWindowsLineEndings, done) {
outReleaseFileStream = fs.createWriteStream(outReleaseFile);
// write license header
- writeLicenseHeader(outReleaseFileStream, platform, commitId);
+ writeLicenseHeader(outReleaseFileStream, platform, commitId, platformVersion);
releaseBundle = libraryRelease.bundle();
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/4a4c544c/tasks/lib/packager.js
----------------------------------------------------------------------
diff --git a/tasks/lib/packager.js b/tasks/lib/packager.js
index 0fd2bcc..7aba70f 100644
--- a/tasks/lib/packager.js
+++ b/tasks/lib/packager.js
@@ -22,17 +22,17 @@ var bundle = require('./bundle');
var computeCommitId = require('./compute-commit-id');
-module.exports = function generate(platform, useWindowsLineEndings, callback) {
+module.exports = function generate(platform, useWindowsLineEndings, platformVersion, callback) {
computeCommitId(function(commitId) {
var outFile;
var time = new Date().valueOf();
- var libraryRelease = bundle(platform, false, commitId);
+ var libraryRelease = bundle(platform, false, commitId, platformVersion);
// if we are using windows line endings, we will also add the BOM
if(useWindowsLineEndings) {
libraryRelease = "\ufeff" + libraryRelease.split(/\r?\n/).join("\r\n");
}
- var libraryDebug = bundle(platform, true, commitId);
+ var libraryDebug = bundle(platform, true, commitId, platformVersion);
time = new Date().valueOf() - time;
if (!fs.existsSync('pkg')) {
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/4a4c544c/tasks/lib/write-license-header.js
----------------------------------------------------------------------
diff --git a/tasks/lib/write-license-header.js b/tasks/lib/write-license-header.js
index 8b33cbd..c8d4345 100644
--- a/tasks/lib/write-license-header.js
+++ b/tasks/lib/write-license-header.js
@@ -3,14 +3,15 @@ var util = require('util');
var fs = require('fs');
var licensePath = path.join(__dirname, '..', 'templates', 'LICENSE-for-js-file.txt');
-module.exports = function(outStream, platform, commitId) {
+module.exports = function(outStream, platform, commitId, platformVersion) {
// some poppycock
var licenseText = util.format("/*\n *%s\n */\n", fs.readFileSync(licensePath, 'utf8').replace(/\n/g, "\n *"));
outStream.write("// Platform: " + platform + "\n", 'utf8');
outStream.write("// " + commitId + "\n", 'utf8');
outStream.write(licenseText, 'utf8');
- outStream.write("var CORDOVA_JS_BUILD_LABEL = '" + commitId + "';\n", 'utf8');
+ //outStream.write("var CORDOVA_JS_BUILD_LABEL = '" + commitId + "';\n", 'utf8');
+ outStream.write("var PLATFORM_VERSION_BUILD_LABEL = '" + platformVersion + "';\n", 'utf8');
outStream.write("var define = {moduleMap: []};\n", 'utf8');
}
[14/21] js commit: CB-6911 - iOS 8 - "deprecated attempt to access
property" errors when accessing anything off window.navigator
Posted by st...@apache.org.
CB-6911 - iOS 8 - "deprecated attempt to access property" errors when accessing anything off window.navigator
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/6c7a76fc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/6c7a76fc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/6c7a76fc
Branch: refs/heads/cb-7219
Commit: 6c7a76fcd2f0aa60e0879d1417e1ac0ca44f2c6c
Parents: 1258511
Author: Shazron Abdullah <sh...@apache.org>
Authored: Tue Sep 9 19:09:28 2014 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue Sep 9 19:09:28 2014 -0700
----------------------------------------------------------------------
src/common/init.js | 10 ++++++++++
src/common/init_b.js | 10 ++++++++++
2 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/6c7a76fc/src/common/init.js
----------------------------------------------------------------------
diff --git a/src/common/init.js b/src/common/init.js
index 4f4882c..758544e 100644
--- a/src/common/init.js
+++ b/src/common/init.js
@@ -55,6 +55,16 @@ function replaceNavigator(origNavigator) {
for (var key in origNavigator) {
if (typeof origNavigator[key] == 'function') {
newNavigator[key] = origNavigator[key].bind(origNavigator);
+ } else {
+ (function(k) {
+ Object.defineProperty(newNavigator, k, {
+ get: function() {
+ return origNavigator[k];
+ },
+ configurable: true,
+ enumerable: true
+ });
+ })(key);
}
}
}
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/6c7a76fc/src/common/init_b.js
----------------------------------------------------------------------
diff --git a/src/common/init_b.js b/src/common/init_b.js
index 32c2068..f00409b 100644
--- a/src/common/init_b.js
+++ b/src/common/init_b.js
@@ -56,6 +56,16 @@ function replaceNavigator(origNavigator) {
for (var key in origNavigator) {
if (typeof origNavigator[key] == 'function') {
newNavigator[key] = origNavigator[key].bind(origNavigator);
+ } else {
+ (function(k) {
+ Object.defineProperty(newNavigator, k, {
+ get: function() {
+ return origNavigator[k];
+ },
+ configurable: true,
+ enumerable: true
+ });
+ })(key);
}
}
}
[03/21] js commit: Upleveled amazon-fireos changes.
Posted by st...@apache.org.
Upleveled amazon-fireos changes.
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/0b5a3a87
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/0b5a3a87
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/0b5a3a87
Branch: refs/heads/cb-7219
Commit: 0b5a3a87736cbe31d005f8abbc662c864fcbde62
Parents: ff0358b
Author: Archana Naik <na...@lab126.com>
Authored: Thu Aug 14 11:40:42 2014 -0700
Committer: Archana Naik <na...@lab126.com>
Committed: Thu Aug 21 10:02:15 2014 -0700
----------------------------------------------------------------------
.../android/promptbasednativeapi.js | 14 ++---
src/amazon-fireos/exec.js | 56 ++++++++++++--------
src/amazon-fireos/platform.js | 6 +--
3 files changed, 44 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/0b5a3a87/src/amazon-fireos/android/promptbasednativeapi.js
----------------------------------------------------------------------
diff --git a/src/amazon-fireos/android/promptbasednativeapi.js b/src/amazon-fireos/android/promptbasednativeapi.js
index c12f46e..f7fb6bc 100644
--- a/src/amazon-fireos/android/promptbasednativeapi.js
+++ b/src/amazon-fireos/android/promptbasednativeapi.js
@@ -19,17 +19,17 @@
/**
* Implements the API of ExposedJsApi.java, but uses prompt() to communicate.
- * This is used only on the 2.3 simulator, where addJavascriptInterface() is broken.
+ * This is used pre-JellyBean, where addJavascriptInterface() is disabled.
*/
module.exports = {
- exec: function(service, action, callbackId, argsJson) {
- return prompt(argsJson, 'gap:'+JSON.stringify([service, action, callbackId]));
+ exec: function(bridgeSecret, service, action, callbackId, argsJson) {
+ return prompt(argsJson, 'gap:'+JSON.stringify([bridgeSecret, service, action, callbackId]));
},
- setNativeToJsBridgeMode: function(value) {
- prompt(value, 'gap_bridge_mode:');
+ setNativeToJsBridgeMode: function(bridgeSecret, value) {
+ prompt(value, 'gap_bridge_mode:' + bridgeSecret);
},
- retrieveJsMessages: function(fromOnlineEvent) {
- return prompt(+fromOnlineEvent, 'gap_poll:');
+ retrieveJsMessages: function(bridgeSecret, fromOnlineEvent) {
+ return prompt(+fromOnlineEvent, 'gap_poll:' + bridgeSecret);
}
};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/0b5a3a87/src/amazon-fireos/exec.js
----------------------------------------------------------------------
diff --git a/src/amazon-fireos/exec.js b/src/amazon-fireos/exec.js
index 7eca8c6..eb7f862 100644
--- a/src/amazon-fireos/exec.js
+++ b/src/amazon-fireos/exec.js
@@ -37,13 +37,10 @@ var cordova = require('cordova'),
nativeApiProvider = require('cordova/android/nativeapiprovider'),
utils = require('cordova/utils'),
base64 = require('cordova/base64'),
+ channel = require('cordova/channel'),
jsToNativeModes = {
PROMPT: 0,
- JS_OBJECT: 1,
- // This mode is currently for benchmarking purposes only. It must be enabled
- // on the native side through the ENABLE_LOCATION_CHANGE_EXEC_MODE
- // constant within CordovaWebViewClient.java before it will work.
- LOCATION_CHANGE: 2
+ JS_OBJECT: 1
},
nativeToJsModes = {
// Polls for messages using the JS->Native bridge.
@@ -63,9 +60,17 @@ var cordova = require('cordova'),
jsToNativeBridgeMode, // Set lazily.
nativeToJsBridgeMode = nativeToJsModes.ONLINE_EVENT,
pollEnabled = false,
- messagesFromNative = [];
+ messagesFromNative = [],
+ bridgeSecret = -1;
function androidExec(success, fail, service, action, args) {
+ if (bridgeSecret < 0) {
+ // If we ever catch this firing, we'll need to queue up exec()s
+ // and fire them once we get a secret. For now, I don't think
+ // it's possible for exec() to be called since plugins are parsed but
+ // not run until until after onNativeReady.
+ throw new Error('exec() called without bridgeSecret');
+ }
// Set default bridge modes if they have not already been set.
// By default, we use the failsafe, since addJavascriptInterface breaks too often
if (jsToNativeBridgeMode === undefined) {
@@ -86,29 +91,35 @@ function androidExec(success, fail, service, action, args) {
cordova.callbacks[callbackId] = {success:success, fail:fail};
}
- if (jsToNativeBridgeMode == jsToNativeModes.LOCATION_CHANGE) {
- window.location = 'http://cdv_exec/' + service + '#' + action + '#' + callbackId + '#' + argsJson;
+ var messages = nativeApiProvider.get().exec(bridgeSecret, service, action, callbackId, argsJson);
+ // If argsJson was received by Java as null, try again with the PROMPT bridge mode.
+ // This happens in rare circumstances, such as when certain Unicode characters are passed over the bridge on a Galaxy S2. See CB-2666.
+ if (jsToNativeBridgeMode == jsToNativeModes.JS_OBJECT && messages === "@Null arguments.") {
+ androidExec.setJsToNativeBridgeMode(jsToNativeModes.PROMPT);
+ androidExec(success, fail, service, action, args);
+ androidExec.setJsToNativeBridgeMode(jsToNativeModes.JS_OBJECT);
+ return;
} else {
- var messages = nativeApiProvider.get().exec(service, action, callbackId, argsJson);
- // If argsJson was received by Java as null, try again with the PROMPT bridge mode.
- // This happens in rare circumstances, such as when certain Unicode characters are passed over the bridge on a Galaxy S2. See CB-2666.
- if (jsToNativeBridgeMode == jsToNativeModes.JS_OBJECT && messages === "@Null arguments.") {
- androidExec.setJsToNativeBridgeMode(jsToNativeModes.PROMPT);
- androidExec(success, fail, service, action, args);
- androidExec.setJsToNativeBridgeMode(jsToNativeModes.JS_OBJECT);
- return;
- } else {
- androidExec.processMessages(messages, true);
- }
+ androidExec.processMessages(messages, true);
}
}
+androidExec.init = function() {
+ bridgeSecret = +prompt('', 'gap_init:' + nativeToJsBridgeMode);
+ channel.onNativeReady.fire();
+};
+
function pollOnceFromOnlineEvent() {
pollOnce(true);
}
function pollOnce(opt_fromOnlineEvent) {
- var msg = nativeApiProvider.get().retrieveJsMessages(!!opt_fromOnlineEvent);
+ if (bridgeSecret < 0) {
+ // This can happen when the NativeToJsMessageQueue resets the online state on page transitions.
+ // We know there's nothing to retrieve, so no need to poll.
+ return;
+ }
+ var msg = nativeApiProvider.get().retrieveJsMessages(bridgeSecret, !!opt_fromOnlineEvent);
androidExec.processMessages(msg);
}
@@ -158,7 +169,10 @@ androidExec.setNativeToJsBridgeMode = function(mode) {
nativeToJsBridgeMode = mode;
// Tell the native side to switch modes.
- nativeApiProvider.get().setNativeToJsBridgeMode(mode);
+ // Otherwise, it will be set by androidExec.init()
+ if (bridgeSecret >= 0) {
+ nativeApiProvider.get().setNativeToJsBridgeMode(bridgeSecret, mode);
+ }
if (mode == nativeToJsModes.POLLING) {
pollEnabled = true;
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/0b5a3a87/src/amazon-fireos/platform.js
----------------------------------------------------------------------
diff --git a/src/amazon-fireos/platform.js b/src/amazon-fireos/platform.js
index 768b39b..e2e08c9 100644
--- a/src/amazon-fireos/platform.js
+++ b/src/amazon-fireos/platform.js
@@ -27,10 +27,8 @@ module.exports = {
exec = require('cordova/exec'),
modulemapper = require('cordova/modulemapper');
- // Tell the native code that a page change has occurred.
- exec(null, null, 'PluginManager', 'startup', []);
- // Tell the JS that the native side is ready.
- channel.onNativeReady.fire();
+ // Get the shared secret needed to use the bridge.
+ exec.init();
// TODO: Extract this as a proper plugin.
modulemapper.clobbers('cordova/plugin/android/app', 'navigator.app');
[19/21] js commit: CB-7219 added platformVersion,
removed cordova.version
Posted by st...@apache.org.
CB-7219 added platformVersion, removed cordova.version
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/80df8ebd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/80df8ebd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/80df8ebd
Branch: refs/heads/cb-7219
Commit: 80df8ebde85992a1223035791658f7bbd852b6e7
Parents: 75c00aa
Author: Steven Gill <st...@gmail.com>
Authored: Mon Aug 11 17:31:51 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Sep 23 19:53:26 2014 -0700
----------------------------------------------------------------------
README.md | 1 -
tasks/lib/bundle-browserify.js | 2 +-
tasks/lib/bundle.js | 3 ++-
tasks/lib/compute-commit-id.js | 1 +
4 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/80df8ebd/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index d8ef976..ef1bef0 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,6 @@ To compile the browserify version of the js for just one platform, run:
grunt compile-browserify:android --platformVersion=3.6.0
-
For integration, see the 'Integration' section below.
## Known Issues
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/80df8ebd/tasks/lib/bundle-browserify.js
----------------------------------------------------------------------
diff --git a/tasks/lib/bundle-browserify.js b/tasks/lib/bundle-browserify.js
index 138d627..668d1e9 100644
--- a/tasks/lib/bundle-browserify.js
+++ b/tasks/lib/bundle-browserify.js
@@ -29,7 +29,7 @@ module.exports = function bundle(platform, debug, commitId, platformVersion) {
var b = browserify({debug: debug});
// XXX plugin_list is not present at this stage
b.ignore(path.join(root, 'src', 'common', 'plugin_list'));
-
+
b.transform(require_tr.transform);
b.add(path.join(root, 'src', platform, 'exec.js'));
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/80df8ebd/tasks/lib/bundle.js
----------------------------------------------------------------------
diff --git a/tasks/lib/bundle.js b/tasks/lib/bundle.js
index b68eacf..686fa77 100644
--- a/tasks/lib/bundle.js
+++ b/tasks/lib/bundle.js
@@ -29,7 +29,7 @@ module.exports = function bundle(platform, debug, commitId, platformVersion) {
var scripts = collectFiles(path.join('src', 'scripts'));
modules[''] = path.join('src', 'cordova.js');
copyProps(modules, collectFiles(path.join('src', platform)));
-
+
if (platform === 'test') {
// Add any platform-specific modules that have tests to the test bundle.
var testFilesPath = path.join('src', 'android', 'android');
@@ -46,6 +46,7 @@ module.exports = function bundle(platform, debug, commitId, platformVersion) {
// write header
output.push('/*', fs.readFileSync(licensePath, 'utf8'), '*/');
output.push(';(function() {');
+
output.push("var PLATFORM_VERSION_BUILD_LABEL = '" + platformVersion + "';");
// write initial scripts
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/80df8ebd/tasks/lib/compute-commit-id.js
----------------------------------------------------------------------
diff --git a/tasks/lib/compute-commit-id.js b/tasks/lib/compute-commit-id.js
index a4c4765..d81b1d5 100644
--- a/tasks/lib/compute-commit-id.js
+++ b/tasks/lib/compute-commit-id.js
@@ -35,6 +35,7 @@ module.exports = function computeCommitId(callback, cachedGitVersion) {
var gitPath = 'git';
var args = 'rev-list HEAD --max-count=1';
childProcess.exec(gitPath + ' ' + args, {cwd:cordovaJSDir}, function(err, stdout, stderr) {
+
var isWindows = process.platform.slice(0, 3) == 'win';
if (err && isWindows) {
gitPath = '"' + path.join(process.env['ProgramFiles'], 'Git', 'bin', 'git.exe') + '"';
[07/21] js commit: Checking for windows style path
Posted by st...@apache.org.
Checking for windows style path
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/de45d81a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/de45d81a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/de45d81a
Branch: refs/heads/cb-7219
Commit: de45d81a84b3b528baad4c14f9d8c9ddb9c8f2bd
Parents: 4ccaed2
Author: Suraj Pindoria <su...@yahoo.com>
Authored: Fri Aug 22 14:08:24 2014 -0700
Committer: Suraj Pindoria <su...@yahoo.com>
Committed: Fri Aug 22 14:08:24 2014 -0700
----------------------------------------------------------------------
tasks/lib/require-tr.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/de45d81a/tasks/lib/require-tr.js
----------------------------------------------------------------------
diff --git a/tasks/lib/require-tr.js b/tasks/lib/require-tr.js
index 87fe55a..ed0e95d 100644
--- a/tasks/lib/require-tr.js
+++ b/tasks/lib/require-tr.js
@@ -48,10 +48,10 @@ var requireTr = {
// Checking for '\' from the windows path
root = root.replace(/\\/g, '/');
- if(file.match(/android\/platform.js$/)) {
+ if(file.match(/android\/platform.js$/) || file.match(/android\\platform.js$/)) {
data = data.replace(/modulemapper\.clobbers.*\n/,
util.format('navigator.app = require("%s/src/android/plugin/android/app")', root));
- } else if (file.match(/amazon-fireos\/platform.js$/)) {
+ } else if (file.match(/amazon-fireos\/platform.js$/) || file.match(/amazon-fireos\\platform.js$/)) {
data = data.replace(/modulemapper\.clobbers.*\n/,
util.format('navigator.app = require("%s/src/amazon-fireos/plugin/android/app")', root));
}
[17/21] js commit: CB-7219 made sure compute commit id is run from
cordova-js repo. Set cwd to cordova-js
Posted by st...@apache.org.
CB-7219 made sure compute commit id is run from cordova-js repo. Set cwd to cordova-js
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/75c00aa5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/75c00aa5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/75c00aa5
Branch: refs/heads/cb-7219
Commit: 75c00aa587d485947272365599af667affa782a3
Parents: 03f88ba
Author: Steven Gill <st...@gmail.com>
Authored: Tue Aug 12 17:37:29 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Sep 23 19:00:21 2014 -0700
----------------------------------------------------------------------
tasks/lib/compute-commit-id.js | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/75c00aa5/tasks/lib/compute-commit-id.js
----------------------------------------------------------------------
diff --git a/tasks/lib/compute-commit-id.js b/tasks/lib/compute-commit-id.js
index 794ebd9..a4c4765 100644
--- a/tasks/lib/compute-commit-id.js
+++ b/tasks/lib/compute-commit-id.js
@@ -27,11 +27,14 @@ module.exports = function computeCommitId(callback, cachedGitVersion) {
callback(cachedGitVersion);
return;
}
-
- if (fs.existsSync('.git')) {
+
+ var cordovaJSDir = path.join(__dirname, '../../');
+
+ //make sure .git directory exists in cordova.js repo
+ if (fs.existsSync(path.join(__dirname, '../../.git'))) {
var gitPath = 'git';
var args = 'rev-list HEAD --max-count=1';
- childProcess.exec(gitPath + ' ' + args, function(err, stdout, stderr) {
+ childProcess.exec(gitPath + ' ' + args, {cwd:cordovaJSDir}, function(err, stdout, stderr) {
var isWindows = process.platform.slice(0, 3) == 'win';
if (err && isWindows) {
gitPath = '"' + path.join(process.env['ProgramFiles'], 'Git', 'bin', 'git.exe') + '"';
@@ -51,6 +54,7 @@ module.exports = function computeCommitId(callback, cachedGitVersion) {
}
});
} else {
+ console.log('no git');
done('???');
}
[18/21] js commit: CB-7219 Added back version file,
added default value for compute-commit-id.js
Posted by st...@apache.org.
CB-7219 Added back version file, added default value for compute-commit-id.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/03f88bae
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/03f88bae
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/03f88bae
Branch: refs/heads/cb-7219
Commit: 03f88bae5c31b8e994f7f76f4b76bc94bb8fb65a
Parents: 93faee8
Author: Steven Gill <st...@gmail.com>
Authored: Tue Aug 12 13:55:11 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Sep 23 19:00:21 2014 -0700
----------------------------------------------------------------------
tasks/lib/bundle-browserify.js | 3 +--
tasks/lib/bundle.js | 3 +--
tasks/lib/compute-commit-id.js | 2 ++
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/03f88bae/tasks/lib/bundle-browserify.js
----------------------------------------------------------------------
diff --git a/tasks/lib/bundle-browserify.js b/tasks/lib/bundle-browserify.js
index f038117..138d627 100644
--- a/tasks/lib/bundle-browserify.js
+++ b/tasks/lib/bundle-browserify.js
@@ -29,8 +29,7 @@ module.exports = function bundle(platform, debug, commitId, platformVersion) {
var b = browserify({debug: debug});
// XXX plugin_list is not present at this stage
b.ignore(path.join(root, 'src', 'common', 'plugin_list'));
- console.log('commitID: '+ commitId);
- console.log('platformVersion: ' + platformVersion);
+
b.transform(require_tr.transform);
b.add(path.join(root, 'src', platform, 'exec.js'));
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/03f88bae/tasks/lib/bundle.js
----------------------------------------------------------------------
diff --git a/tasks/lib/bundle.js b/tasks/lib/bundle.js
index d3282ec..b68eacf 100644
--- a/tasks/lib/bundle.js
+++ b/tasks/lib/bundle.js
@@ -29,8 +29,7 @@ module.exports = function bundle(platform, debug, commitId, platformVersion) {
var scripts = collectFiles(path.join('src', 'scripts'));
modules[''] = path.join('src', 'cordova.js');
copyProps(modules, collectFiles(path.join('src', platform)));
- console.log('commitID: '+ commitId);
- console.log('platformVersion: ' + platformVersion);
+
if (platform === 'test') {
// Add any platform-specific modules that have tests to the test bundle.
var testFilesPath = path.join('src', 'android', 'android');
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/03f88bae/tasks/lib/compute-commit-id.js
----------------------------------------------------------------------
diff --git a/tasks/lib/compute-commit-id.js b/tasks/lib/compute-commit-id.js
index 8471a05..794ebd9 100644
--- a/tasks/lib/compute-commit-id.js
+++ b/tasks/lib/compute-commit-id.js
@@ -50,6 +50,8 @@ module.exports = function computeCommitId(callback, cachedGitVersion) {
done(stdout);
}
});
+ } else {
+ done('???');
}
function done(stdout) {
[06/21] js commit: Better handling of all "modulemapper.clobbers"
replacements
Posted by st...@apache.org.
Better handling of all "modulemapper.clobbers" replacements
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/4ccaed2a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/4ccaed2a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/4ccaed2a
Branch: refs/heads/cb-7219
Commit: 4ccaed2a80f8e9be4dc7d1086b8d2b5b603c9cab
Parents: feb58c4
Author: Suraj Pindoria <su...@yahoo.com>
Authored: Fri Aug 22 14:04:04 2014 -0700
Committer: Suraj Pindoria <su...@yahoo.com>
Committed: Fri Aug 22 14:04:04 2014 -0700
----------------------------------------------------------------------
src/browser/platform.js | 4 ++--
src/firefoxos/platform.js | 4 +++-
tasks/lib/require-tr.js | 26 ++++++++++++++++++--------
3 files changed, 23 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/4ccaed2a/src/browser/platform.js
----------------------------------------------------------------------
diff --git a/src/browser/platform.js b/src/browser/platform.js
index b8f7ac3..0514059 100644
--- a/src/browser/platform.js
+++ b/src/browser/platform.js
@@ -25,10 +25,10 @@ module.exports = {
bootstrap: function() {
- var moduleMapper = require('cordova/modulemapper');
+ var modulemapper = require('cordova/modulemapper');
var channel = require('cordova/channel');
- moduleMapper.clobbers('cordova/exec/proxy', 'cordova.commandProxy');
+ modulemapper.clobbers('cordova/exec/proxy', 'cordova.commandProxy');
channel.onNativeReady.fire();
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/4ccaed2a/src/firefoxos/platform.js
----------------------------------------------------------------------
diff --git a/src/firefoxos/platform.js b/src/firefoxos/platform.js
index 7fac8a4..b7d89b8 100644
--- a/src/firefoxos/platform.js
+++ b/src/firefoxos/platform.js
@@ -23,7 +23,9 @@ module.exports = {
id: 'firefoxos',
bootstrap: function() {
- require('cordova/modulemapper').clobbers('cordova/exec/proxy', 'cordova.commandProxy');
+ var modulemapper = require('cordova/modulemapper');
+
+ modulemapper.clobbers('cordova/exec/proxy', 'cordova.commandProxy');
require('cordova/channel').onNativeReady.fire();
}
};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/4ccaed2a/tasks/lib/require-tr.js
----------------------------------------------------------------------
diff --git a/tasks/lib/require-tr.js b/tasks/lib/require-tr.js
index 7669993..87fe55a 100644
--- a/tasks/lib/require-tr.js
+++ b/tasks/lib/require-tr.js
@@ -43,18 +43,28 @@ var requireTr = {
}
function end() {
- if(file.match(/browser\/platform.js$/) || file.match(/browser\\platform.js$/)) {
- data = data.replace(/moduleMapper\.clobbers.*\n/,
- util.format('cordova.commandProxy = require("%s/src/common/exec/proxy")', root));
- }
// SOME BS pre-transforms
- if(file.match(/android\/platform.js$/) || file.match(/android\\platform.js$/)) {
+ if(data.match(/clobbers\('cordova\/plugin\/android\/app/)) {
+ // Checking for '\' from the windows path
+ root = root.replace(/\\/g, '/');
+
+ if(file.match(/android\/platform.js$/)) {
+ data = data.replace(/modulemapper\.clobbers.*\n/,
+ util.format('navigator.app = require("%s/src/android/plugin/android/app")', root));
+ } else if (file.match(/amazon-fireos\/platform.js$/)) {
+ data = data.replace(/modulemapper\.clobbers.*\n/,
+ util.format('navigator.app = require("%s/src/amazon-fireos/plugin/android/app")', root));
+ }
+ }
+ if(data.match(/clobbers\('cordova\/exec\/proxy/)) {
// Checking for '\' from the windows path
- root = root.replace(/\\/g, "/");
+ root = root.replace(/\\/g, '/');
+
data = data.replace(/modulemapper\.clobbers.*\n/,
- util.format('navigator.app = require("%s/src/android/plugin/android/app")', root));
+ util.format('cordova.commandProxy = require("%s/src/common/exec/proxy");', root));
}
+
if(file.match(/FileReader.js$/)) {
data = data.replace(/getOriginalSymbol\(this/,
'getOriginalSymbol(window');
@@ -97,7 +107,7 @@ function _updateRequires(code) {
// So replacing all of the '/' back to Windows '\'
// FIXME: need to better handle cases of modulemapper replace
- if (node.args[0].value !== undefined && node.args[0].value.indexOf('/android/app') !== -1 && process.platform === 'win32') {
+ if (node.args[0].value !== undefined && node.args[0].value.indexOf(root) !== -1 && process.platform === 'win32') {
node.args[0].value = node.args[0].value.replace(/\//g, '\\');
}
[12/21] js commit: CB-7383 Incremented package version to -dev
Posted by st...@apache.org.
CB-7383 Incremented package version to -dev
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/6b72e2ce
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/6b72e2ce
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/6b72e2ce
Branch: refs/heads/cb-7219
Commit: 6b72e2ce0bbe58aaf05cf06626f08dbe461e03f4
Parents: e482495
Author: Steven Gill <st...@gmail.com>
Authored: Fri Aug 29 17:16:51 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Fri Aug 29 17:16:51 2014 -0700
----------------------------------------------------------------------
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/6b72e2ce/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index b961aff..ebe6819 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"author": "Gord Tanner <gt...@gmail.com> (http://github.com/gtanner)",
"name": "cordova-js",
"description": "Cordova JavaScript: a unified JavaScript layer for the Cordova suite of projects enabling cross-platform native mobile development of applications using HTML, CSS and JavaScript.",
- "version": "3.7.0",
+ "version": "3.7.0-dev",
"homepage": "http://cordova.apache.org",
"repository": {
"type": "git",
[11/21] js commit: added RELEASENOTES
Posted by st...@apache.org.
added RELEASENOTES
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/e4824950
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/e4824950
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/e4824950
Branch: refs/heads/cb-7219
Commit: e48249503d7df3a7d3be18cf5fbb1be4357eaee1
Parents: 8f41e8d
Author: Steven Gill <st...@gmail.com>
Authored: Fri Aug 29 16:53:43 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Fri Aug 29 16:53:43 2014 -0700
----------------------------------------------------------------------
RELEASENOTES.md | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++
package.json | 4 +-
2 files changed, 227 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/e4824950/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
new file mode 100644
index 0000000..32565e0
--- /dev/null
+++ b/RELEASENOTES.md
@@ -0,0 +1,225 @@
+
+### 3.7.0 (Aug 29, 2014)
+* Set VERSION to 3.7.0-dev (via coho)
+* Checking for windows style path
+* Better handling of all "modulemapper.clobbers" replacements
+* Fixed browserify onDeviceReady event not firing on the browser
+* Removed check for "c:" and added check for windows platform
+* Fixed Windows path issue when trying to set "navigator.app" in cordova.js
+* CB-7349 Tell users to run npm install
+* Upleveled amazon-fireos changes.
+* CB-870 android: Add volume button event support
+* [fxos] Remove hardcoded cordova version
+* CB-6764 Fix findCordovaPath() detecting "notcordova.js" as cordova.js
+* CB-6976 Add support for Windows Universal apps (Windows 8.1 and WP 8.1)
+* CB-6714 Base webOS 3.x Cordova implementation
+* Fixed jshint whitespace issues
+* android: Delete Location-change JS->Native bridge mode
+* CB-5988 android: Allow exec() only from file: or start-up URL's domain
+* CB-7034 [BlackBerry10] Add error handling to exec makeSyncCall
+* CB-6983 misleading debug statement
+* CB-6884 - Fixed js callbacks not firing using WKWebView Cordova bridge
+* CB-6884 - Added WKWebView Cordova bridge
+* updating version
+* maximzing jshint satisfaction
+* CB-6863 - Default Cordova bridge broken due to replacing window.navigator (iOS 8)
+* CB-6867 [wp8, windows8] allow empty args
+* adding cordova.require
+* adding transform for File plugin
+* CB-6792 Add license to CONTRIBUTING.md
+* removed contacts hack, added regex to handle geolocation
+* Fix some old references in the README.md (This closes #69)
+* updating transform to support bs paths
+* updating transform for ios contacts
+* updating version
+* moving to TreeTransformer and adding a quick substitution for Android navigator.app clobber
+* Changed id to amazon-fireos.
+* Fix broken unit tests with node v0.11.13+ (hack)
+* Disable urlutil tests under jsdom & set jsdom to file: to avoid hitting network
+* Upleveled changes from android.
+* updating version
+* Upleveled changes from android.
+* CB-6587:Set Vesion to 3.6.0-dev
+* updating version
+* fixing jshint ident
+* Revert "Revert "Merge branch 'master' into browserify""
+* Revert "Merge branch 'browserify'"
+* CB-6491 add CONTRIBUTING.md
+* Fix tests showing warning about util.print.
+* Fix cordova-js grunt failing due to jshint errors from WinJS commit
+* CB-6539 Future proof the WinJS include
+* updating package.json
+* fixing jshint error
+* Revert "Merge branch 'master' into browserify"
+* CB-5488 ios: Don't attempt iframe bridge until document.body exists
+* CB-6419 pause and resume events should be fired without a timeout
+* CB-6388: Add base64.toArrayBuffer() method to support binary data from the LOAD_URL bridge
+* CB-5606 WP8. ArrayBuffer does not exist in WP7
+* Fixed "WARNING: file name src\ubuntu\platform.js is missing the license header" during compile
+* adding channel pre deviceready
+* adding case for org.apache.cordova.* modules
+* adding cordova.require fake wrapper
+* exec was set in the wrong file
+* removing onPluginsReady and setting platform exec
+* updating version
+* fixing weird outputstream problem
+* moving license writing to other module
+* replacing cordova.js and init.js with their browserify-compatible equivalents
+* replacing init with init_b
+* updating transform/bundler/packager
+* replacing platform/exec
+* files were not properly generated
+* adding debug flag to support sourcemaps
+* adding other platforms
+* adding android and amazon-fireos
+* Adding compile-browserify grunt task
+* adding browserify compile task
+* adding browserify bundle
+* adding browserify packager
+* adding browserify require transform
+* adding required libraries to browserify
+* adding cordova.require fake wrapper
+* exec was set in the wrong file
+* removing onPluginsReady and setting platform exec
+* updating version
+* fixing weird outputstream problem
+* moving license writing to other module
+* replacing cordova.js and init.js with their browserify-compatible equivalents
+* replacing init with init_b
+* updating transform/bundler/packager
+* replacing platform/exec
+* files were not properly generated
+* adding debug flag to support sourcemaps
+* adding other platforms
+* adding android and amazon-fireos
+* Adding compile-browserify grunt task
+* adding browserify compile task
+* adding browserify bundle
+* adding browserify packager
+* adding browserify require transform
+* adding required libraries to browserify
+* CB-6321 Added cordova integration info to README
+* CB-6184 android: Delete incorrect log message about falling back on PROMPT
+* CB-6181 android: Always execute exec() callbacks async.
+* Add NOTICE file
+* CB-5671 setTimeout to allow concat'ed JS to load before pluginLoader.load()
+* CB-5671 Don't fail plugin loading if plugin modules are already loaded.
+* CB-5438 Use jsdom-nogyp to avoid dependency on python & visual studio
+* Add back "grunt btest" command
+* Move all deps into devDependencies.
+* CB-5438 Remove test symlinks & fix some build errors on windows.
+* CB-6007 Fix findCordovaPath() not working when path contains a query param
+* Update exec.js
+* CB-5973 blackberry: use sync by default
+* CB-5973 blackberry: add support for sync exec
+* CB-5438 Exclude local symlinks from jshint
+* fixes CB-5806 [Windows8] Add keepCallback support to proxy
+* Set VERSION to 3.5.0-dev (via coho)
+* CB-5606 WP8. Add ArrayBuffer support to exec bridge
+* CB-4970 CB-5457 Switch default bridge mode to IFRAME_NAV for iOS != 5
+* CB-5134 Add IFRAME_HASH based exec() bridge (all previous commits reverted).
+* Revert "CB-5134 iOS - Add location.hash-based exec bridge."
+* Revert "Fix broken tests take 2"
+* Fix broken tests take 2
+* Revert "Fix failing exec tests introduced by previous commit."
+* Fix failing exec tests introduced by previous commit.
+* CB-5134 iOS - Add location.hash-based exec bridge.
+* CB-5604 [BlackBerry10] Switch to async XHR for exec bridge
+* renaming reporter to test-reporter
+* tweaking the testing infra
+* temporarily removed btests, not working for me
+* fixing pats require analyzer thing
+* removed old runner logic into tasks
+* tests passing in browser yay
+* moved templates to tasks/templates and logic to tasks/lib
+* begin distilling tests out
+* this is long unused
+* removing unused files
+* grunt btest failing and not sure why
+* revised readme to reflect changes to structure and gruntfile
+* reverted out urlutil.exists check / save that battle for another PR
+* build runs but tests borked
+* fixing deps
+* everything seperated into discreet modules but deps not resolved
+* refactoring to small modules
+* adding exists fn to urlutil and check before injecting cordova_plugins.js (failing tests)
+* first pass at adding browser as a platform
+* fixed licensed headers for ubuntu
+* add ubuntu platform
+* Spelling: SEPERATOR -> SEPARATOR
+* Added amazon-fireos port to lib files + grunt file.
+* CB-5316 Spell Cordova as a brand unless it's a command or script
+* Set VERSION to 3.4.0-dev (via coho)
+* CB-5334 [BlackBerry10] Add command proxy to exec
+* CB-5307 Remove references to Callback and Incubator
+* CB-5253 remove webworksready event
+* CB-5253 remove webworks.exec
+* CB-5247 [BlackBerry10] Map blackberry.event to document
+* CB-5247 [BlackBerry10] Map blackberry.event to document
+* Set VERSION to 3.3.0-dev (via coho)
+* Created common exec proxy module
+* [CB-4905] CordovaJS on Windows8 has memoryleak on exec.js
+* made jslint a bit happier
+* [CB-4942] [BlackBerry10] deviceready is never fired - Fix typo event.toLowerCase to type.type.toLowerCase - Added eventListener for webworksReady to allow nativeReady to fire
+* [CB-3964] Use grunt's built in jshint.
+* Add RELEASENOTES.md for 3.1.0
+* Change build stamp again by having it use only VERSION file on master branch
+* Fix packager to not add commit hash when creating a tagged version
+* Set VERSION to 3.2.0-dev (via coho)
+* [CB-4761] Add cordova.platformId property
+* removed unnessary console.log
+* updated ffos to use win8 style commandProxy
+* [CB-4149] Read version from VERSION when there is no .git/
+* implement exec for firefoxos
+* override init.js in the firefoxos platform for navigator fix, other bugfixes
+* add firefoxos to gruntfile
+* platform.js
+* override init.js in the firefoxos platform for navigator fix, other bugfixes
+* add firefoxos to gruntfile
+* platform.js
+* [all] [CB-4725] Export cordova version as "cordova.version"
+* Revert "[android] Don't catch exceptions wihtin the bridge since the browser does better logging of them when uncaught."
+* [android] Don't catch exceptions wihtin the bridge since the browser does better logging of them when uncaught.
+* [android] Move non-plugin files out of plugins/ subdirectory.
+* [android] Tweak the online bridge to tell native when an event has happened.
+* [windowsphone] Use platform.bootstrap instead of platform.initialize for start-up logic.
+* [win8] Move code from bootstrap-windows8.js into windows8/platform.js
+* [test] Move code from bootstrap-test.js into test/platform.js
+* [ios] Move code from bootstrap-ios.js into ios/platform.js
+* [bb10] Move code from bootstrap-blackberry10.js into blackberry10/platform.js
+* [android] Move code from bootstrap-android.js into android/platform.js
+* Move bootstrap.js logic into a proper module "init.js"
+* [CB-4418] Delete loadMatchingModules() and move modulemapping call into bootstrap.js (from platform.js)
+* [CB-4418] Remove final symbols.js file by folding it into bootstrap.
+* [all] Make pluginloader call a callback instead of firing a channel.
+* [win8] Move commandProxy.js into windows8/
+* [CB-4428] Delete Android storage plugin from cordova-js
+* [all] Move some start-up logic from cordova.js -> bootstrap.js
+* [CB-4419] Remove non-CLI bootstrap files from cordova-js.
+* [CB-4419] Remove non-CLI platforms from cordova-js.
+* Make base64 tests work in browser as well as Node
+* Change Gruntfile to auto-build before running tests
+* [CB-4420] Add a helper function for resolving relative URLs.
+* [Windows8] remove all plugins
+* jshint cleanup (sorry im ocd)
+* [CB-4281] Moving echo to a plugin in mobilespec
+* [CB-4187] Fix the fix for start-up when no plugins are installed.
+* Fix grunt tests by deleting plugin-related and legacy BB tests
+* [CB-4004] Fix Android JS bridge break caused by bad rebase before 5ba835c
+* [CB-4187] Fix start-up stalling when no plugins are installed.
+* catch exception for missing or invalid file path
+* [all] [CB-3639] Remove console from core.
+* [all] Fix pluginloader never finishing (broken by recent commit)
+* [All] remove mistaken windows only debug message
+* Fix a failure case in pluginloader where an onerror callback was not being set.
+* [WP] remove plugins
+* [All] patch, in case console.warn is not defined
+* [All][CB-4016] plugin loading uses script injection to load cordova_plugins.js
+* [all] [CB-4022] Defer running of <runs> modules until after all scripts are loaded.
+* Change plugin_loader.js into a regular module that is called from bootstrap
+* [CB-3193] [BlackBerry10] Remove all plugins from cordova-js
+* [CB-3720] [BlackBerry10] Remove File overrides (moving to plugin)
+* Use new base64 method for iOS and OSX as well
+* CB 4004: Adding base64 encoding for array buffers, while removing the String expansion
+* [CB-4004] Add base64 encoding utility function
+* Make grunt fail if tests fail.
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/e4824950/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 50d849b..b961aff 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"author": "Gord Tanner <gt...@gmail.com> (http://github.com/gtanner)",
"name": "cordova-js",
"description": "Cordova JavaScript: a unified JavaScript layer for the Cordova suite of projects enabling cross-platform native mobile development of applications using HTML, CSS and JavaScript.",
- "version": "3.7.0-dev",
+ "version": "3.7.0",
"homepage": "http://cordova.apache.org",
"repository": {
"type": "git",
@@ -66,4 +66,4 @@
"browserify": "3.46.0",
"through": "2.3.4"
}
-}
\ No newline at end of file
+}
[04/21] js commit: CB-7349 Tell users to run npm install
Posted by st...@apache.org.
CB-7349 Tell users to run npm install
when browserify/jasmine-node are missing
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/58e9d6cd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/58e9d6cd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/58e9d6cd
Branch: refs/heads/cb-7219
Commit: 58e9d6cd0b5ff63e6ba566a49cdedcaea897c3db
Parents: 0b5a3a8
Author: Josh Soref <js...@blackberry.com>
Authored: Wed Aug 20 19:06:35 2014 -0400
Committer: Josh Soref <js...@blackberry.com>
Committed: Thu Aug 21 14:51:15 2014 -0400
----------------------------------------------------------------------
tasks/compile-browserify.js | 7 +++++++
tasks/test.js | 7 +++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/58e9d6cd/tasks/compile-browserify.js
----------------------------------------------------------------------
diff --git a/tasks/compile-browserify.js b/tasks/compile-browserify.js
index 1d28510..549fc0c 100644
--- a/tasks/compile-browserify.js
+++ b/tasks/compile-browserify.js
@@ -16,6 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
+try {
+ require('browserify');
+} catch (e) {
+ console.error("\nbrowserify is not installed, you need to:\n\trun `npm install` from " + require('path').dirname(__dirname)+"\n");
+ process.exit(1);
+}
+
var generate = require('./lib/packager-browserify');
module.exports = function(grunt) {
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/58e9d6cd/tasks/test.js
----------------------------------------------------------------------
diff --git a/tasks/test.js b/tasks/test.js
index edd6491..b1df54e 100644
--- a/tasks/test.js
+++ b/tasks/test.js
@@ -16,6 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
+try {
+ require('jasmine-node');
+} catch (e) {
+ console.error("\njasmine-node is not installed, you need to:\n\trun `npm install` from " + require('path').dirname(__dirname)+"\n");
+ process.exit(1);
+}
+
module.exports = function(grunt) {
grunt.registerTask('_test', 'Runs test in node', function() {
var done = this.async();
[13/21] js commit: added RELEASENTOES.md
Posted by st...@apache.org.
added RELEASENTOES.md
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/1258511f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/1258511f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/1258511f
Branch: refs/heads/cb-7219
Commit: 1258511f47d756e236559dbc05504f77421381d4
Parents: 6b72e2c
Author: Steven Gill <st...@gmail.com>
Authored: Tue Sep 2 18:16:57 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Sep 2 18:16:57 2014 -0700
----------------------------------------------------------------------
RELEASENOTES.md | 211 +++++++--------------------------------------------
1 file changed, 26 insertions(+), 185 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/1258511f/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 32565e0..8e9c6d7 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,6 +1,30 @@
+<!--
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+-->
+## Release Notes for Cordova JS ##
-### 3.7.0 (Aug 29, 2014)
-* Set VERSION to 3.7.0-dev (via coho)
+### 3.6.3 ###
+
+* Set Version to 3.6.3 (manually)
+* Set VERSION to 3.6.0 (via coho)
+* Removed old comment
* Checking for windows style path
* Better handling of all "modulemapper.clobbers" replacements
* Fixed browserify onDeviceReady event not firing on the browser
@@ -40,186 +64,3 @@
* updating version
* Upleveled changes from android.
* CB-6587:Set Vesion to 3.6.0-dev
-* updating version
-* fixing jshint ident
-* Revert "Revert "Merge branch 'master' into browserify""
-* Revert "Merge branch 'browserify'"
-* CB-6491 add CONTRIBUTING.md
-* Fix tests showing warning about util.print.
-* Fix cordova-js grunt failing due to jshint errors from WinJS commit
-* CB-6539 Future proof the WinJS include
-* updating package.json
-* fixing jshint error
-* Revert "Merge branch 'master' into browserify"
-* CB-5488 ios: Don't attempt iframe bridge until document.body exists
-* CB-6419 pause and resume events should be fired without a timeout
-* CB-6388: Add base64.toArrayBuffer() method to support binary data from the LOAD_URL bridge
-* CB-5606 WP8. ArrayBuffer does not exist in WP7
-* Fixed "WARNING: file name src\ubuntu\platform.js is missing the license header" during compile
-* adding channel pre deviceready
-* adding case for org.apache.cordova.* modules
-* adding cordova.require fake wrapper
-* exec was set in the wrong file
-* removing onPluginsReady and setting platform exec
-* updating version
-* fixing weird outputstream problem
-* moving license writing to other module
-* replacing cordova.js and init.js with their browserify-compatible equivalents
-* replacing init with init_b
-* updating transform/bundler/packager
-* replacing platform/exec
-* files were not properly generated
-* adding debug flag to support sourcemaps
-* adding other platforms
-* adding android and amazon-fireos
-* Adding compile-browserify grunt task
-* adding browserify compile task
-* adding browserify bundle
-* adding browserify packager
-* adding browserify require transform
-* adding required libraries to browserify
-* adding cordova.require fake wrapper
-* exec was set in the wrong file
-* removing onPluginsReady and setting platform exec
-* updating version
-* fixing weird outputstream problem
-* moving license writing to other module
-* replacing cordova.js and init.js with their browserify-compatible equivalents
-* replacing init with init_b
-* updating transform/bundler/packager
-* replacing platform/exec
-* files were not properly generated
-* adding debug flag to support sourcemaps
-* adding other platforms
-* adding android and amazon-fireos
-* Adding compile-browserify grunt task
-* adding browserify compile task
-* adding browserify bundle
-* adding browserify packager
-* adding browserify require transform
-* adding required libraries to browserify
-* CB-6321 Added cordova integration info to README
-* CB-6184 android: Delete incorrect log message about falling back on PROMPT
-* CB-6181 android: Always execute exec() callbacks async.
-* Add NOTICE file
-* CB-5671 setTimeout to allow concat'ed JS to load before pluginLoader.load()
-* CB-5671 Don't fail plugin loading if plugin modules are already loaded.
-* CB-5438 Use jsdom-nogyp to avoid dependency on python & visual studio
-* Add back "grunt btest" command
-* Move all deps into devDependencies.
-* CB-5438 Remove test symlinks & fix some build errors on windows.
-* CB-6007 Fix findCordovaPath() not working when path contains a query param
-* Update exec.js
-* CB-5973 blackberry: use sync by default
-* CB-5973 blackberry: add support for sync exec
-* CB-5438 Exclude local symlinks from jshint
-* fixes CB-5806 [Windows8] Add keepCallback support to proxy
-* Set VERSION to 3.5.0-dev (via coho)
-* CB-5606 WP8. Add ArrayBuffer support to exec bridge
-* CB-4970 CB-5457 Switch default bridge mode to IFRAME_NAV for iOS != 5
-* CB-5134 Add IFRAME_HASH based exec() bridge (all previous commits reverted).
-* Revert "CB-5134 iOS - Add location.hash-based exec bridge."
-* Revert "Fix broken tests take 2"
-* Fix broken tests take 2
-* Revert "Fix failing exec tests introduced by previous commit."
-* Fix failing exec tests introduced by previous commit.
-* CB-5134 iOS - Add location.hash-based exec bridge.
-* CB-5604 [BlackBerry10] Switch to async XHR for exec bridge
-* renaming reporter to test-reporter
-* tweaking the testing infra
-* temporarily removed btests, not working for me
-* fixing pats require analyzer thing
-* removed old runner logic into tasks
-* tests passing in browser yay
-* moved templates to tasks/templates and logic to tasks/lib
-* begin distilling tests out
-* this is long unused
-* removing unused files
-* grunt btest failing and not sure why
-* revised readme to reflect changes to structure and gruntfile
-* reverted out urlutil.exists check / save that battle for another PR
-* build runs but tests borked
-* fixing deps
-* everything seperated into discreet modules but deps not resolved
-* refactoring to small modules
-* adding exists fn to urlutil and check before injecting cordova_plugins.js (failing tests)
-* first pass at adding browser as a platform
-* fixed licensed headers for ubuntu
-* add ubuntu platform
-* Spelling: SEPERATOR -> SEPARATOR
-* Added amazon-fireos port to lib files + grunt file.
-* CB-5316 Spell Cordova as a brand unless it's a command or script
-* Set VERSION to 3.4.0-dev (via coho)
-* CB-5334 [BlackBerry10] Add command proxy to exec
-* CB-5307 Remove references to Callback and Incubator
-* CB-5253 remove webworksready event
-* CB-5253 remove webworks.exec
-* CB-5247 [BlackBerry10] Map blackberry.event to document
-* CB-5247 [BlackBerry10] Map blackberry.event to document
-* Set VERSION to 3.3.0-dev (via coho)
-* Created common exec proxy module
-* [CB-4905] CordovaJS on Windows8 has memoryleak on exec.js
-* made jslint a bit happier
-* [CB-4942] [BlackBerry10] deviceready is never fired - Fix typo event.toLowerCase to type.type.toLowerCase - Added eventListener for webworksReady to allow nativeReady to fire
-* [CB-3964] Use grunt's built in jshint.
-* Add RELEASENOTES.md for 3.1.0
-* Change build stamp again by having it use only VERSION file on master branch
-* Fix packager to not add commit hash when creating a tagged version
-* Set VERSION to 3.2.0-dev (via coho)
-* [CB-4761] Add cordova.platformId property
-* removed unnessary console.log
-* updated ffos to use win8 style commandProxy
-* [CB-4149] Read version from VERSION when there is no .git/
-* implement exec for firefoxos
-* override init.js in the firefoxos platform for navigator fix, other bugfixes
-* add firefoxos to gruntfile
-* platform.js
-* override init.js in the firefoxos platform for navigator fix, other bugfixes
-* add firefoxos to gruntfile
-* platform.js
-* [all] [CB-4725] Export cordova version as "cordova.version"
-* Revert "[android] Don't catch exceptions wihtin the bridge since the browser does better logging of them when uncaught."
-* [android] Don't catch exceptions wihtin the bridge since the browser does better logging of them when uncaught.
-* [android] Move non-plugin files out of plugins/ subdirectory.
-* [android] Tweak the online bridge to tell native when an event has happened.
-* [windowsphone] Use platform.bootstrap instead of platform.initialize for start-up logic.
-* [win8] Move code from bootstrap-windows8.js into windows8/platform.js
-* [test] Move code from bootstrap-test.js into test/platform.js
-* [ios] Move code from bootstrap-ios.js into ios/platform.js
-* [bb10] Move code from bootstrap-blackberry10.js into blackberry10/platform.js
-* [android] Move code from bootstrap-android.js into android/platform.js
-* Move bootstrap.js logic into a proper module "init.js"
-* [CB-4418] Delete loadMatchingModules() and move modulemapping call into bootstrap.js (from platform.js)
-* [CB-4418] Remove final symbols.js file by folding it into bootstrap.
-* [all] Make pluginloader call a callback instead of firing a channel.
-* [win8] Move commandProxy.js into windows8/
-* [CB-4428] Delete Android storage plugin from cordova-js
-* [all] Move some start-up logic from cordova.js -> bootstrap.js
-* [CB-4419] Remove non-CLI bootstrap files from cordova-js.
-* [CB-4419] Remove non-CLI platforms from cordova-js.
-* Make base64 tests work in browser as well as Node
-* Change Gruntfile to auto-build before running tests
-* [CB-4420] Add a helper function for resolving relative URLs.
-* [Windows8] remove all plugins
-* jshint cleanup (sorry im ocd)
-* [CB-4281] Moving echo to a plugin in mobilespec
-* [CB-4187] Fix the fix for start-up when no plugins are installed.
-* Fix grunt tests by deleting plugin-related and legacy BB tests
-* [CB-4004] Fix Android JS bridge break caused by bad rebase before 5ba835c
-* [CB-4187] Fix start-up stalling when no plugins are installed.
-* catch exception for missing or invalid file path
-* [all] [CB-3639] Remove console from core.
-* [all] Fix pluginloader never finishing (broken by recent commit)
-* [All] remove mistaken windows only debug message
-* Fix a failure case in pluginloader where an onerror callback was not being set.
-* [WP] remove plugins
-* [All] patch, in case console.warn is not defined
-* [All][CB-4016] plugin loading uses script injection to load cordova_plugins.js
-* [all] [CB-4022] Defer running of <runs> modules until after all scripts are loaded.
-* Change plugin_loader.js into a regular module that is called from bootstrap
-* [CB-3193] [BlackBerry10] Remove all plugins from cordova-js
-* [CB-3720] [BlackBerry10] Remove File overrides (moving to plugin)
-* Use new base64 method for iOS and OSX as well
-* CB 4004: Adding base64 encoding for array buffers, while removing the String expansion
-* [CB-4004] Add base64 encoding utility function
-* Make grunt fail if tests fail.
[02/21] js commit: Removed check for "c:" and added check for windows
platform
Posted by st...@apache.org.
Removed check for "c:" and added check for windows platform
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/bf4c4db8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/bf4c4db8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/bf4c4db8
Branch: refs/heads/cb-7219
Commit: bf4c4db8539bf036e83107d9250c99c266a7a991
Parents: 826be56
Author: Suraj Pindoria <su...@yahoo.com>
Authored: Tue Aug 19 11:23:45 2014 -0700
Committer: Suraj Pindoria <su...@yahoo.com>
Committed: Tue Aug 19 11:23:45 2014 -0700
----------------------------------------------------------------------
tasks/lib/require-tr.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/bf4c4db8/tasks/lib/require-tr.js
----------------------------------------------------------------------
diff --git a/tasks/lib/require-tr.js b/tasks/lib/require-tr.js
index 12117dd..6c61b1a 100644
--- a/tasks/lib/require-tr.js
+++ b/tasks/lib/require-tr.js
@@ -91,7 +91,7 @@ function _updateRequires(code) {
// Uglify is not able to recognize Windows style paths using '\' instead of '/'
// So replacing all of the '/' back to Windows '\'
- if (node.args[0].value != undefined && node.args[0].value.indexOf('c:') != -1) {
+ if (node.args[0].value !== undefined && node.args[0].value.indexOf('/android/app') !== -1 && process.platform === 'win32') {
node.args[0].value = node.args[0].value.replace(/\//g, '\\');
}
[10/21] js commit: Set VERSION to 3.7.0-dev (via coho)
Posted by st...@apache.org.
Set VERSION to 3.7.0-dev (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/8f41e8dd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/8f41e8dd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/8f41e8dd
Branch: refs/heads/cb-7219
Commit: 8f41e8dd0fa601d452e271cc14c7f5a9b4828722
Parents: 912f028
Author: Steven Gill <st...@gmail.com>
Authored: Tue Aug 26 13:35:26 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Aug 26 13:35:26 2014 -0700
----------------------------------------------------------------------
VERSION | 2 +-
package.json | 128 +++++++++++++++++++++++++++---------------------------
2 files changed, 65 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/8f41e8dd/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 86bab9c..a4ce38e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.6.0-dev
+3.7.0-dev
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/8f41e8dd/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 8c24550..50d849b 100644
--- a/package.json
+++ b/package.json
@@ -1,69 +1,69 @@
{
- "author": "Gord Tanner <gt...@gmail.com> (http://github.com/gtanner)",
- "name": "cordova-js",
- "description": "Cordova JavaScript: a unified JavaScript layer for the Cordova suite of projects enabling cross-platform native mobile development of applications using HTML, CSS and JavaScript.",
- "version": "3.6.2",
- "homepage": "http://cordova.apache.org",
- "repository": {
- "type": "git",
- "url": "http://git-wip-us.apache.org/repos/asf/cordova-js.git"
- },
- "engines": {
- "node": "~0.10.x"
- },
- "contributors": [
- {
- "name": "Fil Maj",
- "email": "filmaj@apache.org"
+ "author": "Gord Tanner <gt...@gmail.com> (http://github.com/gtanner)",
+ "name": "cordova-js",
+ "description": "Cordova JavaScript: a unified JavaScript layer for the Cordova suite of projects enabling cross-platform native mobile development of applications using HTML, CSS and JavaScript.",
+ "version": "3.7.0-dev",
+ "homepage": "http://cordova.apache.org",
+ "repository": {
+ "type": "git",
+ "url": "http://git-wip-us.apache.org/repos/asf/cordova-js.git"
},
- {
- "name": "Jesse MacFadyen",
- "email": "purplecabbage@apache.org"
+ "engines": {
+ "node": "~0.10.x"
},
- {
- "name": "Bryce Curtis",
- "email": ""
+ "contributors": [
+ {
+ "name": "Fil Maj",
+ "email": "filmaj@apache.org"
+ },
+ {
+ "name": "Jesse MacFadyen",
+ "email": "purplecabbage@apache.org"
+ },
+ {
+ "name": "Bryce Curtis",
+ "email": ""
+ },
+ {
+ "name": "Drew Walters",
+ "email": ""
+ },
+ {
+ "name": "Patrick Mueller",
+ "email": ""
+ },
+ {
+ "name": "Simon MacDonald",
+ "email": ""
+ },
+ {
+ "name": "Becky Gibson",
+ "email": ""
+ },
+ {
+ "name": "Anis Kadri",
+ "email": "anis@apache.org"
+ },
+ {
+ "name": "Dan Silivestru",
+ "email": "dansilivestru@apache.org"
+ },
+ {
+ "name": "Shazron Abdullah",
+ "email": "shazron@apache.org"
+ }
+ ],
+ "devDependencies": {
+ "jasmine-node": "1.14.x",
+ "jsdom-nogyp": "0.8.3",
+ "connect": "1.8.5",
+ "grunt": "~0.4.1",
+ "grunt-contrib-clean": "~0.4.1",
+ "grunt-contrib-jshint": "~0.6.0"
},
- {
- "name": "Drew Walters",
- "email": ""
- },
- {
- "name": "Patrick Mueller",
- "email": ""
- },
- {
- "name": "Simon MacDonald",
- "email": ""
- },
- {
- "name": "Becky Gibson",
- "email": ""
- },
- {
- "name": "Anis Kadri",
- "email": "anis@apache.org"
- },
- {
- "name": "Dan Silivestru",
- "email": "dansilivestru@apache.org"
- },
- {
- "name": "Shazron Abdullah",
- "email": "shazron@apache.org"
+ "dependencies": {
+ "uglify-js": "2.4.x",
+ "browserify": "3.46.0",
+ "through": "2.3.4"
}
- ],
- "devDependencies": {
- "jasmine-node": "1.14.x",
- "jsdom-nogyp": "0.8.3",
- "connect": "1.8.5",
- "grunt": "~0.4.1",
- "grunt-contrib-clean": "~0.4.1",
- "grunt-contrib-jshint": "~0.6.0"
- },
- "dependencies": {
- "uglify-js": "2.4.x",
- "browserify": "3.46.0",
- "through": "2.3.4"
- }
-}
+}
\ No newline at end of file
[09/21] js commit: Merge branch 'modulemapperClobbers' of
github.com:surajpindoria/cordova-js
Posted by st...@apache.org.
Merge branch 'modulemapperClobbers' of github.com:surajpindoria/cordova-js
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/912f028b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/912f028b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/912f028b
Branch: refs/heads/cb-7219
Commit: 912f028b970bf0f772f1cc976cd2f29c53084d36
Parents: 58e9d6c 8520c66
Author: Steven Gill <st...@gmail.com>
Authored: Tue Aug 26 11:07:07 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Aug 26 11:07:07 2014 -0700
----------------------------------------------------------------------
src/browser/platform.js | 8 +++-----
src/firefoxos/platform.js | 4 +++-
tasks/lib/require-tr.js | 30 +++++++++++++++++++++++++++---
3 files changed, 33 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[20/21] js commit: CB-7219 Added back version file,
added default value for compute-commit-id.js
Posted by st...@apache.org.
CB-7219 Added back version file, added default value for compute-commit-id.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/c9b122c9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/c9b122c9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/c9b122c9
Branch: refs/heads/cb-7219
Commit: c9b122c9f083d7684d9ed3a300b4b9d51654457e
Parents: 80df8eb
Author: Steven Gill <st...@gmail.com>
Authored: Tue Aug 12 13:55:11 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Sep 23 20:38:27 2014 -0700
----------------------------------------------------------------------
tasks/lib/compute-commit-id.js | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c9b122c9/tasks/lib/compute-commit-id.js
----------------------------------------------------------------------
diff --git a/tasks/lib/compute-commit-id.js b/tasks/lib/compute-commit-id.js
index d81b1d5..3c7f672 100644
--- a/tasks/lib/compute-commit-id.js
+++ b/tasks/lib/compute-commit-id.js
@@ -55,7 +55,6 @@ module.exports = function computeCommitId(callback, cachedGitVersion) {
}
});
} else {
- console.log('no git');
done('???');
}
[21/21] js commit: CB-7219 made sure compute commit id is run from
cordova-js repo. Set cwd to cordova-js
Posted by st...@apache.org.
CB-7219 made sure compute commit id is run from cordova-js repo. Set cwd to cordova-js
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/8ca0f3b2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/8ca0f3b2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/8ca0f3b2
Branch: refs/heads/cb-7219
Commit: 8ca0f3b2b87e0759c5236b91c80f18438544409c
Parents: c9b122c
Author: Steven Gill <st...@gmail.com>
Authored: Tue Aug 12 17:37:29 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Sep 23 20:39:25 2014 -0700
----------------------------------------------------------------------
tasks/lib/compute-commit-id.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/8ca0f3b2/tasks/lib/compute-commit-id.js
----------------------------------------------------------------------
diff --git a/tasks/lib/compute-commit-id.js b/tasks/lib/compute-commit-id.js
index 3c7f672..a4c4765 100644
--- a/tasks/lib/compute-commit-id.js
+++ b/tasks/lib/compute-commit-id.js
@@ -35,7 +35,6 @@ module.exports = function computeCommitId(callback, cachedGitVersion) {
var gitPath = 'git';
var args = 'rev-list HEAD --max-count=1';
childProcess.exec(gitPath + ' ' + args, {cwd:cordovaJSDir}, function(err, stdout, stderr) {
-
var isWindows = process.platform.slice(0, 3) == 'win';
if (err && isWindows) {
gitPath = '"' + path.join(process.env['ProgramFiles'], 'Git', 'bin', 'git.exe') + '"';
@@ -55,6 +54,7 @@ module.exports = function computeCommitId(callback, cachedGitVersion) {
}
});
} else {
+ console.log('no git');
done('???');
}