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/04/09 00:16:05 UTC

[1/2] git commit: CB-6420: tools release now use npm pack instead of git archive

Repository: cordova-coho
Updated Branches:
  refs/heads/master 045a2b72f -> 22087c798


CB-6420: tools release now use npm pack instead of git archive


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

Branch: refs/heads/master
Commit: d1ae66535a0af69adfd8e8f12b5536f2ea8de038
Parents: d5b6d74
Author: Steven Gill <st...@gmail.com>
Authored: Tue Apr 8 16:15:22 2014 -0600
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Apr 8 16:15:22 2014 -0600

----------------------------------------------------------------------
 coho | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/d1ae6653/coho
----------------------------------------------------------------------
diff --git a/coho b/coho
index 00d5022..b765514 100755
--- a/coho
+++ b/coho
@@ -598,8 +598,15 @@ function createArchiveCommand(argv) {
     forEachRepo(repos, function(repo) {
         var tag = argv.tag || findMostRecentTag();
         print('Creating archive of ' + repo.repoName + '@' + tag);
-        var outPath = path.join(absOutDir, repo.repoName + '-' + tag + '.zip');
-        execHelper('git archive --format zip --prefix ' + repo.repoName + '/ -o "' + outPath + '" ' + tag);
+
+        if(repo.id==='plugman'|| repo.id==='cli'){
+            var tgzname = execHelper('npm pack', true);
+            var outPath = path.join(absOutDir, 'cordova-' + tgzname);
+            shjs.mv(tgzname, outPath);
+        }else{
+            var outPath = path.join(absOutDir, repo.repoName + '-' + tag + '.zip');
+            execHelper('git archive --format zip --prefix ' + repo.repoName + '/ -o "' + outPath + '" ' + tag);
+        }
         if (argv.sign) {
             execHelper('gpg --armor --detach-sig --output "' + outPath + '.asc" "' + outPath + '"');
             fs.writeFileSync(outPath + '.md5', computeHash(outPath, 'MD5'));
@@ -608,7 +615,7 @@ function createArchiveCommand(argv) {
     });
     print();
     print('Archives created.');
-    print('Verify them using: coho verify-archive ' + path.join(outDir, '*.zip'));
+    print('Verify them using: coho verify-archive ' + path.join(outDir, '*.zip') + ' ' + path.join(outDir, '*.tgz'));
 }
 
 function computeHash(path, algo) {


[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-coho

Posted by st...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-coho


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

Branch: refs/heads/master
Commit: 22087c798cb388bf82d8fc8624cb9d5d22a52c65
Parents: d1ae665 045a2b7
Author: Steven Gill <st...@gmail.com>
Authored: Tue Apr 8 16:15:37 2014 -0600
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Apr 8 16:15:37 2014 -0600

----------------------------------------------------------------------
 docs/plugins-release-process.md  | 6 ++++++
 docs/processing-pull-requests.md | 2 +-
 docs/tools-release-process.md    | 9 ++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------