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 2015/05/19 01:22:43 UTC

[1/6] cordova-lib git commit: CB-8965 copy platform specific js into platform_www when adding new platforms for browserify workflow

Repository: cordova-lib
Updated Branches:
  refs/heads/master 7e60b1aa3 -> c1bd6660f


CB-8965 copy platform specific js into platform_www when adding new platforms for browserify workflow


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/38b2caee
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/38b2caee
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/38b2caee

Branch: refs/heads/master
Commit: 38b2caee660953cd3f505d8ef6dcf3321e4f4b09
Parents: a82fe9c
Author: Steve Gill <st...@gmail.com>
Authored: Wed May 6 01:02:25 2015 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Wed May 6 01:10:01 2015 -0700

----------------------------------------------------------------------
 .../src/cordova/metadata/amazon_fireos_parser.js    |  5 +++++
 cordova-lib/src/cordova/metadata/android_parser.js  |  5 +++++
 .../src/cordova/metadata/blackberry10_parser.js     |  5 +++++
 cordova-lib/src/cordova/metadata/browser_parser.js  |  5 +++++
 .../src/cordova/metadata/firefoxos_parser.js        |  5 +++++
 cordova-lib/src/cordova/metadata/ios_parser.js      |  5 +++++
 cordova-lib/src/cordova/metadata/ubuntu_parser.js   |  5 +++++
 cordova-lib/src/cordova/metadata/windows_parser.js  |  5 +++++
 cordova-lib/src/cordova/metadata/wp8_parser.js      |  5 +++++
 cordova-lib/src/cordova/platform.js                 | 16 +++++++++++++++-
 cordova-lib/src/platforms/platforms.js              |  1 +
 11 files changed, 61 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/38b2caee/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js b/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
index 7b3878d..be3f422 100644
--- a/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
+++ b/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
@@ -297,6 +297,11 @@ amazon_fireos_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+amazon_fireos_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 // Replace the www dir with contents of platform_www and app www.
 amazon_fireos_parser.prototype.update_www = function() {
     var projectRoot = util.isCordova(this.path);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/38b2caee/cordova-lib/src/cordova/metadata/android_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/android_parser.js b/cordova-lib/src/cordova/metadata/android_parser.js
index 564bb89..c618c0c 100644
--- a/cordova-lib/src/cordova/metadata/android_parser.js
+++ b/cordova-lib/src/cordova/metadata/android_parser.js
@@ -298,6 +298,11 @@ android_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+android_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 // Replace the www dir with contents of platform_www and app www.
 android_parser.prototype.update_www = function() {
     var projectRoot = util.isCordova(this.path);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/38b2caee/cordova-lib/src/cordova/metadata/blackberry10_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/blackberry10_parser.js b/cordova-lib/src/cordova/metadata/blackberry10_parser.js
index 65caccd..b1c137f 100644
--- a/cordova-lib/src/cordova/metadata/blackberry10_parser.js
+++ b/cordova-lib/src/cordova/metadata/blackberry10_parser.js
@@ -102,6 +102,11 @@ blackberry_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+blackberry_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 // Replace the www dir with contents of platform_www and app www.
 blackberry_parser.prototype.update_www = function() {
     var projectRoot = util.isCordova(this.path);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/38b2caee/cordova-lib/src/cordova/metadata/browser_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/browser_parser.js b/cordova-lib/src/cordova/metadata/browser_parser.js
index 0e545c7..66adef5 100644
--- a/cordova-lib/src/cordova/metadata/browser_parser.js
+++ b/cordova-lib/src/cordova/metadata/browser_parser.js
@@ -53,6 +53,11 @@ browser_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+browser_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 // Replace the www dir with contents of platform_www and app www.
 browser_parser.prototype.update_www = function() {
     var projectRoot = util.isCordova(this.path);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/38b2caee/cordova-lib/src/cordova/metadata/firefoxos_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/firefoxos_parser.js b/cordova-lib/src/cordova/metadata/firefoxos_parser.js
index d60a949..1109958 100644
--- a/cordova-lib/src/cordova/metadata/firefoxos_parser.js
+++ b/cordova-lib/src/cordova/metadata/firefoxos_parser.js
@@ -205,6 +205,11 @@ firefoxos_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+firefoxos_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 // Replace the www dir with contents of platform_www and app www.
 firefoxos_parser.prototype.update_www = function() {
     var projectRoot = util.isCordova(this.path);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/38b2caee/cordova-lib/src/cordova/metadata/ios_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/ios_parser.js b/cordova-lib/src/cordova/metadata/ios_parser.js
index ed5fff3..100b0c2 100644
--- a/cordova-lib/src/cordova/metadata/ios_parser.js
+++ b/cordova-lib/src/cordova/metadata/ios_parser.js
@@ -218,6 +218,11 @@ ios_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+ios_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 // Replace the www dir with contents of platform_www and app www.
 ios_parser.prototype.update_www = function() {
     var projectRoot = util.isCordova(this.path);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/38b2caee/cordova-lib/src/cordova/metadata/ubuntu_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/ubuntu_parser.js b/cordova-lib/src/cordova/metadata/ubuntu_parser.js
index de719e9..86c19b7 100644
--- a/cordova-lib/src/cordova/metadata/ubuntu_parser.js
+++ b/cordova-lib/src/cordova/metadata/ubuntu_parser.js
@@ -68,6 +68,11 @@ ubuntu_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+ubuntu_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 ubuntu_parser.prototype.update_manifest = function() {
     var nodearch2debarch = { 'arm': 'armhf',
                              'ia32': 'i386',

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/38b2caee/cordova-lib/src/cordova/metadata/windows_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/windows_parser.js b/cordova-lib/src/cordova/metadata/windows_parser.js
index e2f6f17..b62d252 100644
--- a/cordova-lib/src/cordova/metadata/windows_parser.js
+++ b/cordova-lib/src/cordova/metadata/windows_parser.js
@@ -217,6 +217,11 @@ windows_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+windows_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 // Replace the www dir with contents of platform_www and app www and updates the csproj file.
 windows_parser.prototype.update_www = function() {
     var projectRoot = util.isCordova(this.projDir);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/38b2caee/cordova-lib/src/cordova/metadata/wp8_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/wp8_parser.js b/cordova-lib/src/cordova/metadata/wp8_parser.js
index 6c04956..ee104f9 100644
--- a/cordova-lib/src/cordova/metadata/wp8_parser.js
+++ b/cordova-lib/src/cordova/metadata/wp8_parser.js
@@ -204,6 +204,11 @@ wp8_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+wp8_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 // Replace the www dir with contents of platform_www and app www and updates the csproj file.
 wp8_parser.prototype.update_www = function() {
     var projectRoot = util.isCordova(this.wp8_proj_dir);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/38b2caee/cordova-lib/src/cordova/platform.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/platform.js b/cordova-lib/src/cordova/platform.js
index fd49bd0..65f7f6b 100644
--- a/cordova-lib/src/cordova/platform.js
+++ b/cordova-lib/src/cordova/platform.js
@@ -156,6 +156,7 @@ function addHelper(cmd, hooksRunner, projectRoot, targets, opts) {
                     return superspawn.spawn(bin, args, copts);
                 }).then(function() {
                     copy_cordova_js(projectRoot, platform);
+                    copy_cordovajs_src(projectRoot, platform, platDetails.libDir);
                 }).then(function () {
                     // Call prepare for the current platform.
                     var prepOpts = {
@@ -639,7 +640,7 @@ function installPluginsForNewPlatform(platform, projectRoot, opts) {
     }, Q());
 }
 
-// Copty the cordova.js file to platforms/<platform>/platform_www/
+// Copy the cordova.js file to platforms/<platform>/platform_www/
 // The www dir is nuked on each prepare so we keep cordova.js in platform_www
 function copy_cordova_js(projectRoot, platform) {
     var platformPath = path.join(projectRoot, 'platforms', platform);
@@ -649,6 +650,19 @@ function copy_cordova_js(projectRoot, platform) {
     shell.cp('-f', path.join(parser.www_dir(), 'cordova.js'), path.join(platform_www, 'cordova.js'));
 }
 
+// Copy cordova-js-src directory into platform_www directory. 
+// We need these files to build cordova.js if using browserify method.
+function copy_cordovajs_src(projectRoot, platform, platLib) {
+    var platformPath = path.join(projectRoot, 'platforms', platform);
+    var parser = platforms.getPlatformProject(platform, platformPath);
+    var platform_www = path.join(platformPath, 'platform_www');
+    var cordovaJsSrcPath = parser.cordovajs_src_path(platLib);
+    //only exists for platforms that have shipped cordova-js-src directory
+    if(fs.existsSync(cordovaJsSrcPath)) {
+        shell.cp('-rf', cordovaJsSrcPath, platform_www);
+    } 
+}
+
 module.exports.add = add;
 module.exports.remove = remove;
 module.exports.update = update;

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/38b2caee/cordova-lib/src/platforms/platforms.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/platforms/platforms.js b/cordova-lib/src/platforms/platforms.js
index 01bb7cf..cc0e492 100644
--- a/cordova-lib/src/platforms/platforms.js
+++ b/cordova-lib/src/platforms/platforms.js
@@ -36,6 +36,7 @@ var cachedProjects = {};
 var PARSER_PUBLIC_METHODS = [
     'config_xml',
     'cordovajs_path',
+    'cordovajs_src_path',
     'update_from_config',
     'update_project',
     'update_www',


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org

[2/6] cordova-lib git commit: CB-8965 copy platform specific js into platform_www when adding new platforms for browserify workflow

Posted by st...@apache.org.
CB-8965 copy platform specific js into platform_www when adding new platforms for browserify workflow


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/350bb9ed
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/350bb9ed
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/350bb9ed

Branch: refs/heads/master
Commit: 350bb9ed985562b25fcd727a9056631f6bd094ad
Parents: 64a1945
Author: Steve Gill <st...@gmail.com>
Authored: Wed May 6 01:02:25 2015 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Wed May 13 22:34:31 2015 -0700

----------------------------------------------------------------------
 .../src/cordova/metadata/amazon_fireos_parser.js    |  5 +++++
 cordova-lib/src/cordova/metadata/android_parser.js  |  5 +++++
 .../src/cordova/metadata/blackberry10_parser.js     |  5 +++++
 cordova-lib/src/cordova/metadata/browser_parser.js  |  5 +++++
 .../src/cordova/metadata/firefoxos_parser.js        |  5 +++++
 cordova-lib/src/cordova/metadata/ios_parser.js      |  5 +++++
 cordova-lib/src/cordova/metadata/ubuntu_parser.js   |  5 +++++
 cordova-lib/src/cordova/metadata/windows_parser.js  |  5 +++++
 cordova-lib/src/cordova/metadata/wp8_parser.js      |  5 +++++
 cordova-lib/src/cordova/platform.js                 | 16 +++++++++++++++-
 cordova-lib/src/platforms/platforms.js              |  1 +
 11 files changed, 61 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/350bb9ed/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js b/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
index 7b3878d..be3f422 100644
--- a/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
+++ b/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
@@ -297,6 +297,11 @@ amazon_fireos_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+amazon_fireos_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 // Replace the www dir with contents of platform_www and app www.
 amazon_fireos_parser.prototype.update_www = function() {
     var projectRoot = util.isCordova(this.path);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/350bb9ed/cordova-lib/src/cordova/metadata/android_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/android_parser.js b/cordova-lib/src/cordova/metadata/android_parser.js
index 564bb89..c618c0c 100644
--- a/cordova-lib/src/cordova/metadata/android_parser.js
+++ b/cordova-lib/src/cordova/metadata/android_parser.js
@@ -298,6 +298,11 @@ android_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+android_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 // Replace the www dir with contents of platform_www and app www.
 android_parser.prototype.update_www = function() {
     var projectRoot = util.isCordova(this.path);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/350bb9ed/cordova-lib/src/cordova/metadata/blackberry10_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/blackberry10_parser.js b/cordova-lib/src/cordova/metadata/blackberry10_parser.js
index 65caccd..b1c137f 100644
--- a/cordova-lib/src/cordova/metadata/blackberry10_parser.js
+++ b/cordova-lib/src/cordova/metadata/blackberry10_parser.js
@@ -102,6 +102,11 @@ blackberry_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+blackberry_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 // Replace the www dir with contents of platform_www and app www.
 blackberry_parser.prototype.update_www = function() {
     var projectRoot = util.isCordova(this.path);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/350bb9ed/cordova-lib/src/cordova/metadata/browser_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/browser_parser.js b/cordova-lib/src/cordova/metadata/browser_parser.js
index 0e545c7..66adef5 100644
--- a/cordova-lib/src/cordova/metadata/browser_parser.js
+++ b/cordova-lib/src/cordova/metadata/browser_parser.js
@@ -53,6 +53,11 @@ browser_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+browser_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 // Replace the www dir with contents of platform_www and app www.
 browser_parser.prototype.update_www = function() {
     var projectRoot = util.isCordova(this.path);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/350bb9ed/cordova-lib/src/cordova/metadata/firefoxos_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/firefoxos_parser.js b/cordova-lib/src/cordova/metadata/firefoxos_parser.js
index d60a949..1109958 100644
--- a/cordova-lib/src/cordova/metadata/firefoxos_parser.js
+++ b/cordova-lib/src/cordova/metadata/firefoxos_parser.js
@@ -205,6 +205,11 @@ firefoxos_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+firefoxos_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 // Replace the www dir with contents of platform_www and app www.
 firefoxos_parser.prototype.update_www = function() {
     var projectRoot = util.isCordova(this.path);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/350bb9ed/cordova-lib/src/cordova/metadata/ios_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/ios_parser.js b/cordova-lib/src/cordova/metadata/ios_parser.js
index e182f88..ddb9fc2 100644
--- a/cordova-lib/src/cordova/metadata/ios_parser.js
+++ b/cordova-lib/src/cordova/metadata/ios_parser.js
@@ -222,6 +222,11 @@ ios_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+ios_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 // Replace the www dir with contents of platform_www and app www.
 ios_parser.prototype.update_www = function() {
     var projectRoot = util.isCordova(this.path);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/350bb9ed/cordova-lib/src/cordova/metadata/ubuntu_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/ubuntu_parser.js b/cordova-lib/src/cordova/metadata/ubuntu_parser.js
index de719e9..86c19b7 100644
--- a/cordova-lib/src/cordova/metadata/ubuntu_parser.js
+++ b/cordova-lib/src/cordova/metadata/ubuntu_parser.js
@@ -68,6 +68,11 @@ ubuntu_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+ubuntu_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 ubuntu_parser.prototype.update_manifest = function() {
     var nodearch2debarch = { 'arm': 'armhf',
                              'ia32': 'i386',

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/350bb9ed/cordova-lib/src/cordova/metadata/windows_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/windows_parser.js b/cordova-lib/src/cordova/metadata/windows_parser.js
index e2f6f17..b62d252 100644
--- a/cordova-lib/src/cordova/metadata/windows_parser.js
+++ b/cordova-lib/src/cordova/metadata/windows_parser.js
@@ -217,6 +217,11 @@ windows_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+windows_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 // Replace the www dir with contents of platform_www and app www and updates the csproj file.
 windows_parser.prototype.update_www = function() {
     var projectRoot = util.isCordova(this.projDir);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/350bb9ed/cordova-lib/src/cordova/metadata/wp8_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/wp8_parser.js b/cordova-lib/src/cordova/metadata/wp8_parser.js
index 6c04956..ee104f9 100644
--- a/cordova-lib/src/cordova/metadata/wp8_parser.js
+++ b/cordova-lib/src/cordova/metadata/wp8_parser.js
@@ -204,6 +204,11 @@ wp8_parser.prototype.cordovajs_path = function(libDir) {
     return path.resolve(jsPath);
 };
 
+wp8_parser.prototype.cordovajs_src_path = function(libDir) {
+    var jsPath = path.join(libDir, 'cordova-js-src');
+    return path.resolve(jsPath);
+};
+
 // Replace the www dir with contents of platform_www and app www and updates the csproj file.
 wp8_parser.prototype.update_www = function() {
     var projectRoot = util.isCordova(this.wp8_proj_dir);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/350bb9ed/cordova-lib/src/cordova/platform.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/platform.js b/cordova-lib/src/cordova/platform.js
index fd49bd0..65f7f6b 100644
--- a/cordova-lib/src/cordova/platform.js
+++ b/cordova-lib/src/cordova/platform.js
@@ -156,6 +156,7 @@ function addHelper(cmd, hooksRunner, projectRoot, targets, opts) {
                     return superspawn.spawn(bin, args, copts);
                 }).then(function() {
                     copy_cordova_js(projectRoot, platform);
+                    copy_cordovajs_src(projectRoot, platform, platDetails.libDir);
                 }).then(function () {
                     // Call prepare for the current platform.
                     var prepOpts = {
@@ -639,7 +640,7 @@ function installPluginsForNewPlatform(platform, projectRoot, opts) {
     }, Q());
 }
 
-// Copty the cordova.js file to platforms/<platform>/platform_www/
+// Copy the cordova.js file to platforms/<platform>/platform_www/
 // The www dir is nuked on each prepare so we keep cordova.js in platform_www
 function copy_cordova_js(projectRoot, platform) {
     var platformPath = path.join(projectRoot, 'platforms', platform);
@@ -649,6 +650,19 @@ function copy_cordova_js(projectRoot, platform) {
     shell.cp('-f', path.join(parser.www_dir(), 'cordova.js'), path.join(platform_www, 'cordova.js'));
 }
 
+// Copy cordova-js-src directory into platform_www directory. 
+// We need these files to build cordova.js if using browserify method.
+function copy_cordovajs_src(projectRoot, platform, platLib) {
+    var platformPath = path.join(projectRoot, 'platforms', platform);
+    var parser = platforms.getPlatformProject(platform, platformPath);
+    var platform_www = path.join(platformPath, 'platform_www');
+    var cordovaJsSrcPath = parser.cordovajs_src_path(platLib);
+    //only exists for platforms that have shipped cordova-js-src directory
+    if(fs.existsSync(cordovaJsSrcPath)) {
+        shell.cp('-rf', cordovaJsSrcPath, platform_www);
+    } 
+}
+
 module.exports.add = add;
 module.exports.remove = remove;
 module.exports.update = update;

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/350bb9ed/cordova-lib/src/platforms/platforms.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/platforms/platforms.js b/cordova-lib/src/platforms/platforms.js
index 01bb7cf..cc0e492 100644
--- a/cordova-lib/src/platforms/platforms.js
+++ b/cordova-lib/src/platforms/platforms.js
@@ -36,6 +36,7 @@ var cachedProjects = {};
 var PARSER_PUBLIC_METHODS = [
     'config_xml',
     'cordovajs_path',
+    'cordovajs_src_path',
     'update_from_config',
     'update_project',
     'update_www',


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org

[5/6] cordova-lib git commit: CB-8965 readded browserify transform

Posted by st...@apache.org.
CB-8965 readded browserify transform


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/4248d2b8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/4248d2b8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/4248d2b8

Branch: refs/heads/master
Commit: 4248d2b8d9f24d3d3a027b1f16e6f9f928d92f98
Parents: af7f08a
Author: Steve Gill <st...@gmail.com>
Authored: Mon May 18 00:44:55 2015 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Mon May 18 00:44:55 2015 -0700

----------------------------------------------------------------------
 cordova-lib/src/plugman/prepare-browserify.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/4248d2b8/cordova-lib/src/plugman/prepare-browserify.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/prepare-browserify.js b/cordova-lib/src/plugman/prepare-browserify.js
index dc81c6e..ffa4efa 100644
--- a/cordova-lib/src/plugman/prepare-browserify.js
+++ b/cordova-lib/src/plugman/prepare-browserify.js
@@ -231,7 +231,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
         events.emit('verbose', 'Writing out cordova_plugins.js...');
         fs.writeFileSync(path.join(wwwDir, 'cordova_plugins.js'), cordova_plugins, 'utf8');
 
-        //libraryRelease.transform(requireTr.transform);
+        libraryRelease.transform(requireTr.transform);
 
         scripts.forEach(function(script) {
             libraryRelease.add(script);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org

[4/6] cordova-lib git commit: Merge branch 'CB-8965' of https://github.com/stevengill/cordova-lib into CB-8965

Posted by st...@apache.org.
Merge branch 'CB-8965' of https://github.com/stevengill/cordova-lib into CB-8965


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/af7f08a9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/af7f08a9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/af7f08a9

Branch: refs/heads/master
Commit: af7f08a9cf3532acf3ecdc42c0cf67e41d27c601
Parents: 0f88a00 38b2cae
Author: Steve Gill <st...@gmail.com>
Authored: Fri May 15 17:05:41 2015 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Fri May 15 17:05:41 2015 -0700

----------------------------------------------------------------------

----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org

[3/6] cordova-lib git commit: CB-8965 passing platform as argument when getting symbolList

Posted by st...@apache.org.
CB-8965 passing platform as argument when getting symbolList


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/0f88a00c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/0f88a00c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/0f88a00c

Branch: refs/heads/master
Commit: 0f88a00c386de61e3535a91883000c25dad745fb
Parents: 350bb9e
Author: Steve Gill <st...@gmail.com>
Authored: Fri May 15 17:05:11 2015 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Fri May 15 17:05:11 2015 -0700

----------------------------------------------------------------------
 cordova-lib/src/plugman/prepare-browserify.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/0f88a00c/cordova-lib/src/plugman/prepare-browserify.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/prepare-browserify.js b/cordova-lib/src/plugman/prepare-browserify.js
index 4691ba5..dc81c6e 100644
--- a/cordova-lib/src/plugman/prepare-browserify.js
+++ b/cordova-lib/src/plugman/prepare-browserify.js
@@ -69,7 +69,7 @@ function generateFinalBundle(platform, libraryRelease, outReleaseFile, commitId,
 
     var addSymbolList = through.obj(function(row, enc, next) {
         if(symbolList === null) {
-            symbolList = requireTr.getModules();
+            symbolList = requireTr.getModules(platform);
             this.push(util.format('var symbolList = %s;\n%s\n', JSON.stringify(symbolList), row));
         } else {
             this.push(row);
@@ -231,13 +231,13 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
         events.emit('verbose', 'Writing out cordova_plugins.js...');
         fs.writeFileSync(path.join(wwwDir, 'cordova_plugins.js'), cordova_plugins, 'utf8');
 
-        libraryRelease.transform(requireTr.transform);
+        //libraryRelease.transform(requireTr.transform);
 
         scripts.forEach(function(script) {
             libraryRelease.add(script);
         });
 
         var outReleaseFile = path.join(wwwDir, 'cordova.js');
-        return generateFinalBundle(platform, libraryRelease, outReleaseFile, commitId, platformVersion, requireTr.getModules());
+        return generateFinalBundle(platform, libraryRelease, outReleaseFile, commitId, platformVersion, requireTr.getModules(platform));
     });
 };


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org

[6/6] cordova-lib git commit: Merge branch 'CB-8965'

Posted by st...@apache.org.
Merge branch 'CB-8965'


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/c1bd6660
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/c1bd6660
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/c1bd6660

Branch: refs/heads/master
Commit: c1bd6660f01ecce0e12e32c3679a758daa8dd120
Parents: 7e60b1a 4248d2b
Author: Steve Gill <st...@gmail.com>
Authored: Mon May 18 16:21:56 2015 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Mon May 18 16:21:56 2015 -0700

----------------------------------------------------------------------
 .../src/cordova/metadata/amazon_fireos_parser.js    |  5 +++++
 cordova-lib/src/cordova/metadata/android_parser.js  |  5 +++++
 .../src/cordova/metadata/blackberry10_parser.js     |  5 +++++
 cordova-lib/src/cordova/metadata/browser_parser.js  |  5 +++++
 .../src/cordova/metadata/firefoxos_parser.js        |  5 +++++
 cordova-lib/src/cordova/metadata/ios_parser.js      |  5 +++++
 cordova-lib/src/cordova/metadata/ubuntu_parser.js   |  5 +++++
 cordova-lib/src/cordova/metadata/windows_parser.js  |  5 +++++
 cordova-lib/src/cordova/metadata/wp8_parser.js      |  5 +++++
 cordova-lib/src/cordova/platform.js                 | 16 +++++++++++++++-
 cordova-lib/src/platforms/platforms.js              |  1 +
 cordova-lib/src/plugman/prepare-browserify.js       |  4 ++--
 12 files changed, 63 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/c1bd6660/cordova-lib/src/cordova/platform.js
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org