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/03 00:44:37 UTC
git commit: updated cadence process,
create archive now defaults to npm pack over git archive,
added optional tag argument to print-tags command
Repository: cordova-coho
Updated Branches:
refs/heads/master 72acccc51 -> 221e9fbbf
updated cadence process, create archive now defaults to npm pack over git archive, added optional tag argument to print-tags command
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/221e9fbb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/221e9fbb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/221e9fbb
Branch: refs/heads/master
Commit: 221e9fbbff865ed69f0337e362e65a5512eb3658
Parents: 72acccc
Author: Steven Gill <st...@gmail.com>
Authored: Tue Sep 2 15:44:31 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Sep 2 15:44:31 2014 -0700
----------------------------------------------------------------------
src/create-verify-archive.js | 7 ++++---
src/print-tags.js | 6 +++++-
src/repoutil.js | 12 ++++++------
3 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/221e9fbb/src/create-verify-archive.js
----------------------------------------------------------------------
diff --git a/src/create-verify-archive.js b/src/create-verify-archive.js
index 871394d..52946aa 100644
--- a/src/create-verify-archive.js
+++ b/src/create-verify-archive.js
@@ -71,17 +71,18 @@ exports.createCommand = function*(argv) {
yield gitutil.gitCheckout(tag);
print('Creating archive of ' + repo.repoName + '@' + tag);
- if (repo.id==='plugman' || repo.id==='cli' || repo.id==='lib') {
+ if (!(repo.id==='mobile-spec' || repo.id==='app-hello-world')) {
if (yield gitutil.pendingChangesExist()) {
apputil.fatal('Aborting because pending changes exist in ' + repo.repoName);
}
var cmd = 'npm pack';
- if (repo.id==='lib') cmd = 'npm pack cordova-lib'
+ if (repo.id==='lib' || repo.id==='windows' || repo.id==='wp8') cmd = 'npm pack cordova-'+repo.id;
var tgzname = yield executil.execHelper(executil.ARGS(cmd), true);
- var outPath = path.join(absOutDir, 'cordova-' + tgzname);
+ var outPath = path.join(absOutDir, tgzname);
shelljs.mv(tgzname, outPath);
} else {
var outPath = path.join(absOutDir, repo.repoName + '-' + tag + '.zip');
+ console.log(outPath);
yield executil.execHelper(executil.ARGS('git archive --format zip --prefix ' + repo.repoName + '/ -o ', outPath, tag));
}
if (argv.sign) {
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/221e9fbb/src/print-tags.js
----------------------------------------------------------------------
diff --git a/src/print-tags.js b/src/print-tags.js
index 1f50334..f2dce79 100644
--- a/src/print-tags.js
+++ b/src/print-tags.js
@@ -39,7 +39,11 @@ module.exports = function*(argv) {
var repos = flagutil.computeReposFromFlag(argv.r);
yield repoutil.forEachRepo(repos, function*(repo) {
- var tag = yield gitutil.findMostRecentTag();
+ if (argv.tag){
+ var tag = argv.tag;
+ } else {
+ var tag = yield gitutil.findMostRecentTag();
+ }
if (!tag) {
console.log(' ' + repo.repoName + ': NO TAGS');
return;
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/221e9fbb/src/repoutil.js
----------------------------------------------------------------------
diff --git a/src/repoutil.js b/src/repoutil.js
index a336672..696a36b 100644
--- a/src/repoutil.js
+++ b/src/repoutil.js
@@ -150,11 +150,6 @@ var nonPlatformRepos = [
'uubench.js',
]
}, {
- title: 'Cordova JS',
- id: 'js',
- repoName: 'cordova-js',
- jiraComponentName: 'CordovaJS'
- }, {
title: 'Hello World App',
id: 'app-hello-world',
repoName: 'cordova-app-hello-world',
@@ -315,6 +310,11 @@ var toolRepos = [
repoName: 'cordova-lib',
jiraComponentName: 'CordovaLib'
}, {
+ title: 'Cordova JS',
+ id: 'js',
+ repoName: 'cordova-js',
+ jiraComponentName: 'CordovaJS'
+ }, {
title: 'Cordova Coho',
id: 'coho',
repoName: 'cordova-coho',
@@ -391,7 +391,7 @@ var repoGroups = {
'active-platform': platformRepos.filter(function(r) { return !r.inactive }),
'release-repos': allRepos.filter(function(r) { return !r.inactive })
};
-repoGroups['cadence'] = repoGroups['active-platform'].concat([getRepoById('cli'), getRepoById('js'), getRepoById('mobile-spec'), getRepoById('app-hello-world'), getRepoById('cordova-lib')]);
+repoGroups['cadence'] = repoGroups['active-platform'].concat([getRepoById('mobile-spec'), getRepoById('app-hello-world')]);
repoGroups.__defineGetter__('auto', function() {
return allRepos.filter(function(repo) {