Updated Branches: refs/heads/master 1bc7c44d2 -> 34528d79e
[CB-1676] Write Upgrade Guide for 2.1.0 to 2.2.0 Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/commit/34528d79 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/tree/34528d79 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/diff/34528d79 Branch: refs/heads/master Commit: 34528d79e02d062b024f3849c04402aa48b999c2 Parents: 1bc7c44 Author: Shazron Abdullah <shaz...@apache.org> Authored: Mon Oct 22 00:16:18 2012 -0700 Committer: Shazron Abdullah <shaz...@apache.org> Committed: Mon Oct 22 00:16:18 2012 -0700 ---------------------------------------------------------------------- docs/en/2.2.0rc1/guide/upgrading/ios/index.md | 20 ++++++++++++++++++++ docs/en/edge/guide/upgrading/ios/index.md | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/34528d79/docs/en/2.2.0rc1/guide/upgrading/ios/index.md ---------------------------------------------------------------------- diff --git a/docs/en/2.2.0rc1/guide/upgrading/ios/index.md b/docs/en/2.2.0rc1/guide/upgrading/ios/index.md index 53616ce..998b89f 100644 --- a/docs/en/2.2.0rc1/guide/upgrading/ios/index.md +++ b/docs/en/2.2.0rc1/guide/upgrading/ios/index.md @@ -22,6 +22,26 @@ Upgrading Cordova iOS Please note that **Xcode 4 is required**. To submit to the Apple App Store, you must use the latest shipped version of the iOS SDK, which is iOS 5.1. The iOS 5.1 SDK requires Xcode 4. +## Upgrading Cordova 2.1.0 projects to 2.2.0 ## + +1. **Download and extract the Cordova 2.2.0 source** to a **permanent folder location** on your hard drive (say to ~/Documents/Cordova-2.2.0) +2. **Quit Xcode** if it is running. +3. **Navigate** to the directory where you put the downloaded source above, using **Terminal.app**. +4. [**Create a new project**](guide_command-line_index.md.html#Command-Line%20Usage_ios) from the command-line tools - you will have to grab the assets from this new project +5. **Copy** the **www/cordova-2.2.0.js** file from the new project into your **www** folder, and delete your **www/cordova-2.1.0.js** file +6. **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-2.2.0.js** file +7. Update (or replace, if you never changed the file) your **MainViewController.m** according to the one from the new project: + - Updated -> viewWillAppear +8. Copy the **"cordova"** folder from the new project into your project's root folder **(in 2.2.0, this has an updated 'emulate' script)** +9. Next, update your CordovaLib sub-project reference. Beginning with Cordova 2.1.0, we are not using the CORDOVALIB Xcode variable anymore when referencing where CordovaLib resides, the reference is an absolute file reference now. + 1. Launch **Terminal.app** + 2. Go to the location where you installed Cordova **(see Step 1)**, in the **bin** sub-folder + 3. Run the script below where the first parameter is the path to your project's **.xcodeproj** file: + + `update_cordova_subproject path/to/your/project/xcodeproj` + +**Note** that in 2.2.0, the **bin/create** script will copy in the CordovaLib sub-project into your project now. To have the same kind of setup, just copy in the right CordovaLib into your project folder, and update the CordovaLib sub-project location (relative to the project) in the Xcode File Inspector. + ## Upgrading Cordova 2.0.0 projects to 2.1.0 ## With **Cordova 2.1.0**, CordovaLib has been upgraded to use **Automatic Reference Counting (ARC)**. You don't need to upgrade to **ARC** to use CordovaLib, but if you want to upgrade your project to use **ARC**, please use the Xcode migration wizard from the menu: **Edit -> Refactor -> Convert to Objective-C ARCâ¦**, **de-select libCordova.a**, then run the wizard to completion. http://git-wip-us.apache.org/repos/asf/incubator-cordova-docs/blob/34528d79/docs/en/edge/guide/upgrading/ios/index.md ---------------------------------------------------------------------- diff --git a/docs/en/edge/guide/upgrading/ios/index.md b/docs/en/edge/guide/upgrading/ios/index.md index 53616ce..998b89f 100644 --- a/docs/en/edge/guide/upgrading/ios/index.md +++ b/docs/en/edge/guide/upgrading/ios/index.md @@ -22,6 +22,26 @@ Upgrading Cordova iOS Please note that **Xcode 4 is required**. To submit to the Apple App Store, you must use the latest shipped version of the iOS SDK, which is iOS 5.1. The iOS 5.1 SDK requires Xcode 4. +## Upgrading Cordova 2.1.0 projects to 2.2.0 ## + +1. **Download and extract the Cordova 2.2.0 source** to a **permanent folder location** on your hard drive (say to ~/Documents/Cordova-2.2.0) +2. **Quit Xcode** if it is running. +3. **Navigate** to the directory where you put the downloaded source above, using **Terminal.app**. +4. [**Create a new project**](guide_command-line_index.md.html#Command-Line%20Usage_ios) from the command-line tools - you will have to grab the assets from this new project +5. **Copy** the **www/cordova-2.2.0.js** file from the new project into your **www** folder, and delete your **www/cordova-2.1.0.js** file +6. **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-2.2.0.js** file +7. Update (or replace, if you never changed the file) your **MainViewController.m** according to the one from the new project: + - Updated -> viewWillAppear +8. Copy the **"cordova"** folder from the new project into your project's root folder **(in 2.2.0, this has an updated 'emulate' script)** +9. Next, update your CordovaLib sub-project reference. Beginning with Cordova 2.1.0, we are not using the CORDOVALIB Xcode variable anymore when referencing where CordovaLib resides, the reference is an absolute file reference now. + 1. Launch **Terminal.app** + 2. Go to the location where you installed Cordova **(see Step 1)**, in the **bin** sub-folder + 3. Run the script below where the first parameter is the path to your project's **.xcodeproj** file: + + `update_cordova_subproject path/to/your/project/xcodeproj` + +**Note** that in 2.2.0, the **bin/create** script will copy in the CordovaLib sub-project into your project now. To have the same kind of setup, just copy in the right CordovaLib into your project folder, and update the CordovaLib sub-project location (relative to the project) in the Xcode File Inspector. + ## Upgrading Cordova 2.0.0 projects to 2.1.0 ## With **Cordova 2.1.0**, CordovaLib has been upgraded to use **Automatic Reference Counting (ARC)**. You don't need to upgrade to **ARC** to use CordovaLib, but if you want to upgrade your project to use **ARC**, please use the Xcode migration wizard from the menu: **Edit -> Refactor -> Convert to Objective-C ARCâ¦**, **de-select libCordova.a**, then run the wizard to completion.
