You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ma...@apache.org on 2013/10/01 17:01:19 UTC
[1/7] git commit: [CB-4960] Update the URL to dynamically download RAT
Updated Branches:
refs/heads/master 3bef4d510 -> e380786c8
[CB-4960] Update the URL to dynamically download RAT
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/da633d44
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/da633d44
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/da633d44
Branch: refs/heads/master
Commit: da633d44103fb0442c8a5674e6bb52aa28643a96
Parents: 2ebe864
Author: Marcel Kinard <cm...@gmail.com>
Authored: Tue Oct 1 10:50:13 2013 -0400
Committer: Marcel Kinard <cm...@gmail.com>
Committed: Tue Oct 1 10:56:26 2013 -0400
----------------------------------------------------------------------
.gitignore | 1 +
coho | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/da633d44/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 98c049a..2ceaa0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
apache-rat-0.8
+apache-rat-0.10
node_modules
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/da633d44/coho
----------------------------------------------------------------------
diff --git a/coho b/coho
index 50fa1af..cd2ff9c 100755
--- a/coho
+++ b/coho
@@ -1300,14 +1300,16 @@ function ratCommand() {
}
var repos = computeReposFromFlag(argv.r);
// Check that RAT command exists.
- var ratPath = path.resolve(path.join(path.dirname(process.argv[1]), 'apache-rat-0.8', 'apache-rat-0.8.jar'));
+ var ratName = 'apache-rat-0.10';
+ var ratUrl = "https://dist.apache.org/repos/dist/release/creadur/apache-rat-0.10/apache-rat-0.10-bin.tar.gz";
+ var ratPath = path.resolve(path.join(path.dirname(process.argv[1]), ratName, ratName+'.jar'));
if (!fs.existsSync(ratPath)) {
print('RAT tool not found, downloading to: ' + ratPath);
forEachRepo([getRepoById('coho')], function() {
if (shjs.which('curl')) {
- execHelper('curl "http://mirror.csclub.uwaterloo.ca/apache/incubator/rat/binaries/apache-rat-incubating-0.8-bin.tar.gz" | tar xz');
+ execHelper('curl "' + ratUrl + '" | tar xz');
} else {
- execHelper('wget -O - "http://mirror.csclub.uwaterloo.ca/apache/incubator/rat/binaries/apache-rat-incubating-0.8-bin.tar.gz" | tar xz');
+ execHelper('wget -O - "' + ratUrl + '" | tar xz');
}
});
if (!fs.existsSync(ratPath)) {
[4/7] git commit: added firefoxos
Posted by ma...@apache.org.
added firefoxos
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/dcf5250c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/dcf5250c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/dcf5250c
Branch: refs/heads/master
Commit: dcf5250cc710989f5673e634614eb6ed23689a04
Parents: 3564f28
Author: Steven Gill <st...@gmail.com>
Authored: Thu Sep 19 16:44:44 2013 -0700
Committer: Marcel Kinard <cm...@gmail.com>
Committed: Tue Oct 1 10:56:26 2013 -0400
----------------------------------------------------------------------
coho | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/dcf5250c/coho
----------------------------------------------------------------------
diff --git a/coho b/coho
index 46619c1..0dc6912 100755
--- a/coho
+++ b/coho
@@ -94,6 +94,13 @@ var platformRepos = [
cordovaJsSrcName: 'cordova.windowsphone.js',
cordovaJsPaths: ['common/www/cordova.js']
}, {
+ title: 'Firefox OS',
+ id: 'firefoxos',
+ repoName: 'cordova-firefoxos',
+ jiraComponentName: 'FirefoxOS',
+ cordovaJsSrcName: 'cordova.firefoxos.js',
+ cordovaJsPaths: ['cordova-lib/cordova.js']
+ }, {
title: 'Mac OSX',
id: 'osx',
repoName: 'cordova-osx',
[7/7] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-coho
Posted by ma...@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/e380786c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/e380786c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/e380786c
Branch: refs/heads/master
Commit: e380786c86c58d6b05da8f9c5a84d81bd47f65af
Parents: da633d4 3bef4d5
Author: Marcel Kinard <cm...@gmail.com>
Authored: Tue Oct 1 10:59:38 2013 -0400
Committer: Marcel Kinard <cm...@gmail.com>
Committed: Tue Oct 1 10:59:38 2013 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/7] git commit: Make ffos and win8 "active" platforms (to be
included in release bug sub-tasks).
Posted by ma...@apache.org.
Make ffos and win8 "active" platforms (to be included in release bug sub-tasks).
Make WP8 name be "WP8 + WP7" since the two are in the same repo now.
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/92ccee88
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/92ccee88
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/92ccee88
Branch: refs/heads/master
Commit: 92ccee8867a0828f179dee354d02201656dbfbc7
Parents: dcf5250
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed Sep 18 10:51:53 2013 -0400
Committer: Marcel Kinard <cm...@gmail.com>
Committed: Tue Oct 1 10:56:26 2013 -0400
----------------------------------------------------------------------
coho | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/92ccee88/coho
----------------------------------------------------------------------
diff --git a/coho b/coho
index 0dc6912..3e9cbd3 100755
--- a/coho
+++ b/coho
@@ -84,10 +84,9 @@ var platformRepos = [
jiraComponentName: 'Windows 8',
cordovaJsSrcName: 'cordova.windows8.js',
cordovaJsPaths: ['windows8/cordova.js', 'windows8/template/www/cordova.js'],
- versionFilePaths: [path.join('windows8', 'VERSION'), path.join('windows8', 'template', 'VERSION')],
- inactive: true
+ versionFilePaths: [path.join('windows8', 'VERSION'), path.join('windows8', 'template', 'VERSION')]
}, {
- title: 'Windows Phone 8',
+ title: 'Windows Phone 7 & 8',
id: 'wp8',
repoName: 'cordova-wp8',
jiraComponentName: 'WP8',
@@ -111,8 +110,7 @@ var platformRepos = [
id: 'firefoxos',
repoName: 'cordova-firefoxos',
jiraComponentName: 'FirefoxOS',
- cordovaJsPaths: ['cordova-lib/cordova.js'],
- inactive: true
+ cordovaJsPaths: ['cordova-lib/cordova.js']
}, {
title: 'Bada',
id: 'bada',
@@ -910,7 +908,7 @@ function repoPushCommand(argv) {
.options('b', {
alias: 'branch',
desc: 'The name of the branch to push. Can be specified multiple times to specify multiple branches.',
- default: 'master'
+ default: ['master', 'dev']
});
opt = registerHelpFlag(opt);
var argv = opt
[2/7] git commit: Support another format for remote apache repo
Posted by ma...@apache.org.
Support another format for remote apache repo
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/2ebe8642
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/2ebe8642
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/2ebe8642
Branch: refs/heads/master
Commit: 2ebe8642d922619f6de3309d56f88a30b063404f
Parents: c41029c
Author: Michal Mocny <mm...@gmail.com>
Authored: Fri Sep 27 11:39:31 2013 -0400
Committer: Marcel Kinard <cm...@gmail.com>
Committed: Tue Oct 1 10:56:26 2013 -0400
----------------------------------------------------------------------
coho | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/2ebe8642/coho
----------------------------------------------------------------------
diff --git a/coho b/coho
index 6732961..50fa1af 100755
--- a/coho
+++ b/coho
@@ -1008,11 +1008,16 @@ function repoUpdateCommand(argv) {
function determineApacheRemote(repo) {
var fields = execHelper('git remote -v', true).split(/\s+/);
+ var ret = null;
for (var i = 1; i < fields.length; i += 3) {
- if (fields[i].indexOf('git-wip-us.apache.org/repos/asf/' + repo.repoName) != -1) {
- return fields[i - 1];
- }
+ ['git-wip-us.apache.org/repos/asf/', 'git.apache.org/'].forEach(function(validRepo) {
+ if (fields[i].indexOf(validRepo + repo.repoName) != -1) {
+ ret = fields[i - 1];
+ }
+ });
}
+ if (ret)
+ return ret;
fatal('Could not find an apache remote for repo ' + repo.repoName);
}
[5/7] git commit: Updated blackberry platform's metadata
Posted by ma...@apache.org.
Updated blackberry platform's metadata
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/d1637d1a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/d1637d1a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/d1637d1a
Branch: refs/heads/master
Commit: d1637d1a551c23a7f3579802f6312b16690d98f8
Parents: 92ccee8
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Sep 19 22:34:14 2013 -0400
Committer: Marcel Kinard <cm...@gmail.com>
Committed: Tue Oct 1 10:56:26 2013 -0400
----------------------------------------------------------------------
coho | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/d1637d1a/coho
----------------------------------------------------------------------
diff --git a/coho b/coho
index 3e9cbd3..c0caf06 100755
--- a/coho
+++ b/coho
@@ -64,18 +64,12 @@ var platformRepos = [
id: 'blackberry',
repoName: 'cordova-blackberry',
jiraComponentName: 'BlackBerry',
+ cordovaJsSrcName: 'cordova.blackberry10.js',
cordovaJsPaths: [
- path.join('bbos', 'javascript', 'cordova.blackberry.js'),
- path.join('playbook', 'javascript', 'cordova.blackberry.js'),
- // bb10 JS path uses a different src, so logic is hardcoded below.
+ path.join('blackberry10', 'javascript', 'cordova.blackberry10.js')
],
versionFilePaths: [
- path.join('bbos', 'VERSION'),
- path.join('bbos', 'bin', 'templates', 'project', 'www', 'VERSION'),
path.join('blackberry10', 'VERSION'),
- path.join('blackberry10', 'bin', 'templates', 'project', 'www', 'VERSION'),
- path.join('playbook', 'VERSION'),
- path.join('playbook', 'bin', 'templates', 'project', 'www', 'VERSION'),
]
}, {
title: 'Windows',
@@ -1133,11 +1127,6 @@ function updateJsSnapshot(repo, version) {
var src = path.join('..', 'cordova-js', 'pkg', repo.cordovaJsSrcName || ('cordova.' + repo.id + '.js'));
cpAndLog(src, jsPath);
});
- // Extra bb10 logic
- if (repo.id == 'blackberry') {
- var src = path.join('..', 'cordova-js', 'pkg', 'cordova.blackberry10.js');
- cpAndLog(src, path.join('blackberry10', 'javascript', 'cordova.blackberry10.js'));
- }
if (pendingChangesExist()) {
execHelper('git commit -am "Update JS snapshot to version ' + version + ' (via coho)"');
}
[6/7] git commit: Delete JIRA template notes about upgrade guides &
CHANGELOG.md
Posted by ma...@apache.org.
Delete JIRA template notes about upgrade guides & CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/c41029c6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/c41029c6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/c41029c6
Branch: refs/heads/master
Commit: c41029c6c2068c8339f5d21cbb6a64c9ac1267b9
Parents: d1637d1
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Sep 19 23:14:18 2013 -0400
Committer: Marcel Kinard <cm...@gmail.com>
Committed: Tue Oct 1 10:56:26 2013 -0400
----------------------------------------------------------------------
coho | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/c41029c6/coho
----------------------------------------------------------------------
diff --git a/coho b/coho
index c0caf06..6732961 100755
--- a/coho
+++ b/coho
@@ -1425,14 +1425,14 @@ function createReleaseBug(version, root_version, prev_version, version_id, usern
request_queue.push(makeSubtask(parent_key, subjectPrefix + 'Branch & Tag RC1 for: cordova-js, cordova-mobile-spec and cordova-app-hello-world',
'Refer to ' + workflow_link, componentsForRepos([getRepoById('js'), getRepoById('mobile-spec'), getRepoById('app-hello-world')]), version_id));
repoGroups['active-platform'].forEach(function(repo) {
- request_queue.push(makeSubtask(parent_key, subjectPrefix + 'Tag RC1 for ' + repo.title, 'Refer to ' + workflow_link + '\n\nDon\'t forget about CHANGELOG.md',
+ request_queue.push(makeSubtask(parent_key, subjectPrefix + 'Tag RC1 for ' + repo.title, 'Refer to ' + workflow_link,
componentsForRepos([repo]), version_id));
});
request_queue.push(makeSubtask(parent_key, subjectPrefix + 'Branch & Tag RC1 of cordova-cli',
'Refer to ' + workflow_link, componentsForRepos([getRepoById('cli')]), version_id));
repoGroups['active-platform'].forEach(function(repo) {
- request_queue.push(makeSubtask(parent_key, subjectPrefix + 'Test & Tag ' + version + ' for ' + repo.title, 'Refer to ' + workflow_link + '\n\nDon\'t forget about upgrade guides!',
+ request_queue.push(makeSubtask(parent_key, subjectPrefix + 'Test & Tag ' + version + ' for ' + repo.title, 'Refer to ' + workflow_link,
componentsForRepos([repo]), version_id));
});