Updated Branches: refs/heads/master b62cf50a4 -> 959105bf8
added proper header Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-coho/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-coho/commit/959105bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-coho/tree/959105bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-coho/diff/959105bf Branch: refs/heads/master Commit: 959105bf8965aed891cdddbc847d29828d24519c Parents: 851e497 Author: steven gill <ste...@apache.org> Authored: Wed Jun 6 01:49:35 2012 -0700 Committer: steven gill <ste...@apache.org> Committed: Wed Jun 6 01:49:35 2012 -0700 ---------------------------------------------------------------------- bin/NOTICE | 30 +----------------------------- bin/README.md | 17 ++++++----------- coho | 37 ++++++++++++++++++++++++++++--------- 3 files changed, 35 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-coho/blob/959105bf/bin/NOTICE ---------------------------------------------------------------------- diff --git a/bin/NOTICE b/bin/NOTICE index da628bc..11010da 100644 --- a/bin/NOTICE +++ b/bin/NOTICE @@ -1,39 +1,11 @@ Apache Callback -Copyright 2011 The Apache Software Foundation +Copyright 2012 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org) - ==================================================================== - -// ANDROID NOTICES - - ==================================================================== - -// BADA NOTICES - - ==================================================================== - -// BLACKBERRY NOTICES - This product includes software developed by Ant-Contrib project (http://sourceforge.net/projects/ant-contrib). - ==================================================================== - -// DOCS NOTICES - - ==================================================================== - -// IOS NOTICES - - ==================================================================== - -// WEBOS NOTICES Modifications to phonegap-core.js (compassAPI) and compass.js (adapted from accelerometer.js) are Copyright 2012 Hewlett-Packard Development Company, L.P. - ==================================================================== - -// WP7 NOTICES - - ==================================================================== \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-cordova-coho/blob/959105bf/bin/README.md ---------------------------------------------------------------------- diff --git a/bin/README.md b/bin/README.md index 1191379..a00f7a9 100644 --- a/bin/README.md +++ b/bin/README.md @@ -1,9 +1,9 @@ -C O R D O V A +APACHE CORDOVA =================== What is it? ------------------- -Cordova is a web platform that exposes native mobile device apis and +Apache Cordova is a web platform that exposes native mobile device apis and data to JavaScript. Previously known as PhoneGap, the name changed happened when PhoneGap was donated to the Apache foundation. @@ -33,11 +33,7 @@ combination of these. Get started ------------------- -Note the following links still refer to the original PhoneGap project. -As time goes on, these will be ideally moved to an Apache hosted site or -be renamed to the Apache Cordova Brand. - -[phonegap.com/start](http://phonegap.com/start) +[Docs](http://docs.cordova.io/guide_getting-started_index.md.html) Community ------------------- @@ -45,10 +41,9 @@ Note the following links still refer to the original PhoneGap project. As time goes on, these will be ideally moved to an Apache hosted site or be renamed to the Apache Cordova Brand. -- [Website](http://incubator.apache.org/cordova/) -- [Twitter](http://twitter.com/phonegap) -- [Facebook](http://facebook.com/phonegap) -- [Wiki](http://wiki.phonegap.com/) +- [Website](http://cordova.io) +- [Twitter](http://twitter.com/apachecordova) +- [Wiki](http://docs.cordova.io/guide_getting-started_index.md.html) - [Mailing List](http://groups.google.com/group/phonegap) - [Issue Tracker](https://issues.apache.org/jira/browse/CB) - [IRC](http://webchat.freenode.net/?channels=#phonegap) http://git-wip-us.apache.org/repos/asf/incubator-cordova-coho/blob/959105bf/coho ---------------------------------------------------------------------- diff --git a/coho b/coho index bdd9f79..610d759 100755 --- a/coho +++ b/coho @@ -1,4 +1,23 @@ #!/usr/bin/env node +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +*/ + PLATFORM = process.argv[2] if (!PLATFORM) { PLATFORM = "all"; @@ -36,7 +55,7 @@ var util = require('util') , badaWacReleaseBinDir = '../../release/bin/badaWac' , releaseDocDir = '../../release/doc' , releaseBinDir = '../release/bin' -, releaseSrcDir = '../release/src' +, releaseSrcDir = '../release/src/cordova-'+VERSION , oldVer = process.argv[4]; var commandQueue = [], @@ -89,9 +108,9 @@ function checkSoftware() { } checkSoftware(); - queueCommand("rm -rf temp && mkdir temp && cd temp && mkdir repositories && mkdir release"); -queueCommand("cd temp/release && mkdir bin && mkdir src"); +queueCommand("cd temp/release && mkdir bin && mkdir src && mkdir src/cordova-"+VERSION); + //ios if (PLATFORM === "all" || PLATFORM === "ios") { queueCommand("cd temp/release/bin && mkdir ios"); @@ -186,10 +205,10 @@ queueCommand("cp KEYS temp/release/KEYS") // notice, license, readme, disclaimer file to be put into official release artifact queueCommand("echo 'Moving notice, license, readme, and disclaimer files to release artifact'"); -queueCommand("cp bin/README.md temp/release/src/README.MD") -queueCommand("cp bin/NOTICE temp/release/src/NOTICE"); -queueCommand("cp bin/LICENSE temp/release/src/LICENSE"); -queueCommand("cp bin/DISCLAIMER temp/release/src/DISCLAIMER"); +queueCommand("cp bin/README.md temp/release/src/cordova-"+VERSION+"/README.MD") +queueCommand("cp bin/NOTICE temp/release/src/cordova-"+VERSION+"/NOTICE"); +queueCommand("cp bin/LICENSE temp/release/src/cordova-"+VERSION+"/LICENSE"); +queueCommand("cp bin/DISCLAIMER temp/release/src/cordova-"+VERSION+"/DISCLAIMER"); if (oldVer != undefined){ queueCommand("cd temp/release/ && touch changelog && echo 'ChangeLog' > changelog") @@ -227,8 +246,8 @@ var cordovaSrcSha = cordovaSrcZip+".sha"; // remove git files before we zip queueCommand("echo 'Cleaning up .git files from repositories before zipping em'"); -queueCommand("cd temp/release/src && find `pwd` -name .git -type d -print0 | xargs -0 rm -r"); -queueCommand("cd temp/release/src && find `pwd` -name .git* -type f -print0 | xargs -0 rm -r"); +queueCommand("cd temp/release/src/cordova-"+VERSION+" && find `pwd` -name .git -type d -print0 | xargs -0 rm -r"); +queueCommand("cd temp/release/src/cordova-"+VERSION+" && find `pwd` -name .git* -type f -print0 | xargs -0 rm -r"); queueCommand("echo 'Zipping and signing bin'"); queueCommand("cd temp/release/bin && zip -rq "+ cordovaBinZip +" * && gpg --armor --output "+cordovaBinAsc+" --detach-sig "+cordovaBinZip+" && gpg --print-md MD5 "+cordovaBinMd5+" > " + cordovaBinMd5 +" && gpg --print-md SHA512 " + cordovaBinZip + " > " + cordovaBinSha);
