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 51217C05A for ; Fri, 4 May 2012 00:05:39 +0000 (UTC) Received: (qmail 9547 invoked by uid 500); 4 May 2012 00:05:39 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 9490 invoked by uid 500); 4 May 2012 00:05:39 -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 9423 invoked by uid 99); 4 May 2012 00:05:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 May 2012 00:05:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E838D13CA4; Fri, 4 May 2012 00:05:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: shazron@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [3/7] Updated bin folder for Cordova 1.7.0 Message-Id: <20120504000538.E838D13CA4@tyr.zones.apache.org> Date: Fri, 4 May 2012 00:05:38 +0000 (UTC) http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/__TESTING__/Resources/en.lproj/Localizable.strings ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__/Resources/en.lproj/Localizable.strings b/bin/templates/project/__TESTING__/Resources/en.lproj/Localizable.strings old mode 100755 new mode 100644 index 6c4ec02..8972684 --- a/bin/templates/project/__TESTING__/Resources/en.lproj/Localizable.strings +++ b/bin/templates/project/__TESTING__/Resources/en.lproj/Localizable.strings @@ -1,11 +1,22 @@ /* - * PhoneGap is available under *either* the terms of the modified BSD license *or* the - * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text. - * - * Copyright (c) 2011, IBM Corporation + 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. */ - // accessibility label for recording button "toggle audio recording" = "toggle audio recording"; // notification spoken by VoiceOver when timed recording finishes http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/__TESTING__/Resources/es.lproj/Localizable.strings ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__/Resources/es.lproj/Localizable.strings b/bin/templates/project/__TESTING__/Resources/es.lproj/Localizable.strings old mode 100755 new mode 100644 index 5d8da61..23831e6 --- a/bin/templates/project/__TESTING__/Resources/es.lproj/Localizable.strings +++ b/bin/templates/project/__TESTING__/Resources/es.lproj/Localizable.strings @@ -1,8 +1,20 @@ /* - * PhoneGap is available under *either* the terms of the modified BSD license *or* the - * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text. - * - * Copyright (c) 2011, IBM Corporation + 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. */ // accessibility label for recording button http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/__TESTING__/Resources/icons/icon-72.png ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__/Resources/icons/icon-72.png b/bin/templates/project/__TESTING__/Resources/icons/icon-72.png old mode 100755 new mode 100644 index a2e4135..8c6e5df Binary files a/bin/templates/project/__TESTING__/Resources/icons/icon-72.png and b/bin/templates/project/__TESTING__/Resources/icons/icon-72.png differ http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/__TESTING__/Resources/icons/icon.png ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__/Resources/icons/icon.png b/bin/templates/project/__TESTING__/Resources/icons/icon.png old mode 100755 new mode 100644 index 182b139..b2571a7 Binary files a/bin/templates/project/__TESTING__/Resources/icons/icon.png and b/bin/templates/project/__TESTING__/Resources/icons/icon.png differ http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/__TESTING__/Resources/icons/icon@2x.png ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__/Resources/icons/icon@2x.png b/bin/templates/project/__TESTING__/Resources/icons/icon@2x.png old mode 100755 new mode 100644 index 3d7b9d4..d75098f Binary files a/bin/templates/project/__TESTING__/Resources/icons/icon@2x.png and b/bin/templates/project/__TESTING__/Resources/icons/icon@2x.png differ http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/__TESTING__/Resources/se.lproj/Localizable.strings ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__/Resources/se.lproj/Localizable.strings b/bin/templates/project/__TESTING__/Resources/se.lproj/Localizable.strings new file mode 100644 index 0000000..0af9646 --- /dev/null +++ b/bin/templates/project/__TESTING__/Resources/se.lproj/Localizable.strings @@ -0,0 +1,26 @@ +/* + 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. + */ + + +// accessibility label for recording button +"toggle audio recording" = "börja/avsluta inspelning"; +// notification spoken by VoiceOver when timed recording finishes +"timed recording complete" = "inspelning har avslutad"; +// accessibility hint for display of recorded elapsed time +"recorded time in minutes and seconds" = "inspelad tid in minuter och sekund"; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/__TESTING__/Resources/splash/Default.png ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__/Resources/splash/Default.png b/bin/templates/project/__TESTING__/Resources/splash/Default.png deleted file mode 100755 index c8f2de5..0000000 Binary files a/bin/templates/project/__TESTING__/Resources/splash/Default.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/__TESTING__/Resources/splash/Default@2x.png ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__/Resources/splash/Default@2x.png b/bin/templates/project/__TESTING__/Resources/splash/Default@2x.png deleted file mode 100755 index c071a20..0000000 Binary files a/bin/templates/project/__TESTING__/Resources/splash/Default@2x.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/__TESTING__/Resources/splash/Default@2x~iphone.png ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__/Resources/splash/Default@2x~iphone.png b/bin/templates/project/__TESTING__/Resources/splash/Default@2x~iphone.png new file mode 100644 index 0000000..bd24886 Binary files /dev/null and b/bin/templates/project/__TESTING__/Resources/splash/Default@2x~iphone.png differ http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/__TESTING__/Resources/splash/Default~iphone.png ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__/Resources/splash/Default~iphone.png b/bin/templates/project/__TESTING__/Resources/splash/Default~iphone.png new file mode 100644 index 0000000..6fcba56 Binary files /dev/null and b/bin/templates/project/__TESTING__/Resources/splash/Default~iphone.png differ http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/__TESTING__/__TESTING__-Info.plist ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__/__TESTING__-Info.plist b/bin/templates/project/__TESTING__/__TESTING__-Info.plist old mode 100755 new mode 100644 index 3296488..ed95ad8 --- a/bin/templates/project/__TESTING__/__TESTING__-Info.plist +++ b/bin/templates/project/__TESTING__/__TESTING__-Info.plist @@ -2,12 +2,21 @@ - CFBundleIconFiles - - icon.png - icon@2x.png - icon-72.png - + CFBundleIcons + + CFBundlePrimaryIcon + + CFBundleIconFiles + + icon.png + icon@2x.png + icon-72.png + icon-72@2x.png + + UIPrerenderedIcon + + + UISupportedInterfaceOrientations~ipad UIInterfaceOrientationPortrait http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/__TESTING__/__TESTING__-Prefix.pch ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__/__TESTING__-Prefix.pch b/bin/templates/project/__TESTING__/__TESTING__-Prefix.pch old mode 100755 new mode 100644 index 5772c64..8253a6c --- a/bin/templates/project/__TESTING__/__TESTING__-Prefix.pch +++ b/bin/templates/project/__TESTING__/__TESTING__-Prefix.pch @@ -4,5 +4,4 @@ #ifdef __OBJC__ #import - #import #endif http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/__TESTING__/en.lproj/InfoPlist.strings ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__/en.lproj/InfoPlist.strings b/bin/templates/project/__TESTING__/en.lproj/InfoPlist.strings old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/__TESTING__/main.m ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__/main.m b/bin/templates/project/__TESTING__/main.m old mode 100755 new mode 100644 index d02fda4..356ef6e --- a/bin/templates/project/__TESTING__/main.m +++ b/bin/templates/project/__TESTING__/main.m @@ -1,9 +1,27 @@ +/* + 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. + */ // // main.m // __TESTING__ // -// Created by Brian LeRoux on 11-08-24. -// Copyright Nitobi Software 2011. All rights reserved. +// Created by Shazron Abdullah on 12-05-03. +// Copyright __MyCompanyName__ 2012. All rights reserved. // #import http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/__TESTING__/verify.sh ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__/verify.sh b/bin/templates/project/__TESTING__/verify.sh new file mode 100755 index 0000000..0f6f037 --- /dev/null +++ b/bin/templates/project/__TESTING__/verify.sh @@ -0,0 +1,12 @@ +#!/bin/sh + + +if [ ! -d "$PROJECT_DIR/www" ] ; then + cp -R /Users/Shared/Cordova/Frameworks/Cordova.framework/www "$PROJECT_DIR" +fi +# detect www folder reference in project, if missing, print warning +grep "{isa = PBXFileReference; lastKnownFileType = folder; path = www; sourceTree = \"\"; };" "$PROJECT_DIR/$PROJECT_NAME.xcodeproj/project.pbxproj" +rc=$? +if [ $rc != 0 ] ; then +echo -e "warning: Missing - Add $PROJECT_DIR/www as a folder reference in your project. Just drag and drop the folder into your project, into the Project Navigator of Xcode 4. Make sure you select the second radio-button: 'Create folder references for any added folders' (which will create a blue folder)" 1>&2 +fi \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/cordova/debug ---------------------------------------------------------------------- diff --git a/bin/templates/project/cordova/debug b/bin/templates/project/cordova/debug new file mode 100755 index 0000000..18f8136 --- /dev/null +++ b/bin/templates/project/cordova/debug @@ -0,0 +1,24 @@ +#! /bin/sh +# +# compile and launch a Cordova/iOS project to the simulator +# +# USAGE +# ./debug [path name] +# +# EXAMPLE +# ./debug ~/Desktop/radness Radness +# +set -e + +PROJECT_PATH=${1:-"."} +PROJECT_NAME=${2:-"CordovaExample"} +PRJ=$PROJECT_NAME.xcodeproj +APP=build/Release-iphonesimulator/$PROJECT_NAME.app +SDK=`xcodebuild -showsdks | grep Sim | tail -1 | awk '{print $6}'` + +cd $PROJECT_PATH + +xcodebuild -project $PRJ -sdk $SDK clean build + +ios-sim launch $APP --stderr console.log --stdout console.log & + http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/cordova/emulate ---------------------------------------------------------------------- diff --git a/bin/templates/project/cordova/emulate b/bin/templates/project/cordova/emulate new file mode 100755 index 0000000..ff6365c --- /dev/null +++ b/bin/templates/project/cordova/emulate @@ -0,0 +1,3 @@ +#! /bin/sh + +open `xcode-select -print-path`/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\ Simulator.app \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/cordova/log ---------------------------------------------------------------------- diff --git a/bin/templates/project/cordova/log b/bin/templates/project/cordova/log new file mode 100755 index 0000000..59ffa37 --- /dev/null +++ b/bin/templates/project/cordova/log @@ -0,0 +1,7 @@ +#! /bin/sh +# +# USAGE +# +# ./log [path] +# +tail -f ${1:-"."}/console.log http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/phonegap/debug ---------------------------------------------------------------------- diff --git a/bin/templates/project/phonegap/debug b/bin/templates/project/phonegap/debug deleted file mode 100755 index bd63430..0000000 --- a/bin/templates/project/phonegap/debug +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh -# -# compile and launch a phonegap/ios project to the simulator -# -# USAGE -# ./debug [path name] -# -# EXAMPLE -# ./debug ~/Desktop/radness Radness -# -set -e - -PROJECT_PATH=${1:-"."} -PROJECT_NAME=${2:-"PhoneGapExample"} -PRJ=$PROJECT_NAME.xcodeproj -APP=build/Release-iphonesimulator/$PROJECT_NAME.app -SDK=`xcodebuild -showsdks | grep Sim | tail -1 | awk '{print $6}'` - -cd $PROJECT_PATH - -xcodebuild -project $PRJ -sdk $SDK clean build - -ios-sim launch $APP --stderr console.log --stdout console.log & - http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/phonegap/emulate ---------------------------------------------------------------------- diff --git a/bin/templates/project/phonegap/emulate b/bin/templates/project/phonegap/emulate deleted file mode 100755 index ff6365c..0000000 --- a/bin/templates/project/phonegap/emulate +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh - -open `xcode-select -print-path`/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\ Simulator.app \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/ce742b8c/bin/templates/project/phonegap/log ---------------------------------------------------------------------- diff --git a/bin/templates/project/phonegap/log b/bin/templates/project/phonegap/log deleted file mode 100755 index 59ffa37..0000000 --- a/bin/templates/project/phonegap/log +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/sh -# -# USAGE -# -# ./log [path] -# -tail -f ${1:-"."}/console.log