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:33 UTC
[19/21] js commit: CB-7219 added platformVersion,
removed cordova.version
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') + '"';