Return-Path: X-Original-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F09279F33 for ; Tue, 10 Apr 2012 19:15:20 +0000 (UTC) Received: (qmail 24157 invoked by uid 500); 10 Apr 2012 19:15:20 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 24123 invoked by uid 500); 10 Apr 2012 19:15:20 -0000 Mailing-List: contact callback-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@incubator.apache.org Delivered-To: mailing list callback-commits@incubator.apache.org Received: (qmail 24029 invoked by uid 99); 10 Apr 2012 19:15:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Apr 2012 19:15:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6DB03C1E1; Tue, 10 Apr 2012 19:15:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: steven@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [17/50] git commit: updated coho for 1.5 support Message-Id: <20120410191520.6DB03C1E1@tyr.zones.apache.org> Date: Tue, 10 Apr 2012 19:15:20 +0000 (UTC) updated coho for 1.5 support 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/fd70e632 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-coho/tree/fd70e632 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-coho/diff/fd70e632 Branch: refs/heads/master Commit: fd70e632ca4a13d53eeb48ef4a7e847b54f04fc6 Parents: 1c3f38e Author: Steven Gill Authored: Sat Mar 3 15:39:30 2012 -0800 Committer: Steven Gill Committed: Sat Mar 3 15:39:30 2012 -0800 ---------------------------------------------------------------------- coho | 15 +++++++++---- test/tests.coffee | 49 +++++++++++++++++++++++++++++++---------------- 2 files changed, 42 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-coho/blob/fd70e632/coho ---------------------------------------------------------------------- diff --git a/coho b/coho index aea313b..20aa420 100755 --- a/coho +++ b/coho @@ -67,20 +67,23 @@ queueCommand("cd temp/release && mkdir lib && cd lib && mkdir ios && mkdir andro //ios queueCommand("cd " + tempRepoDir + " && git clone "+ios+" && cd "+iosdir+" && git fetch --tags && git checkout "+VERSION); queueCommand("cd " + tempRepoDir + "/"+iosdir+" && make"); -queueCommand("cd " + tempRepoDir + "/"+iosdir+"/dist && cp -r PhoneGap-"+VERSION+".dmg " + iosReleaseLibDir + " && cp -r PhoneGap-"+VERSION+".dmg.SHA1 " + iosReleaseLibDir); +queueCommand("cd " + tempRepoDir + "/"+iosdir+"/dist && cp -r Cordova-"+VERSION+".dmg " + iosReleaseLibDir + " && cp -r Cordova-"+VERSION+".dmg.SHA1 " + iosReleaseLibDir); +queueCommand("cd " + tempRepoDir + "/"+iosdir+" && cp NOTICE ../../release/lib/ios"); //blackberry queueCommand("cd " + tempRepoDir + " && git clone "+blackberry+" && cd "+blackberrydir+" && git fetch --tags && git checkout "+VERSION); queueCommand("cd " + tempRepoDir + "/"+blackberrydir+" && ant dist"); queueCommand("cd " + tempRepoDir + "/"+blackberrydir+"/dist && cp -r ./* " + blackberryReleaseLibDir); +queueCommand("cd " + tempRepoDir + "/"+blackberrydir+" && cp NOTICE ../../../release/lib/blackberry"); //android queueCommand("cd " + tempRepoDir + " && git clone "+android+" && cd "+androiddir+" && git fetch --tags && git checkout "+VERSION); -queueCommand("cd " + tempRepoDir + "/"+androiddir+" && cp LICENSE " + androidReleaseLicense + " && cp VERSION " + androidReleaseVersion + " && cp README.md " + androidReleaseLibDir); +queueCommand("cd " + tempRepoDir + "/"+androiddir+" && cp LICENSE " + androidReleaseLicense + " && cp VERSION " + androidReleaseVersion + " && cp README.md " + androidReleaseLibDir + " && cp NOTICE " + androidReleaseLibDir); +queueCommand("cd " + tempRepoDir + "/"+androiddir+" && ant clean"); queueCommand("cd " + tempRepoDir + "/"+androiddir+" && ./bin/create"); queueCommand("cd " + tempRepoDir + "/"+androiddir+" && cp -rp example " + androidReleaseLibDir + "/example"); -queueCommand("cd " + tempRepoDir + "/"+androiddir+"/example && cp libs/phonegap-"+VERSION+".jar ../" + androidReleaseLibDir); -queueCommand("cd " + tempRepoDir + "/"+androiddir+"/example && cp assets/www/phonegap-"+VERSION+".js ../" + androidReleaseLibDir); +queueCommand("cd " + tempRepoDir + "/"+androiddir+"/example && cp libs/cordova-"+VERSION+".jar ../" + androidReleaseLibDir); +queueCommand("cd " + tempRepoDir + "/"+androiddir+"/example && cp assets/www/cordova-"+VERSION+".js ../" + androidReleaseLibDir); queueCommand("cd " + tempRepoDir + "/"+androiddir+"/example && cp -r res/xml ../" + androidReleaseLibDir); //windows phone @@ -107,6 +110,8 @@ queueCommand("mv depreciate.txt temp/release/lib/symbian/depreciate.txt") //readme queueCommand("cp lib/README.md temp/release/readme.md") +queueCommand("cp KEYS temp/release/keys") + if (oldVer != undefined){ queueCommand("cd temp/release/ && touch changelog && echo 'ChangeLog' > changelog") @@ -125,6 +130,6 @@ if (oldVer != undefined){ } executeCommands(function(){ - exec("cd temp/ && zip -r phonegap-"+VERSION+".zip release/ && gpg --armor --output phonegap-"+VERSION+".zip.asc --detach-sig phonegap-"+VERSION+".zip && gpg --print-md MD5 phonegap-"+VERSION+".zip > phonegap-"+VERSION+".zip.md5 && say DONE", function(e, stdout, stderr) { + exec("cd temp/ && zip -r cordova-"+VERSION+".zip release/ && gpg --armor --output cordova-"+VERSION+".zip.asc --detach-sig cordova-"+VERSION+".zip && gpg --print-md MD5 cordova-"+VERSION+".zip > cordova-"+VERSION+".zip.md5 && say DONE", function(e, stdout, stderr) { }); }); http://git-wip-us.apache.org/repos/asf/incubator-cordova-coho/blob/fd70e632/test/tests.coffee ---------------------------------------------------------------------- diff --git a/test/tests.coffee b/test/tests.coffee index 824f6a7..c1a85d9 100644 --- a/test/tests.coffee +++ b/test/tests.coffee @@ -1,5 +1,5 @@ -VERSION = '1.4.1' -oldVersion = '1.3.0' +VERSION = '1.5.0' +oldVersion = '1.4.1' exports['sanity test'] = (test)-> test.expect 1 @@ -67,7 +67,7 @@ exports['creating bada directory']=(test)-> exports['confirm ios clone worked'] = (test)-> test.expect 1 - test.ok require('path').existsSync("./temp/repositories/incubator-cordova-ios/PhoneGapLib/VERSION") + test.ok require('path').existsSync("./temp/repositories/incubator-cordova-ios/CordovaLib/VERSION") test.done() exports['confirm android clone worked'] = (test)-> @@ -103,7 +103,7 @@ exports['confirm docs clone worked'] = (test)-> exports['check ios version number'] = (test)-> test.expect 1 fs = require('fs') - if fs.readFileSync('./temp/repositories/incubator-cordova-ios/PhoneGapLib/VERSION', 'ascii') != VERSION + if fs.readFileSync('./temp/repositories/incubator-cordova-ios/CordovaLib/VERSION', 'ascii') != VERSION test.ok false, "VERSION file doesn't match release version" test.done() else @@ -143,7 +143,7 @@ exports['check windows version number'] = (test)-> exports['check webos version number'] = (test)-> test.expect 1 fs = require('fs') - if fs.readFileSync('./temp/repositories/incubator-cordova-webos/VERSION', 'ascii') != VERSION+"\n\n" + if fs.readFileSync('./temp/repositories/incubator-cordova-webos/VERSION', 'ascii') != VERSION test.ok false, "VERSION file doesn't match release version" test.done() else @@ -182,32 +182,42 @@ exports['docs copied into release'] = (test)-> exports['ios script successfull'] = (test)-> test.expect 1 - test.ok require('path').existsSync("./temp/repositories/incubator-cordova-ios/dist/PhoneGap-"+VERSION+".dmg") + test.ok require('path').existsSync("./temp/repositories/incubator-cordova-ios/dist/Cordova-"+VERSION+".dmg") test.done() exports['ios dmg copied into release'] = (test)-> test.expect 1 - test.ok require('path').existsSync("./temp/release/lib/ios/PhoneGap-"+VERSION+".dmg") + test.ok require('path').existsSync("./temp/release/lib/ios/Cordova-"+VERSION+".dmg") + test.done() + +exports['ios notice file copied into release'] = (test)-> + test.expect 1 + test.ok require('path').existsSync("./temp/release/lib/ios/NOTICE") test.done() exports['ios dmg sha1 copied into release'] = (test)-> test.expect 1 - test.ok require('path').existsSync("./temp/release/lib/ios/PhoneGap-"+VERSION+".dmg.SHA1") + test.ok require('path').existsSync("./temp/release/lib/ios/Cordova-"+VERSION+".dmg.SHA1") test.done() exports['android script successfull'] = (test)-> test.expect 1 - test.ok require('path').existsSync("./temp/repositories/incubator-cordova-android/example/libs/phonegap-"+VERSION+".jar") + test.ok require('path').existsSync("./temp/repositories/incubator-cordova-android/example/libs/cordova-"+VERSION+".jar") + test.done() + +exports['android cordova js copied into release'] = (test)-> + test.expect 1 + test.ok require('path').existsSync("./temp/release/lib/android/cordova-"+VERSION+".js") test.done() -exports['android phonegap js copied into release'] = (test)-> +exports['android cordova jar copied into release'] = (test)-> test.expect 1 - test.ok require('path').existsSync("./temp/release/lib/android/phonegap-"+VERSION+".js") + test.ok require('path').existsSync("./temp/release/lib/android/cordova-"+VERSION+".jar") test.done() -exports['android phonegap jar copied into release'] = (test)-> +exports['android notice file copied into release'] = (test)-> test.expect 1 - test.ok require('path').existsSync("./temp/release/lib/android/phonegap-"+VERSION+".jar") + test.ok require('path').existsSync("./temp/release/lib/android/NOTICE") test.done() exports['android xml folder copied into release'] = (test)-> @@ -222,7 +232,7 @@ exports['android example copied into release'] = (test)-> exports['blackberry script successfull'] = (test)-> test.expect 1 - test.ok require('path').existsSync("./temp/repositories/incubator-cordova-blackberry-webworks/dist/www/phonegap-"+VERSION+".js") + test.ok require('path').existsSync("./temp/repositories/incubator-cordova-blackberry-webworks/dist/www/cordova-"+VERSION+".js") test.done() exports['blackberry copied into release'] = (test)-> @@ -230,9 +240,14 @@ exports['blackberry copied into release'] = (test)-> test.ok require('path').existsSync("./temp/release/lib/blackberry/README.md") test.done() +exports['blackberry notice file copied into release'] = (test)-> + test.expect 1 + test.ok require('path').existsSync("./temp/release/lib/blackberry/README.md") + test.done() + exports['windows copied into release'] = (test)-> test.expect 1 - test.ok require('path').existsSync("./temp/release/lib/windows/PhoneGapStarter.zip") + test.ok require('path').existsSync("./temp/release/lib/windows/Cordova-"+VERSION+"-Starter.zip") test.done() exports['webos copied into release'] = (test)-> @@ -272,11 +287,11 @@ exports['test if changelog generated'] = (test)-> exports['zip exists'] = (test)-> test.expect 1 - test.ok require('path').existsSync("./temp/phonegap-#{ VERSION }.zip") + test.ok require('path').existsSync("./temp/cordova-#{ VERSION }.zip") test.done() exports['test if zip is empty'] = (test)-> test.expect 1 fs = require('fs') - test.ok fs.statSync('./temp/phonegap-#{VERSION}.zip').size != 0, 'zip created too soon' + test.ok fs.statSync("./temp/cordova-#{ VERSION }.zip").size != 0, 'zip created too soon' test.done()