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:44 UTC
[2/6] cordova-lib git commit: CB-8965 copy platform specific js into
platform_www when adding new platforms for browserify workflow
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