You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/06/18 19:58:45 UTC
[1/2] git commit: Fix create-release-branch not updating JS first.
Updated Branches:
refs/heads/master fa67a24cd -> 1b9afc41e
Fix create-release-branch not updating JS first.
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/025357a2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/025357a2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/025357a2
Branch: refs/heads/master
Commit: 025357a22b82e31d81778982cefb55d92767de85
Parents: fa67a24
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Jun 18 13:51:42 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Jun 18 13:51:42 2013 -0400
----------------------------------------------------------------------
coho | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/025357a2/coho
----------------------------------------------------------------------
diff --git a/coho b/coho
index 181b908..0a9c02d 100755
--- a/coho
+++ b/coho
@@ -651,9 +651,9 @@ function createReleaseBranchCommand() {
updateRepos(repos, [], true);
var hasRunJake = false;
+ var cordovaJsRepo = getRepoById('js');
function ensureJsIsBuilt() {
- var cordovaJs = getRepoById('js');
- forEachRepo([cordovaJs], function() {
+ forEachRepo([cordovaJsRepo], function() {
var actualCurTag = retrieveCurrentTagName();
if (actualCurTag != version) {
fatal('Not preparing branches since cordova-js is not at the version tag. (it\'s at ' + actualCurTag + ')');
@@ -665,6 +665,13 @@ function createReleaseBranchCommand() {
});
}
+ // Ensure cordova-js comes first.
+ var repoIndex = repos.indexOf(cordovaJsRepo);
+ if (repoIndex != -1) {
+ repos.splice(repoIndex, 1);
+ repos.unshift(cordovaJsRepo);
+ }
+
forEachRepo(repos, function(repo) {
stashAndPop(repo, function() {
// git fetch + update master
[2/2] git commit: Remove no longer present cordova.js path from wp7 &
wp8
Posted by ag...@apache.org.
Remove no longer present cordova.js path from wp7 & wp8
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/1b9afc41
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/1b9afc41
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/1b9afc41
Branch: refs/heads/master
Commit: 1b9afc41ed76d024d13bcab571a8371d98a34b7d
Parents: 025357a
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Jun 18 13:52:33 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Jun 18 13:58:36 2013 -0400
----------------------------------------------------------------------
coho | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/1b9afc41/coho
----------------------------------------------------------------------
diff --git a/coho b/coho
index 0a9c02d..387810a 100755
--- a/coho
+++ b/coho
@@ -68,13 +68,13 @@ var platformRepos = [
id: 'wp7',
repoName: 'cordova-wp7',
cordovaJsSrcName: 'cordova.windowsphone.js',
- cordovaJsPaths: ['templates/standalone/www/cordova.js', 'example/www/cordova.js']
+ cordovaJsPaths: ['templates/standalone/www/cordova.js']
}, {
title: 'Windows Phone 8',
id: 'wp8',
repoName: 'cordova-wp8',
cordovaJsSrcName: 'cordova.windowsphone.js',
- cordovaJsPaths: ['templates/standalone/www/cordova.js', 'example/www/cordova.js']
+ cordovaJsPaths: ['templates/standalone/www/cordova.js']
}, {
title: 'Mac OSX',
id: 'osx',