You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2012/08/29 23:16:50 UTC
git commit: forgot asyncblock function wrapper, updated readme
Updated Branches:
refs/heads/cordova-client 78df059e7 -> 751a959d7
forgot asyncblock function wrapper, updated readme
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-labs/commit/751a959d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-labs/tree/751a959d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-labs/diff/751a959d
Branch: refs/heads/cordova-client
Commit: 751a959d7dbc300ccedd6cb32f66be2fb951557c
Parents: 78df059
Author: Fil Maj <ma...@gmail.com>
Authored: Wed Aug 29 14:16:43 2012 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Wed Aug 29 14:16:43 2012 -0700
----------------------------------------------------------------------
README.md | 2 +-
src/build.js | 82 +++++++++++++++++++++++++++--------------------------
2 files changed, 43 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-labs/blob/751a959d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index a1b739f..513b4ee 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ cordova-client, you will need to install the SDK for that platform. See:
- [Android SDK](http://developer.android.com)
- [BlackBerry WebWorks SDK](http://developer.blackberry.com)
-Cordova client has been tested on Windows, Linux and Mas OS X.
+Cordova client has been tested on Mas OS X _only_. Sorry.
In it's prototype stages, cordova-client will only work on Cordova v2.1
and above.
http://git-wip-us.apache.org/repos/asf/incubator-cordova-labs/blob/751a959d/src/build.js
----------------------------------------------------------------------
diff --git a/src/build.js b/src/build.js
index fc8d2f8..3b79ecc 100644
--- a/src/build.js
+++ b/src/build.js
@@ -16,52 +16,54 @@ module.exports = function build () {
throw 'Current working directory is not a Cordova-based project.';
}
- var xml = path.join(projectRoot, 'www', 'config.xml');
- var assets = path.join(projectRoot, 'www');
- var cfg = new config_parser(xml);
- var name = cfg.name();
- var id = cfg.packageName();
- var platforms = cfg.ls_platforms();
+ asyncblock(function(flow) {
+ var xml = path.join(projectRoot, 'www', 'config.xml');
+ var assets = path.join(projectRoot, 'www');
+ var cfg = new config_parser(xml);
+ var name = cfg.name();
+ var id = cfg.packageName();
+ var platforms = cfg.ls_platforms();
- // Iterate over each added platform
- platforms.map(function(platform) {
- // Figure out paths based on platform
- var assetsPath, js;
- switch (platform) {
- case 'android':
- assetsPath = path.join(projectRoot, 'platforms', 'android', 'assets', 'www');
- js = path.join(__dirname, '..', 'lib', 'android', 'framework', 'assets', 'js', 'cordova.android.js');
+ // Iterate over each added platform
+ platforms.map(function(platform) {
+ // Figure out paths based on platform
+ var assetsPath, js;
+ switch (platform) {
+ case 'android':
+ assetsPath = path.join(projectRoot, 'platforms', 'android', 'assets', 'www');
+ js = path.join(__dirname, '..', 'lib', 'android', 'framework', 'assets', 'js', 'cordova.android.js');
- // TODO: drop activity name and package name into
- // appropriate places in android
- break;
- case 'ios':
- assetsPath = path.join(projectRoot, 'platforms', 'ios', 'www');
- js = path.join(__dirname, '..', 'lib', 'ios', 'CordovaLib', 'javascript', 'cordova.ios.js');
+ // TODO: drop activity name and package name into
+ // appropriate places in android
+ break;
+ case 'ios':
+ assetsPath = path.join(projectRoot, 'platforms', 'ios', 'www');
+ js = path.join(__dirname, '..', 'lib', 'ios', 'CordovaLib', 'javascript', 'cordova.ios.js');
- // TODO: drop app name and id into
- // appropriate places in ios
- break;
- }
+ // TODO: drop app name and id into
+ // appropriate places in ios
+ break;
+ }
- // Clean out the existing www.
- rmrf(assetsPath);
+ // Clean out the existing www.
+ rmrf(assetsPath);
- // Copy app assets into native package
- cpr(assets, assetsPath);
+ // Copy app assets into native package
+ cpr(assets, assetsPath);
- // Copy in the appropriate JS
- var jsPath = path.join(assetsPath, 'cordova.js');
- fs.writeFileSync(jsPath, fs.readFileSync(js));
+ // Copy in the appropriate JS
+ var jsPath = path.join(assetsPath, 'cordova.js');
+ fs.writeFileSync(jsPath, fs.readFileSync(js));
- // shell out to debug command
- var cmd = path.join(projectRoot, 'platforms', platform, 'cordova', 'debug > /dev/null');
- exec(cmd, flow.set({
- key:'debug',
- firstArgIsError:false,
- responseFormat:['err', 'stdout', 'stderr']
- }));
- var buffers = flow.get('debug');
- if (buffers.err) throw 'An error occurred while building the ' + platform + ' project. ' + buffers.err;
+ // shell out to debug command
+ var cmd = path.join(projectRoot, 'platforms', platform, 'cordova', 'debug > /dev/null');
+ exec(cmd, flow.set({
+ key:'debug',
+ firstArgIsError:false,
+ responseFormat:['err', 'stdout', 'stderr']
+ }));
+ var buffers = flow.get('debug');
+ if (buffers.err) throw 'An error occurred while building the ' + platform + ' project. ' + buffers.err;
+ });
});
};