You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2012/02/21 14:25:59 UTC
ios commit: Cordova rename fixes.
Updated Branches:
refs/heads/master 745f945e6 -> 199017bdc
Cordova rename fixes.
commit 67f4e8fdbd2ec18e3dec34f419c74af76e34da09
Author: Shazron Abdullah <sh...@apache.org>
Date: Tue Feb 21 05:20:49 2012 -0800
Factored out shell script in project Run Script into an external file.
commit 8a72fea27c8344b047b5741c3a257e59a8435219
Author: Shazron Abdullah <sh...@apache.org>
Date: Tue Feb 21 05:03:31 2012 -0800
Added CDV.h helper header, and deprecated files to ease with upgrades.
commit 6ad4e9937bcd7283fd6ce0514de1214e8406a419
Author: Shazron Abdullah <sh...@apache.org>
Date: Tue Feb 21 03:03:07 2012 -0800
Makefile fixes.
commit d7970ff550fdb0acb4e87d7970c0ce2a633029fa
Author: Shazron Abdullah <sh...@apache.org>
Date: Tue Feb 21 02:38:35 2012 -0800
Updated Makefile, and doc tweaks.
commit 1c65a3043dcdca1750af49418e72bfa4367052e3
Author: Shazron Abdullah <sh...@apache.org>
Date: Mon Feb 20 22:51:48 2012 -0800
Updated PhoneGap references in the README to Cordova
commit e8f5f0e108bbfe86b737b2a06e0411cd6b699755
Author: Shazron Abdullah <sh...@apache.org>
Date: Mon Feb 20 20:12:00 2012 -0800
Changed docs to be PDF instead of RTF (with newer and better wkhtmltopdf output)
commit c8539da313c7fa6eb54114eac1b2830da89417df
Author: Shazron Abdullah <sh...@apache.org>
Date: Mon Feb 20 17:53:14 2012 -0800
Moved Guides to Guides folder.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/199017bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/199017bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/199017bd
Branch: refs/heads/master
Commit: 199017bdc6fbee17d3909991d4605456813bb58e
Parents: 745f945
Author: Shazron Abdullah <sh...@apache.org>
Authored: Tue Feb 21 05:22:50 2012 -0800
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue Feb 21 05:25:20 2012 -0800
----------------------------------------------------------------------
.gitignore | 3 +
Cordova Upgrade Guide.md | 44 -----
.../TemplateInfo.plist | 24 ++-
Cordova-based Application/verify.sh | 12 ++
CordovaInstaller/cordova.png | Bin 15902 -> 41499 bytes
CordovaInstaller/docs/finishup.md | 13 +-
CordovaInstaller/docs/releasenotes.md | 2 +-
CordovaLib/Classes/CDV.h | 52 ++++++
CordovaLib/Classes/deprecated/CDVDeprecated.h | 52 ++++++
CordovaLib/Classes/deprecated/CDVDeprecated.m | 40 +++++
CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 8 +-
How to Use Cordova as a Component.md | 132 ---------------
Makefile | 56 +++++--
README.md | 16 +-
guides/Cordova Plugin Upgrade Guide.md | 7 +
guides/Cordova Upgrade Guide.md | 44 +++++
guides/How to Use Cordova as a Component.md | 132 +++++++++++++++
17 files changed, 424 insertions(+), 213 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/199017bd/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index d035722..0166c8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,6 @@ xcuserdata
/Markdown_1.0.1/
Markdown_*.zip
example
+
+wkhtmltopdf.dmg
+wkhtmltopdf/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/199017bd/Cordova Upgrade Guide.md
----------------------------------------------------------------------
diff --git a/Cordova Upgrade Guide.md b/Cordova Upgrade Guide.md
deleted file mode 100644
index 0ea5e83..0000000
--- a/Cordova Upgrade Guide.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# Cordova Upgrade Guide #
-
-This document is for developers who need to upgrade their Cordova-based projects to a newer Cordova version. Starting with Cordova 1.4.0, Cordova has been re-factored to use Cleaver (Cordova as a Component), and some classes that were used before have been removed - namely PhoneGapDelegate and PhoneGapViewController.
-
-For your existing 1.4.0 based projects that use the deprecated classes above, you will have to first use the 1.3.0 -> 1.4.0 instructions at the end of this document (since the classes mentioned above have been removed in 1.5.0), then upgrade using the 1.4.x -> 1.5.0 instructions.
-
-## Upgrading Cordova 1.4.x projects to 1.5.0 ##
-
-1. **Install** Cordova 1.5.0
-2. **Create a new project** - you will have to grab assets from this new project
-3. **Copy** these files from the **new** project into your 1.4.x based project folder on disk, **replacing** any old files
-
- Cordova.plist
-4. **Copy** the **www/cordova-1.5.0.js** file from the new project into your **www** folder, and delete your **www/phonegap-1.4.x.js** file
-5. **Update** the Cordova script reference in your **www/index.html** file (and any other files that contain the script reference) to point to the new Cordova **cordova-1.5.0.js** file
-6. **TODO: PhoneGap.plist to Cordova.plist changes, especially core plugins**
-
-## Upgrading Cordova 1.4.0 projects to 1.4.1 ##
-
-1. **Install** Cordova 1.4.1
-2. **Make a backup** of **MainViewController.m**
-3. **Create a new project** - you will have to grab assets from this new project
-4. **Copy** the **MainViewController.m** file from the **new** project into your 1.4.0 based project folder on disk, **replacing** the old file (**backup** your files first from step 2 above).
-5. **Add** the **MainViewController.m** file into your Xcode project
-6. **Integrate** any project specific code that you have in your **backed-up MainViewController.m** into the new file
-7. Updating the phonegap-X.X.X.js file is optional, nothing has changed in the JavaScript between 1.4.0 and 1.4.1
-
-## Upgrading Cordova 1.3.0 projects to 1.4.0 ##
-
-1. **Install** Cordova 1.4.0
-2. **Make a backup** of **AppDelegate.m** and **AppDelegate.h** in your project
-3. **Create a new project** - you will have to grab assets from this new project
-4. **Copy** these files from the **new** project into your 1.3.0 based project folder on disk, **replacing** any old files (**backup** your files first from step 2 above):
-
- AppDelegate.h
- AppDelegate.m
- MainViewController.h
- MainViewController.m
- MainViewController.xib
-5. **Add** all the **MainViewController** files into your Xcode project
-6. **Copy** the **www/phonegap-1.4.0.js** file from the new project into your **www** folder, and delete your **www/phonegap-1.3.0.js** file
-7. **Update** the Cordova script reference in your **www/index.html** file (and any other files that contain the script reference) to point to the new **phonegap-1.4.0.js** file
-8. **Add** a new entry under **Plugins** in your **PhoneGap.plist** file - key is **com.phonegap.battery** and the value is **PGBattery**
-9. **Integrate** any project specific code that you have in your **backed-up AppDelegate.h and AppDelegate.m** into the new AppDelegate files
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/199017bd/Cordova-based Application.xctemplate/TemplateInfo.plist
----------------------------------------------------------------------
diff --git a/Cordova-based Application.xctemplate/TemplateInfo.plist b/Cordova-based Application.xctemplate/TemplateInfo.plist
index daf61e8..bbe0d1d 100644
--- a/Cordova-based Application.xctemplate/TemplateInfo.plist
+++ b/Cordova-based Application.xctemplate/TemplateInfo.plist
@@ -255,6 +255,17 @@
<key>PathType</key>
<string>Group</string>
</dict>
+ <key>verify.sh</key>
+ <dict>
+ <key>Group</key>
+ <array>
+ <string>Supporting Files</string>
+ </array>
+ <key>Path</key>
+ <string>./verify.sh</string>
+ <key>PathType</key>
+ <string>Group</string>
+ </dict>
</dict>
<key>Description</key>
<string>This template provides a starting point for a Cordova based application. On first run, it will create the www folder. You must drag and drop in the www folder into your project (as a folder reference). Then just modify the www folder contents with your HTML, CSS and Javascript.</string>
@@ -285,6 +296,7 @@
<string>Classes/MainViewController.m</string>
<string>Classes/MainViewController.xib</string>
<string>Plugins/README</string>
+ <string>verify.sh</string>
</array>
<key>Options</key>
<array/>
@@ -335,15 +347,9 @@
<string>/bin/bash</string>
<key>ShellScript</key>
<string>
- 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 = \"<group>\"; };" "$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 </string>
+ chmod 755 $PROJECT_DIR/$PROJECT_NAME/verify.sh
+ $PROJECT_DIR/$PROJECT_NAME/verify.sh
+ </string>
</dict>
</array>
<key>Configurations</key>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/199017bd/Cordova-based Application/verify.sh
----------------------------------------------------------------------
diff --git a/Cordova-based Application/verify.sh b/Cordova-based Application/verify.sh
new file mode 100755
index 0000000..0f6f037
--- /dev/null
+++ b/Cordova-based Application/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 = \"<group>\"; };" "$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/199017bd/CordovaInstaller/cordova.png
----------------------------------------------------------------------
diff --git a/CordovaInstaller/cordova.png b/CordovaInstaller/cordova.png
index b412be4..99fdb7d 100644
Binary files a/CordovaInstaller/cordova.png and b/CordovaInstaller/cordova.png differ
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/199017bd/CordovaInstaller/docs/finishup.md
----------------------------------------------------------------------
diff --git a/CordovaInstaller/docs/finishup.md b/CordovaInstaller/docs/finishup.md
index a7cf8fb..d5a5c17 100644
--- a/CordovaInstaller/docs/finishup.md
+++ b/CordovaInstaller/docs/finishup.md
@@ -6,14 +6,13 @@
* Plugins **MUST** add any external hosts they connect to to the white-list in Cordova.plist/ExternalHosts (add hostnames **only**)
* A plugin's Objective-C code **MUST** be added to the project properly in a "group" (**YELLOW** folder), if you incorrectly added it as a folder reference it would be a blue folder (just delete the reference, and re-add)
* A lot of plugins have changed their mapping names in Cordova.plist, you might have to copy and use the new Cordova.plist in your app.
-* [Modify](http://wiki.phonegap.com/PhoneGap-iOS-Plugins-Problems) your Plugin headers as well.
<br />
## Upgraders
-1. Please see the "Cordova Upgrade Guide" included in the .dmg distribution
-2. See the FAQ in the README.rtf as well
+1. Please see the "Cordova Upgrade Guide" included in the .dmg distribution, in the "Guides" sub-folder
+2. See the FAQ in the README.pdf as well
<br />
@@ -60,9 +59,11 @@ That's it! Modify the contents of the "www" directory to add your HTML, CSS and
## Links
-* [www.phonegap.com](http://www.phonegap.com)
-* [docs.phonegap.com](http://docs.phonegap.com)
-* [github.com/apache/incubator-cordova-ios](github.com/apache/incubator-cordova-ios)
+* [http://docs.phonegap.com](http://docs.phonegap.com)
+* [http://wiki.apache.org/cordova/](http://wiki.apache.org/cordova/)
+* [http://github.com/apache/incubator-cordova-ios/](http://github.com/apache/incubator-cordova-ios/)
+* [http://groups.google.com/group/phonegap](http://groups.google.com/group/phonegap)
+* \#phonegap or \#phonegap-dev channel on [Freenode IRC](http://freenode.net/)
* [File issues and feature requests](https://issues.apache.org/jira/browse/CB)
<br />
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/199017bd/CordovaInstaller/docs/releasenotes.md
----------------------------------------------------------------------
diff --git a/CordovaInstaller/docs/releasenotes.md b/CordovaInstaller/docs/releasenotes.md
index 851a9e0..211f10d 100644
--- a/CordovaInstaller/docs/releasenotes.md
+++ b/CordovaInstaller/docs/releasenotes.md
@@ -1,6 +1,6 @@
## Release Notes for Cordova ({VERSION}) ##
-Cordova is a static library and static framework that enables users to include the Cordova API in their iPhone application projects easily, and also create new Cordova-based iPhone application projects through an Xcode project template.
+Cordova is a static library and static framework that enables developers to include the Cordova API in their iOS application projects easily, and also create new Cordova-based iOS application projects through an Xcode project template.
### 1.4.1 (20120201) ###
* Fixed CB-212 - iOS orientation switch broken in 1.4.0
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/199017bd/CordovaLib/Classes/CDV.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDV.h b/CordovaLib/Classes/CDV.h
new file mode 100644
index 0000000..7798f40
--- /dev/null
+++ b/CordovaLib/Classes/CDV.h
@@ -0,0 +1,52 @@
+/*
+ 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.
+ */
+
+#import "CDVPlugin.h"
+#import "CDVViewController.h"
+#import "CDVCommandDelegate.h"
+#import "CDVURLProtocol.h"
+#import "CDVInvokedUrlCommand.h"
+
+#import "CDVAccelerometer.h"
+#import "CDVBattery.h"
+#import "CDVCamera.h"
+#import "CDVCapture.h"
+#import "CDVConnection.h"
+#import "CDVContact.h"
+#import "CDVContacts.h"
+#import "CDVCordovaView.h"
+#import "CDVDebug.h"
+#import "CDVDebugConsole.h"
+#import "CDVFile.h"
+#import "CDVFileTransfer.h"
+#import "CDVLocation.h"
+#import "CDVMotion.h"
+#import "CDVNotification.h"
+#import "CDVPluginResult.h"
+#import "CDVReachability.h"
+#import "CDVSound.h"
+#import "CDVSplashScreen.h"
+#import "CDVWhitelist.h"
+
+#import "NSData+Base64.h"
+#import "NSDictionary+Extensions.h"
+#import "NSMutableArray+QueueAdditions.h"
+
+#import "JSONKit.h"
+
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/199017bd/CordovaLib/Classes/deprecated/CDVDeprecated.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/deprecated/CDVDeprecated.h b/CordovaLib/Classes/deprecated/CDVDeprecated.h
new file mode 100644
index 0000000..e2a683d
--- /dev/null
+++ b/CordovaLib/Classes/deprecated/CDVDeprecated.h
@@ -0,0 +1,52 @@
+/*
+ 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.
+ */
+
+//
+// CDVDeprecated.h
+// Apache Cordova
+//
+// Bridge header file for Cordova 1.5 upgrades.
+// Replace "#import PHONEGAP_FRAMEWORK" block in AppDelegate.h, AppDelegate.m,
+// MainViewController.h with this header
+//
+
+#ifdef CORDOVA_FRAMEWORK
+ #import <Cordova/CDV.h>
+#else
+ #import "CDV.h"
+#endif
+
+__attribute__ ((deprecated)) @interface PGPlugin : CDVPlugin
+@end
+
+__attribute__ ((deprecated)) @interface PGViewController : CDVViewController
+@end
+
+
+__attribute__ ((deprecated)) @interface PGURLProtocol : CDVURLProtocol
+@end
+
+__attribute__ ((deprecated)) @interface InvokedUrlCommand : CDVInvokedUrlCommand
+@end
+
+__attribute__ ((deprecated)) @protocol PGCommandDelegate <CDVCommandDelegate>
+@end
+
+
+#define PGPluginHandleOpenURLNotification CDVPluginHandleOpenURLNotification
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/199017bd/CordovaLib/Classes/deprecated/CDVDeprecated.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/deprecated/CDVDeprecated.m b/CordovaLib/Classes/deprecated/CDVDeprecated.m
new file mode 100644
index 0000000..225cf12
--- /dev/null
+++ b/CordovaLib/Classes/deprecated/CDVDeprecated.m
@@ -0,0 +1,40 @@
+/*
+ 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.
+ */
+
+// CDVDeprecated.m
+// Apache Cordova
+//
+// Bridge implementation file for Cordova 1.5 upgrades.
+//
+
+#import "CDVDeprecated.h"
+
+@implementation PGPlugin
+@end
+
+@implementation PGViewController
+@end
+
+
+@implementation PGURLProtocol
+@end
+
+@implementation InvokedUrlCommand
+@end
+
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/199017bd/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
index a05f9c0..7413827 100644
--- a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
+++ b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
@@ -33,6 +33,8 @@
1F92F4A11314023E0046367C /* CDVPluginResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F92F49F1314023E0046367C /* CDVPluginResult.m */; };
1F9DB1C8149E778E00D12DDA /* CDVBattery.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F2BECBE13F9785B00A93BF6 /* CDVBattery.h */; settings = {ATTRIBUTES = (Public, ); }; };
1F9DB1CA149E77C700D12DDA /* CDVBattery.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F2BECBF13F9785B00A93BF6 /* CDVBattery.m */; };
+ 301F2F2A14F3C9CA003FE9FC /* CDV.h in Headers */ = {isa = PBXBuildFile; fileRef = 301F2F2914F3C9CA003FE9FC /* CDV.h */; };
+ 301F2F2B14F3C9CA003FE9FC /* CDV.h in Headers */ = {isa = PBXBuildFile; fileRef = 301F2F2914F3C9CA003FE9FC /* CDV.h */; settings = {ATTRIBUTES = (Public, ); }; };
3024509C13A95AB900F9B5D2 /* CDVConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 307A8F9C1385A2EC00E43782 /* CDVConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
302965BC13A94E9D007046C5 /* CDVDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = 302965BB13A94E9D007046C5 /* CDVDebug.h */; };
302965BD13A94E9D007046C5 /* CDVDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = 302965BB13A94E9D007046C5 /* CDVDebug.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -172,6 +174,7 @@
1F584B9A1385A28900ED25E8 /* CDVCapture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDVCapture.m; path = Classes/CDVCapture.m; sourceTree = "<group>"; };
1F92F49E1314023E0046367C /* CDVPluginResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDVPluginResult.h; path = Classes/CDVPluginResult.h; sourceTree = "<group>"; };
1F92F49F1314023E0046367C /* CDVPluginResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDVPluginResult.m; path = Classes/CDVPluginResult.m; sourceTree = "<group>"; };
+ 301F2F2914F3C9CA003FE9FC /* CDV.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDV.h; path = Classes/CDV.h; sourceTree = "<group>"; };
302965BB13A94E9D007046C5 /* CDVDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDVDebug.h; path = Classes/CDVDebug.h; sourceTree = "<group>"; };
303258D8136B2C9400982B63 /* Cordova.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Cordova.framework; sourceTree = BUILT_PRODUCTS_DIR; };
30325A0B136B343700982B63 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
@@ -205,7 +208,7 @@
686357B2141002F200DF4CF2 /* CordovaLibTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "CordovaLibTests-Info.plist"; sourceTree = "<group>"; };
686357B4141002F200DF4CF2 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
686357B6141002F200DF4CF2 /* CordovaLibTests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CordovaLibTests-Prefix.pch"; sourceTree = "<group>"; };
- 686357B7141002F200DF4CF2 /* CDVPluginResultJSONSerializationTests.h */ = {isa = PBXFileReference; path = CDVPluginResultJSONSerializationTests.h; sourceTree = "<group>"; };
+ 686357B7141002F200DF4CF2 /* CDVPluginResultJSONSerializationTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CDVPluginResultJSONSerializationTests.h; sourceTree = "<group>"; };
686357B9141002F200DF4CF2 /* CDVPluginResultJSONSerializationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CDVPluginResultJSONSerializationTests.m; sourceTree = "<group>"; };
686357CC14100AAD00DF4CF2 /* AddressBookUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBookUI.framework; path = System/Library/Frameworks/AddressBookUI.framework; sourceTree = SDKROOT; };
686357CE14100ADA00DF4CF2 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
@@ -330,6 +333,7 @@
3054098714B77FF3009841CA /* Cleaver */ = {
isa = PBXGroup;
children = (
+ 301F2F2914F3C9CA003FE9FC /* CDV.h */,
8852C43614B65FD800F0E735 /* CDVViewController.h */,
8852C43714B65FD800F0E735 /* CDVViewController.m */,
8852C43814B65FD800F0E735 /* CDVCordovaView.h */,
@@ -493,6 +497,7 @@
8852C43B14B65FD800F0E735 /* CDVViewController.h in Headers */,
8852C44014B65FD800F0E735 /* CDVCordovaView.h in Headers */,
30F5EBAC14CA26E700987760 /* CDVCommandDelegate.h in Headers */,
+ 301F2F2B14F3C9CA003FE9FC /* CDV.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -529,6 +534,7 @@
8852C43A14B65FD800F0E735 /* CDVViewController.h in Headers */,
8852C43F14B65FD800F0E735 /* CDVCordovaView.h in Headers */,
30F5EBAB14CA26E700987760 /* CDVCommandDelegate.h in Headers */,
+ 301F2F2A14F3C9CA003FE9FC /* CDV.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/199017bd/How to Use Cordova as a Component.md
----------------------------------------------------------------------
diff --git a/How to Use Cordova as a Component.md b/How to Use Cordova as a Component.md
deleted file mode 100644
index 44b7f1d..0000000
--- a/How to Use Cordova as a Component.md
+++ /dev/null
@@ -1,132 +0,0 @@
-# How to use Cordova as a Component #
-Beginning with Cordova 1.4, you can use Cordova as a component in your iOS applications. This component is code-named "Cleaver".
-
-New Cordova-based applications created using the Xcode template provided in Cordova 1.4 or greater uses Cleaver, and this template is considered the reference implementation for Cleaver.
-
-It is recommended that you follow the Cordova.framework instructions below, the CordovaLib sub-project instructions are for Cordova core developers or users that have custom CordovaLib project code (for ease of debugging the core).
-
-## Pre-requisites ##
-1. **Cordova 1.4** or greater installed
-2. **Xcode 4.2** or greater installed
-3. **Cordova.plist** file
-
-## Adding Cleaver to your Xcode project (Cordova.framework) ##
-
-1. **Copy** the **"Cordova.plist"** file into your project folder on disk
-2. **Drag and drop** the **"Cordova.plist"** file into the Project Navigator of Xcode
-3. **Choose** the radio-button **"Create groups for any added folders"**
-4. Press the key combination **Option-Command-A**, which should drop down a sheet to add files to your project (the **"Add Files..." sheet**). Make sure the **"Created groups for any added folders"** radio-button is selected
-5. Press the key combination **Shift-Command-G**, which should drop down another sheet for you to go to a folder (the **"Go to the folder:" sheet**)
-6. Enter **"/Users/Shared/Cordova/Frameworks/Cordova.framework"** in the **"Go to the folder:" sheet** and then press the **"Go"** button
-7. Press the **"Add"** button in the **"Add Files..." sheet**
-8. **Select "Cordova.framework"** in the Project Navigator
-9. Press the key combination **Option-Command-1** to show the **File Inspector**
-10. Choose **"Absolute Path"** in the **File Inspector** for the drop-down menu for **Location**
-11. Click on the **project icon** in the Project Navigator, select your **Target**, then select the **"Build Phase"** tab
-12. Expand **"Link Binaries with Libraries"**
-13. Click on the **"+" button**, and add these **frameworks** (and optionally in the Project Navigator, **move** them under the Frameworks group):
-
- AddressBook.framework
- AddressBookUI.framework
- AudioToolbox.framework
- AVFoundation.framework
- CoreLocation.framework
- MediaPlayer.framework
- QuartzCore.framework
- SystemConfiguration.framework
- MobileCoreServices.framework
- CoreMedia.framework
-
-## Adding Cleaver to your Xcode project (CordovaLib sub-project) ##
-
-1. **Copy** the **"Cordova.plist"** file into your project folder on disk
-2. **Drag and drop** the **"Cordova.plist"** file into the Project Navigator of Xcode
-3. **Choose** the radio-button **"Create groups for any added folders"**
-4. Press the key combination **Option-Command-A**, which should drop down a sheet to add files to your project (the **"Add Files..." sheet**). Make sure the **"Created groups for any added folders"** radio-button is selected
-5. Press the key combination **Shift-Command-G**, which should drop down another sheet for you to go to a folder (the **"Go to the folder:" sheet**)
-6. Enter **"~/Documents/CordovaLib/CordovaLib.xcodeproj"** in the **"Go to the folder:" sheet** and then press the **"Go"** button
-7. Press the **"Add"** button in the **"Add Files..." sheet**
-8. **Select "CordovaLib.xcodeproj"** in the Project Navigator
-9. Press the key combination **Option-Command-1** to show the **File Inspector**
-10. Choose **"Relative to CORDOVALIB"** in the **File Inspector** for the drop-down menu for **Location**
-11. Click on the **project icon** in the Project Navigator, select your **Project**, then select the **"Build Settings"** tab
-12. Enter **"Header Search Paths"** in the search field
-13. Add **"$(CORDOVALIB)/Classes"** and check the **Recursive** checkbox - for the **"Header Search Paths"** value
-14. Add **"-all_load"** and **"-Obj-C"** - for the **"Other Linker Flags"** value
-15. Click on the **project icon** in the Project Navigator, select your **Target**, then select the **"Build Phases"** tab
-16. Expand **"Link Binaries with Libraries"**
-17. Click on the **"+" button**, and add these **frameworks** (and optionally in the Project Navigator, **move** them under the Frameworks group):
-
- AddressBook.framework
- AddressBookUI.framework
- AudioToolbox.framework
- AVFoundation.framework
- CoreLocation.framework
- MediaPlayer.framework
- QuartzCore.framework
- SystemConfiguration.framework
- MobileCoreServices.framework
- CoreMedia.framework
-18. Expand **"Target Dependencies"**
-19. Click on the **"+" button**, and add the **"CordovaLib"** build product
-20. Expand **"Link Binaries with Libraries"**
-21. Click on the **"+" button**, and add **libCordova.a**
-
-## Using CDVViewController in your code ##
-
-1. Add this **header** if you used the **Cordova.framework**:
-
- #import <Cordova/CDVViewController.h>
-
-2. Add this **header** if you used the **CordovaLib sub-project**:
-
- #import "CDVViewController.h"
-
-3. Instantiate a **new** CDVViewController, and retain it somewhere:
-
- CDVViewController* viewController = [CDVViewController new];
-
-4. (_OPTIONAL_) Set the **wwwFolderName** property (defaults to **"www"**):
-
- viewController.wwwFolderName = @"myfolder";
-
-5. (_OPTIONAL_) Set the **startPage** property (defaults to **"index.html"**):
-
- viewController.startPage = @"mystartpage.html";
-
-6. (_OPTIONAL_) Set the **useSplashScreen** property (defaults to **NO**):
-
- viewController.useSplashScreen = YES;
-
-5. Set the **view frame** (always set this as the last property):
-
- viewController.view.frame = CGRectMake(0, 0, 320, 480);
-
-6. **Add** Cleaver to your view:
-
- [myView addSubview:viewController.view];
-
-## Adding your HTML, CSS and JavaScript assets ##
-
-1. Create a **new folder** in your project **on disk**, for example, name it "www"
-2. Put your **HTML, CSS and JavaScript assets** into this folder
-3. **Drag and drop** the folder into the Project Navigator of Xcode
-4. **Choose** the radio-button **"Create folder references for any added folders"**
-5. **Set the appropriate "wwwFolderName" and "startPage" properties** for the folder you created in **(1)** or use the defaults (see previous section) when you instantiate the CDVViewController.
-
- /*
- if you created a folder called 'myfolder' and
- you want the file 'mypage.html' in it to be
- the startPage
- */
- viewController.wwwFolderName = @"myfolder";
- viewController.startPage = @"mypage.html"
-<br />
-
-## Cordova.plist ##
-
-This file controls various settings of Cordova. This is application wide, and not set per CDVViewController instance.
-
-1. A list of **Plugins** allowed to be used in a CDVViewController (set in the Plugins dictionary - key is the servicename used in JavaScript, and the value is the Objective-C class for the plugin that is a PGPlugin sub-class)
-2. A **white-list** of hosts (with no scheme) that Cordova is allowed to connect to (set in the ExternalHosts array - wildcards allowed)
-3. Various **other** settings (TODO:)
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/199017bd/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index eae56bb..9aa3e34 100644
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,7 @@ COMMIT_HASH=$(shell git describe --tags)
PKG_ERROR_LOG=pkg_error_log
BUILD_BAK=_build.bak
CERTIFICATE = 'Cordova Support'
+WKHTMLTOPDF = wkhtmltopdf/wkhtmltopdf --encoding utf-8 --page-size Letter --footer-font-name "Helvetica" --footer-font-size 10 --footer-spacing 10 --footer-right "[page]/[topage]" -B 1in -L 0.5in -R 0.5in -T 0.5in
all :: installer
@@ -78,6 +79,7 @@ xcode4-template: clean-xcode4-template
@$(CP) Cordova-based\ Application/___PROJECTNAMEASIDENTIFIER___-Prefix.pch Cordova-based\ Application.xctemplate/___PACKAGENAME___-Prefix.pch
@$(CP) Cordova-based\ Application/main.m Cordova-based\ Application.xctemplate
@$(CP) Cordova-based\ Application/Cordova.plist Cordova-based\ Application.xctemplate
+ @$(CP) Cordova-based\ Application/verify.sh Cordova-based\ Application.xctemplate
@sed -i "" 's/com\.yourcompany\.___PROJECTNAMEASIDENTIFIER___/___VARIABLE_bundleIdentifierPrefix:bundleIdentifier___\.___PROJECTNAMEASIDENTIFIER___/g' Cordova-based\ Application.xctemplate/___PACKAGENAME___-Info.plist
clean-xcode4-template: clean-xcode3-template
@@ -151,7 +153,7 @@ clean: clean-installer clean-cordova-lib clean-xcode3-template clean-xcode4-temp
checkos:
@if [ "$$OSTYPE" != "darwin11" ]; then echo "Error: You need to package the installer on a Mac OS X 10.7 Lion system."; exit 1; fi
-installer: clean markdown cordova-lib xcode3-template xcode4-template cordova-framework
+installer: clean markdown wkhtmltopdf cordova-lib xcode3-template xcode4-template cordova-framework
@# remove the dist folder
@if [ -d "dist" ]; then \
$(CP) -Rf dist ~/.Trash; \
@@ -170,20 +172,23 @@ installer: clean markdown cordova-lib xcode3-template xcode4-template cordova-fr
@echo '<html><body style="font-family: Helvetica Neue;">' > CordovaInstaller/docs/finishup.html
@perl Markdown_1.0.1/Markdown.pl CordovaInstaller/docs/finishup.md >> CordovaInstaller/docs/finishup.html
@echo '</body></html>' >> CordovaInstaller/docs/finishup.html
- @# convert all the html files to rtf
+ @# convert all the html files to rtf (for PackageMaker)
@textutil -convert rtf -font 'Helvetica' CordovaInstaller/docs/*.html
@# build the .pkg file
@echo "Building Cordova-${CDV_VER}.pkg..."
- @$(MKPATH) dist/files
+ @$(MKPATH) dist/files/Guides
@$(PACKAGEMAKER) -d CordovaInstaller/CordovaInstaller.pmdoc -o dist/files/Cordova-${CDV_VER}.pkg > /dev/null 2> $(PKG_ERROR_LOG)
@# create the applescript uninstaller
@osacompile -o ./dist/files/Uninstall\ Cordova.app Uninstall\ Cordova.applescript > /dev/null 2>> $(PKG_ERROR_LOG)
- @# convert the html docs to rtf, concatenate
- @textutil -convert rtf CordovaInstaller/docs/releasenotes.html -output dist/files/ReleaseNotes.rtf
- @textutil -convert rtf -font 'Courier New' LICENSE -output CordovaInstaller/docs/LICENSE.rtf
- @$(CONVERTPDF) -f CordovaInstaller/docs/cleaver.html -o 'dist/files/How to Use Cordova as a Component.pdf'
- @$(CONVERTPDF) -f CordovaInstaller/docs/upgrade.html -o 'dist/files/Cordova Upgrade Guide.pdf'
- @textutil -cat rtf CordovaInstaller/docs/finishup.rtf CordovaInstaller/docs/readme.rtf CordovaInstaller/docs/LICENSE.rtf -output dist/files/Readme.rtf
+ @# convert the html docs to pdf, concatenate readme and license
+ @$(WKHTMLTOPDF) --footer-center "Cordova ${CDV_VER} Release Notes" CordovaInstaller/docs/releasenotes.html dist/files/ReleaseNotes.pdf > /dev/null 2>> $(PKG_ERROR_LOG)
+ @$(WKHTMLTOPDF) --footer-center "How to use Cordova ${CDV_VER} as a Component" CordovaInstaller/docs/cleaver.html 'dist/files/Guides/How to Use Cordova as a Component.pdf' > /dev/null 2>> $(PKG_ERROR_LOG)
+ @$(WKHTMLTOPDF) --footer-center "Cordova ${CDV_VER} Upgrade Guide" CordovaInstaller/docs/upgrade.html 'dist/files/Guides/Cordova Upgrade Guide.pdf' > /dev/null 2>> $(PKG_ERROR_LOG)
+ @$(WKHTMLTOPDF) --footer-center "Cordova ${CDV_VER} Plugin Upgrade Guide" CordovaInstaller/docs/plugin_upgrade.html 'dist/files/Guides/Cordova Plugin Upgrade Guide.pdf' > /dev/null 2>> $(PKG_ERROR_LOG)
+ @textutil -convert html -font 'Courier New' LICENSE -output CordovaInstaller/docs/LICENSE.html > /dev/null 2>> $(PKG_ERROR_LOG)
+ @textutil -cat html CordovaInstaller/docs/finishup.html CordovaInstaller/docs/readme.html CordovaInstaller/docs/LICENSE.html -output dist/files/Readme.html > /dev/null 2>> $(PKG_ERROR_LOG)
+ @$(WKHTMLTOPDF) --footer-center "Cordova ${CDV_VER} Readme" dist/files/Readme.html dist/files/Readme.pdf > /dev/null 2>> $(PKG_ERROR_LOG)
+ @$(RM_F) dist/files/Readme.html
@# restore backed-up markdown files
@$(MV) -f CordovaInstaller/docs/releasenotes.md.bak CordovaInstaller/docs/releasenotes.md
@$(MV) -f CordovaInstaller/docs/finishup.md.bak CordovaInstaller/docs/finishup.md
@@ -193,8 +198,19 @@ installer: clean markdown cordova-lib xcode3-template xcode4-template cordova-fr
$(PACKAGEMAKER) --certificate $(CERTIFICATE) --sign dist/files/Cordova-${CDV_VER}.pkg; \
fi
@# create the .dmg
- @hdiutil create ./dist/Cordova-${CDV_VER}.dmg -srcfolder ./dist/files/ -ov -volname Cordova-${CDV_VER}
- @cd dist;openssl sha1 Cordova-${CDV_VER}.dmg > Cordova-${CDV_VER}.dmg.SHA1;cd -;
+ @hdiutil create ./dist/Cordova-${CDV_VER}_temp.dmg -srcfolder ./dist/files/ -ov -volname Cordova-${CDV_VER} -format UDRW > /dev/null 2>> $(PKG_ERROR_LOG)
+ @# set the volume icon
+ @hdiutil attach -readwrite -noverify -noautoopen ./dist/Cordova-${CDV_VER}_temp.dmg > /dev/null 2>> $(PKG_ERROR_LOG)
+ @cp "Cordova-based Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns" /Volumes/Cordova-${CDV_VER}/.VolumeIcon.icns
+ @SetFile -c icnC /Volumes/Cordova-${CDV_VER}/.VolumeIcon.icns > /dev/null 2>> $(PKG_ERROR_LOG)
+ @SetFile -a C /Volumes/Cordova-${CDV_VER}/ > /dev/null 2>> $(PKG_ERROR_LOG)
+ @hdiutil detach /Volumes/Cordova-${CDV_VER}/ > /dev/null 2>> $(PKG_ERROR_LOG)
+ @# compress dmg
+ @hdiutil convert ./dist/Cordova-${CDV_VER}_temp.dmg -format UDZO -imagekey zlib-level=9 -o ./dist/Cordova-${CDV_VER}.dmg > /dev/null 2>> $(PKG_ERROR_LOG)
+ @$(RM_F) ./dist/Cordova-${CDV_VER}_temp.dmg
+ @# generate sha1
+ @openssl sha1 dist/Cordova-${CDV_VER}.dmg > dist/Cordova-${CDV_VER}.dmg.SHA1;
+ @# done
@echo "Done."
@make clean
@@ -217,6 +233,16 @@ uninstall:
echo "" ; \
fi
+wkhtmltopdf:
+ @# download wkhtmltopdf if necessary
+ @if [[ ! -d "wkhtmltopdf" ]]; then \
+ echo "Downloading wkhtmltopdf..."; \
+ curl -L http://wkhtmltopdf.googlecode.com/files/wkhtmltopdf-0.9.9-OS-X.i368 > wkhtmltopdf_temp; \
+ $(MKPATH) wkhtmltopdf; \
+ mv wkhtmltopdf_temp wkhtmltopdf/wkhtmltopdf; \
+ chmod 755 wkhtmltopdf/wkhtmltopdf; \
+ fi
+
markdown:
@# download markdown if necessary
@if [[ ! -d "Markdown_1.0.1" ]]; then \
@@ -230,9 +256,13 @@ markdown:
@echo '</body></html>' >> CordovaInstaller/docs/readme.html
@# generate 'How to Use Cordova as a Component' html from markdown
@echo '<html><body style="font-family: Helvetica Neue; font-size:10pt;">' > CordovaInstaller/docs/cleaver.html
- @perl Markdown_1.0.1/Markdown.pl 'How to Use Cordova as a Component.md' >> CordovaInstaller/docs/cleaver.html
+ @perl Markdown_1.0.1/Markdown.pl 'guides/How to Use Cordova as a Component.md' >> CordovaInstaller/docs/cleaver.html
@echo '</body></html>' >> CordovaInstaller/docs/cleaver.html
@# generate 'Cordova Upgrade Guide' html from markdown
@echo '<html><body style="font-family: Helvetica Neue;font-size:10pt;">' > CordovaInstaller/docs/upgrade.html
- @perl Markdown_1.0.1/Markdown.pl 'Cordova Upgrade Guide.md' >> CordovaInstaller/docs/upgrade.html
+ @perl Markdown_1.0.1/Markdown.pl 'guides/Cordova Upgrade Guide.md' >> CordovaInstaller/docs/upgrade.html
@echo '</body></html>' >> CordovaInstaller/docs/upgrade.html
+ @# generate 'Cordova Plugin Upgrade Guide' html from markdown
+ @echo '<html><body style="font-family: Helvetica Neue;font-size:10pt;">' > CordovaInstaller/docs/plugin_upgrade.html
+ @perl Markdown_1.0.1/Markdown.pl 'guides/Cordova Plugin Upgrade Guide.md' >> CordovaInstaller/docs/plugin_upgrade.html
+ @echo '</body></html>' >> CordovaInstaller/docs/plugin_upgrade.html
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/199017bd/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index f99c4ad..1a70a67 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Make sure you have installed the latest iOS SDK. Download it at [http://develope
Build and install the Installer Package
-------------------------------------------------------------
-You don't need to do this if you downloaded the installer from [phonegap.com](http://phonegap.com), this is only for developers that need to compile the source.
+You don't need to do this if you downloaded the installer from [http://incubator.apache.org/callback/](http://incubator.apache.org/callback/), this is only for developers that need to compile the source.
1. Launch "Terminal.app"
2. Navigate to the folder where the Makefile is
@@ -98,7 +98,7 @@ This is a known issue with the Xcode 4 Template - we can't specify a folder refe
**2. When I run the Installer, the installation fails?**
-Usually it's a folder permissions issue with the templates folder, changed by other third-party installers. You can trouble-shoot using the [instructions here](http://wiki.phonegap.com/PhoneGap-Installer-Fails).
+Usually it's a folder permissions issue with the templates folder, changed by other third-party installers. You can trouble-shoot using the [instructions here](https://issues.apache.org/jira/browse/CB-270).
**3. When I add Plugins, they are not found or won't compile?**
@@ -108,7 +108,7 @@ This can be because of:
1. You did not add the plugin mapping in __Cordova.plist/Plugins__ (contact the plugin creator for the proper mapping). The __key__ is the service name used in the JavaScript interface and the __value__ is the classname used in the Objective-C interface. Often the key and value are the same.
2. You did _not_ add the plugin code as a "group" (__yellow__ folder) but added it as a "folder reference" (blue folder)
-3. You are having #import problems - see [this article](http://wiki.phonegap.com/PhoneGap%20iOS%20Plugins%20Problems).
+3. You are having #import problems - see the "Cordova Upgrade Guide" document included in the distribution's "Guides" folder.
<br />
@@ -173,7 +173,7 @@ A. Remove the existing Cordova.framework from your project, and drag and drop yo
**11. I've got other Cordova-specific issues not covered here?**
-A. Older pre-1.0 issues have been put in the [Cordova iOS FAQ](http://wiki.phonegap.com/w/page/41631150/PhoneGap-for-iOS-FAQ) on the [Wiki](http://wiki.phonegap.com).
+A. Do a search in the Apache JIRA Issue Tracker [Apache JIRA](https://issues.apache.org/jira/browse/CB) or the [Wiki](http://wiki.apache.org/cordova/FrontPage).
**12. On an iOS 3.2 iPad, and launching an iPhone only app, when I use the Media Capture API, the user interface shown is iPad sized, not iPhone sized?**
@@ -185,14 +185,16 @@ A. In your project's Build Settings, set **"Build for Active Architecture Only"*
BUGS?
-----
-File them at the [Cordova-iOS Issue Tracker](https://issues.apache.org/jira/browse/CB)
+File them at the [Cordova Issue Tracker](https://issues.apache.org/jira/browse/CB)
<br />
MORE INFO
----------
* [http://docs.phonegap.com](http://docs.phonegap.com)
-* [http://wiki.phonegap.com](http://wiki.phonegap.com)
+* [http://wiki.apache.org/cordova/](http://wiki.apache.org/cordova/)
+* [http://github.com/apache/incubator-cordova-ios/](http://github.com/apache/incubator-cordova-ios/)
* [http://groups.google.com/group/phonegap](http://groups.google.com/group/phonegap)
-* \#phonegap channel on [Freenode IRC](http://freenode.net/)
+* \#phonegap or \#phonegap-dev channel on [Freenode IRC](http://freenode.net/)
+* [File issues and feature requests](https://issues.apache.org/jira/browse/CB)
<br />
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/199017bd/guides/Cordova Plugin Upgrade Guide.md
----------------------------------------------------------------------
diff --git a/guides/Cordova Plugin Upgrade Guide.md b/guides/Cordova Plugin Upgrade Guide.md
new file mode 100644
index 0000000..61e749c
--- /dev/null
+++ b/guides/Cordova Plugin Upgrade Guide.md
@@ -0,0 +1,7 @@
+# Cordova Plugin Upgrade Guide #
+
+This document is for developers who need to upgrade their Cordova plugins to a newer Cordova version. Starting with Cordova 1.5.0, some classes have been renamed, which will require the plugin to be upgraded.
+
+## Upgrading Cordova 1.3.x plugins to 1.5.0 ##
+
+1. TODO:
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/199017bd/guides/Cordova Upgrade Guide.md
----------------------------------------------------------------------
diff --git a/guides/Cordova Upgrade Guide.md b/guides/Cordova Upgrade Guide.md
new file mode 100644
index 0000000..0ea5e83
--- /dev/null
+++ b/guides/Cordova Upgrade Guide.md
@@ -0,0 +1,44 @@
+# Cordova Upgrade Guide #
+
+This document is for developers who need to upgrade their Cordova-based projects to a newer Cordova version. Starting with Cordova 1.4.0, Cordova has been re-factored to use Cleaver (Cordova as a Component), and some classes that were used before have been removed - namely PhoneGapDelegate and PhoneGapViewController.
+
+For your existing 1.4.0 based projects that use the deprecated classes above, you will have to first use the 1.3.0 -> 1.4.0 instructions at the end of this document (since the classes mentioned above have been removed in 1.5.0), then upgrade using the 1.4.x -> 1.5.0 instructions.
+
+## Upgrading Cordova 1.4.x projects to 1.5.0 ##
+
+1. **Install** Cordova 1.5.0
+2. **Create a new project** - you will have to grab assets from this new project
+3. **Copy** these files from the **new** project into your 1.4.x based project folder on disk, **replacing** any old files
+
+ Cordova.plist
+4. **Copy** the **www/cordova-1.5.0.js** file from the new project into your **www** folder, and delete your **www/phonegap-1.4.x.js** file
+5. **Update** the Cordova script reference in your **www/index.html** file (and any other files that contain the script reference) to point to the new Cordova **cordova-1.5.0.js** file
+6. **TODO: PhoneGap.plist to Cordova.plist changes, especially core plugins**
+
+## Upgrading Cordova 1.4.0 projects to 1.4.1 ##
+
+1. **Install** Cordova 1.4.1
+2. **Make a backup** of **MainViewController.m**
+3. **Create a new project** - you will have to grab assets from this new project
+4. **Copy** the **MainViewController.m** file from the **new** project into your 1.4.0 based project folder on disk, **replacing** the old file (**backup** your files first from step 2 above).
+5. **Add** the **MainViewController.m** file into your Xcode project
+6. **Integrate** any project specific code that you have in your **backed-up MainViewController.m** into the new file
+7. Updating the phonegap-X.X.X.js file is optional, nothing has changed in the JavaScript between 1.4.0 and 1.4.1
+
+## Upgrading Cordova 1.3.0 projects to 1.4.0 ##
+
+1. **Install** Cordova 1.4.0
+2. **Make a backup** of **AppDelegate.m** and **AppDelegate.h** in your project
+3. **Create a new project** - you will have to grab assets from this new project
+4. **Copy** these files from the **new** project into your 1.3.0 based project folder on disk, **replacing** any old files (**backup** your files first from step 2 above):
+
+ AppDelegate.h
+ AppDelegate.m
+ MainViewController.h
+ MainViewController.m
+ MainViewController.xib
+5. **Add** all the **MainViewController** files into your Xcode project
+6. **Copy** the **www/phonegap-1.4.0.js** file from the new project into your **www** folder, and delete your **www/phonegap-1.3.0.js** file
+7. **Update** the Cordova script reference in your **www/index.html** file (and any other files that contain the script reference) to point to the new **phonegap-1.4.0.js** file
+8. **Add** a new entry under **Plugins** in your **PhoneGap.plist** file - key is **com.phonegap.battery** and the value is **PGBattery**
+9. **Integrate** any project specific code that you have in your **backed-up AppDelegate.h and AppDelegate.m** into the new AppDelegate files
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/199017bd/guides/How to Use Cordova as a Component.md
----------------------------------------------------------------------
diff --git a/guides/How to Use Cordova as a Component.md b/guides/How to Use Cordova as a Component.md
new file mode 100644
index 0000000..44b7f1d
--- /dev/null
+++ b/guides/How to Use Cordova as a Component.md
@@ -0,0 +1,132 @@
+# How to use Cordova as a Component #
+Beginning with Cordova 1.4, you can use Cordova as a component in your iOS applications. This component is code-named "Cleaver".
+
+New Cordova-based applications created using the Xcode template provided in Cordova 1.4 or greater uses Cleaver, and this template is considered the reference implementation for Cleaver.
+
+It is recommended that you follow the Cordova.framework instructions below, the CordovaLib sub-project instructions are for Cordova core developers or users that have custom CordovaLib project code (for ease of debugging the core).
+
+## Pre-requisites ##
+1. **Cordova 1.4** or greater installed
+2. **Xcode 4.2** or greater installed
+3. **Cordova.plist** file
+
+## Adding Cleaver to your Xcode project (Cordova.framework) ##
+
+1. **Copy** the **"Cordova.plist"** file into your project folder on disk
+2. **Drag and drop** the **"Cordova.plist"** file into the Project Navigator of Xcode
+3. **Choose** the radio-button **"Create groups for any added folders"**
+4. Press the key combination **Option-Command-A**, which should drop down a sheet to add files to your project (the **"Add Files..." sheet**). Make sure the **"Created groups for any added folders"** radio-button is selected
+5. Press the key combination **Shift-Command-G**, which should drop down another sheet for you to go to a folder (the **"Go to the folder:" sheet**)
+6. Enter **"/Users/Shared/Cordova/Frameworks/Cordova.framework"** in the **"Go to the folder:" sheet** and then press the **"Go"** button
+7. Press the **"Add"** button in the **"Add Files..." sheet**
+8. **Select "Cordova.framework"** in the Project Navigator
+9. Press the key combination **Option-Command-1** to show the **File Inspector**
+10. Choose **"Absolute Path"** in the **File Inspector** for the drop-down menu for **Location**
+11. Click on the **project icon** in the Project Navigator, select your **Target**, then select the **"Build Phase"** tab
+12. Expand **"Link Binaries with Libraries"**
+13. Click on the **"+" button**, and add these **frameworks** (and optionally in the Project Navigator, **move** them under the Frameworks group):
+
+ AddressBook.framework
+ AddressBookUI.framework
+ AudioToolbox.framework
+ AVFoundation.framework
+ CoreLocation.framework
+ MediaPlayer.framework
+ QuartzCore.framework
+ SystemConfiguration.framework
+ MobileCoreServices.framework
+ CoreMedia.framework
+
+## Adding Cleaver to your Xcode project (CordovaLib sub-project) ##
+
+1. **Copy** the **"Cordova.plist"** file into your project folder on disk
+2. **Drag and drop** the **"Cordova.plist"** file into the Project Navigator of Xcode
+3. **Choose** the radio-button **"Create groups for any added folders"**
+4. Press the key combination **Option-Command-A**, which should drop down a sheet to add files to your project (the **"Add Files..." sheet**). Make sure the **"Created groups for any added folders"** radio-button is selected
+5. Press the key combination **Shift-Command-G**, which should drop down another sheet for you to go to a folder (the **"Go to the folder:" sheet**)
+6. Enter **"~/Documents/CordovaLib/CordovaLib.xcodeproj"** in the **"Go to the folder:" sheet** and then press the **"Go"** button
+7. Press the **"Add"** button in the **"Add Files..." sheet**
+8. **Select "CordovaLib.xcodeproj"** in the Project Navigator
+9. Press the key combination **Option-Command-1** to show the **File Inspector**
+10. Choose **"Relative to CORDOVALIB"** in the **File Inspector** for the drop-down menu for **Location**
+11. Click on the **project icon** in the Project Navigator, select your **Project**, then select the **"Build Settings"** tab
+12. Enter **"Header Search Paths"** in the search field
+13. Add **"$(CORDOVALIB)/Classes"** and check the **Recursive** checkbox - for the **"Header Search Paths"** value
+14. Add **"-all_load"** and **"-Obj-C"** - for the **"Other Linker Flags"** value
+15. Click on the **project icon** in the Project Navigator, select your **Target**, then select the **"Build Phases"** tab
+16. Expand **"Link Binaries with Libraries"**
+17. Click on the **"+" button**, and add these **frameworks** (and optionally in the Project Navigator, **move** them under the Frameworks group):
+
+ AddressBook.framework
+ AddressBookUI.framework
+ AudioToolbox.framework
+ AVFoundation.framework
+ CoreLocation.framework
+ MediaPlayer.framework
+ QuartzCore.framework
+ SystemConfiguration.framework
+ MobileCoreServices.framework
+ CoreMedia.framework
+18. Expand **"Target Dependencies"**
+19. Click on the **"+" button**, and add the **"CordovaLib"** build product
+20. Expand **"Link Binaries with Libraries"**
+21. Click on the **"+" button**, and add **libCordova.a**
+
+## Using CDVViewController in your code ##
+
+1. Add this **header** if you used the **Cordova.framework**:
+
+ #import <Cordova/CDVViewController.h>
+
+2. Add this **header** if you used the **CordovaLib sub-project**:
+
+ #import "CDVViewController.h"
+
+3. Instantiate a **new** CDVViewController, and retain it somewhere:
+
+ CDVViewController* viewController = [CDVViewController new];
+
+4. (_OPTIONAL_) Set the **wwwFolderName** property (defaults to **"www"**):
+
+ viewController.wwwFolderName = @"myfolder";
+
+5. (_OPTIONAL_) Set the **startPage** property (defaults to **"index.html"**):
+
+ viewController.startPage = @"mystartpage.html";
+
+6. (_OPTIONAL_) Set the **useSplashScreen** property (defaults to **NO**):
+
+ viewController.useSplashScreen = YES;
+
+5. Set the **view frame** (always set this as the last property):
+
+ viewController.view.frame = CGRectMake(0, 0, 320, 480);
+
+6. **Add** Cleaver to your view:
+
+ [myView addSubview:viewController.view];
+
+## Adding your HTML, CSS and JavaScript assets ##
+
+1. Create a **new folder** in your project **on disk**, for example, name it "www"
+2. Put your **HTML, CSS and JavaScript assets** into this folder
+3. **Drag and drop** the folder into the Project Navigator of Xcode
+4. **Choose** the radio-button **"Create folder references for any added folders"**
+5. **Set the appropriate "wwwFolderName" and "startPage" properties** for the folder you created in **(1)** or use the defaults (see previous section) when you instantiate the CDVViewController.
+
+ /*
+ if you created a folder called 'myfolder' and
+ you want the file 'mypage.html' in it to be
+ the startPage
+ */
+ viewController.wwwFolderName = @"myfolder";
+ viewController.startPage = @"mypage.html"
+<br />
+
+## Cordova.plist ##
+
+This file controls various settings of Cordova. This is application wide, and not set per CDVViewController instance.
+
+1. A list of **Plugins** allowed to be used in a CDVViewController (set in the Plugins dictionary - key is the servicename used in JavaScript, and the value is the Objective-C class for the plugin that is a PGPlugin sub-class)
+2. A **white-list** of hosts (with no scheme) that Cordova is allowed to connect to (set in the ExternalHosts array - wildcards allowed)
+3. Various **other** settings (TODO:)