You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by mw...@apache.org on 2013/07/16 23:25:11 UTC
docs commit: [CB-3816] more info about upgrading to append;
add links to Upgrading Guides to discus CLI flow
Updated Branches:
refs/heads/master d907f4912 -> bcc163098
[CB-3816] more info about upgrading to append; add links to Upgrading Guides to discus CLI flow
Conflicts:
docs/en/edge/guide/platforms/wp8/upgrading.md
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/bcc16309
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/bcc16309
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/bcc16309
Branch: refs/heads/master
Commit: bcc16309824b864eedc4b1e64eb616510759d4a0
Parents: d907f49
Author: Mike Sierra <le...@gmail.com>
Authored: Tue Jul 16 15:44:47 2013 -0400
Committer: Michael Brooks <mi...@michaelbrooks.ca>
Committed: Tue Jul 16 14:24:47 2013 -0700
----------------------------------------------------------------------
docs/en/edge/guide/cli/index.md | 33 ++++++++++--------
.../edge/guide/platforms/android/upgrading.md | 6 +++-
.../guide/platforms/blackberry/upgrading.md | 7 +++-
docs/en/edge/guide/platforms/ios/upgrading.md | 6 ++++
docs/en/edge/guide/platforms/win8/upgrading.md | 6 +++-
docs/en/edge/guide/platforms/wp8/upgrading.md | 36 ++++++++++++++------
6 files changed, 66 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/bcc16309/docs/en/edge/guide/cli/index.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/cli/index.md b/docs/en/edge/guide/cli/index.md
index f847e84..4b226e0 100644
--- a/docs/en/edge/guide/cli/index.md
+++ b/docs/en/edge/guide/cli/index.md
@@ -72,21 +72,7 @@ To install the `cordova` command-line tool, follow these steps:
$ sudo chown -R LOGIN /usr/local/lib/node_modules/cordova
-After installing the `cordova` utility, you can always update it to
-the latest version by running the following command:
-
- $ sudo npm update -g cordova
-
-Use this syntax to install a specific version:
-
- $ sudo npm install -g cordova@2.8.0
-
-Run the `info` command for a listing that includes the current version
-along with other available version numbers:
-
- $ npm info cordova
-
-## Create an App
+## Create the App
Go to the directory where you maintain your source code, and run a
command such as the following:
@@ -226,3 +212,20 @@ plugin(s) [add|remove|ls [path]] ..... adds or removes a
currently added plugins
-->
+
+## Update the App
+
+After installing installing the `cordova` utility, you can always
+update it to the latest version by running the following command:
+
+ $ sudo npm update -g cordova
+
+Use this syntax to install a specific version:
+
+ $ sudo npm install -g cordova@2.8.0
+
+Run the `info` command for a listing that includes the current version
+along with other available version numbers:
+
+ $ npm info cordova
+
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/bcc16309/docs/en/edge/guide/platforms/android/upgrading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/android/upgrading.md b/docs/en/edge/guide/platforms/android/upgrading.md
index c05e35c..1cd8367 100644
--- a/docs/en/edge/guide/platforms/android/upgrading.md
+++ b/docs/en/edge/guide/platforms/android/upgrading.md
@@ -20,7 +20,11 @@ license: Licensed to the Apache Software Foundation (ASF) under one
Upgrading Android
=========================
-This document is for people who need to upgrade their Cordova versions from an older version to a current version of Cordova.
+This guide shows how to modify Android projects to upgrade from older versions of Cordova.
+Most of these instructions apply to projects created with an older set
+of command-line tools that precede the `cordova` CLI utility. See The
+Cordova Command-line Interface for information how to update the
+version of the CLI.
## Upgrade to 2.9.0 from 2.8.0
1. Run `bin/update <project_path>`
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/bcc16309/docs/en/edge/guide/platforms/blackberry/upgrading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/blackberry/upgrading.md b/docs/en/edge/guide/platforms/blackberry/upgrading.md
index c682471..9a1fc0a 100644
--- a/docs/en/edge/guide/platforms/blackberry/upgrading.md
+++ b/docs/en/edge/guide/platforms/blackberry/upgrading.md
@@ -20,7 +20,12 @@ license: Licensed to the Apache Software Foundation (ASF) under one
Upgrading BlackBerry
============================
-This document describes the process of upgrading Cordova projects to the latest released version
+This guide shows how to modify BlackBerry projects to upgrade from older versions of Cordova.
+Most of these instructions apply to projects created with an older set
+of command-line tools that precede the `cordova` CLI utility. See The
+Cordova Command-line Interface for information how to update the
+version of the CLI.
+
## Upgrading 2.8.0 projects to 2.9.0 ##
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/bcc16309/docs/en/edge/guide/platforms/ios/upgrading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/ios/upgrading.md b/docs/en/edge/guide/platforms/ios/upgrading.md
index c116e1a..cc0818f 100644
--- a/docs/en/edge/guide/platforms/ios/upgrading.md
+++ b/docs/en/edge/guide/platforms/ios/upgrading.md
@@ -20,6 +20,12 @@ license: Licensed to the Apache Software Foundation (ASF) under one
Upgrading iOS
=====================
+This guide shows how to modify iOS projects to upgrade from older versions of Cordova.
+Most of these instructions apply to projects created with an older set
+of command-line tools that precede the `cordova` CLI utility. See The
+Cordova Command-line Interface for information how to update the
+version of the CLI.
+
Please note that **Xcode 4.5 is required**. To submit to the Apple App Store, you must use the latest shipped version of the iOS SDK, which is iOS 6. The iOS 6 SDK requires Xcode 4.5.
## Upgrading 2.8.0 projects to 2.9.0 ##
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/bcc16309/docs/en/edge/guide/platforms/win8/upgrading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/win8/upgrading.md b/docs/en/edge/guide/platforms/win8/upgrading.md
index 2f4949b..b786faa 100644
--- a/docs/en/edge/guide/platforms/win8/upgrading.md
+++ b/docs/en/edge/guide/platforms/win8/upgrading.md
@@ -20,7 +20,11 @@ license: Licensed to the Apache Software Foundation (ASF) under one
Upgrading Windows 8
===============================
-This document is for people who need to upgrade their Cordova versions from an older version to a current version of Cordova. This applies to applications targetting Windows 8 and the Windows Store.
+This guide shows how to modify Windows 8 projects to upgrade from older versions of Cordova.
+Most of these instructions apply to projects created with an older set
+of command-line tools that precede the `cordova` CLI utility. See The
+Cordova Command-line Interface for information how to update the
+version of the CLI.
## Upgrade to 2.9.0 from 2.8.0 ##
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/bcc16309/docs/en/edge/guide/platforms/wp8/upgrading.md
----------------------------------------------------------------------
diff --git a/docs/en/edge/guide/platforms/wp8/upgrading.md b/docs/en/edge/guide/platforms/wp8/upgrading.md
index 2150802..6d8f37e 100644
--- a/docs/en/edge/guide/platforms/wp8/upgrading.md
+++ b/docs/en/edge/guide/platforms/wp8/upgrading.md
@@ -20,9 +20,32 @@ license: Licensed to the Apache Software Foundation (ASF) under one
Upgrading Windows Phone
===============================
-This document is for people who need to upgrade their Cordova versions from an older version to a current version of Cordova. This applies to both WP7 and WP8.
+This guide shows how to modify Windows Phone projects, both versions 7
+and 8, to upgrade from older versions of Cordova.
+Most of these instructions apply to projects created with an older set
+of command-line tools that precede the `cordova` CLI utility. See The
+Cordova Command-line Interface for information how to update the
+version of the CLI.
+The following section shows how to upgrade from non-CLI projects.
+
+## Upgrade to the CLI (3.0.0) from 2.9.0 ##
+
+1. Create a new Apache Cordova 3.0.0 project using the cordova CLI, as
+ described in The Cordova Command-line Interface.
+2. Add your platforms the the cordova project, for example: `cordova
+ platform add wp7 wp8`.
+3. Copy the contents of the project's `www` folder to the `www` folder
+ at the root of the cordova project you just created.
+4. Copy or overwrite any native assets from your original project
+ (`SplashScreen`, `ApplicationIcon`, etc.), making sure to add any
+ new files to the `.csproj` file. The windows phone project builds
+ inside the `platforms\wp7` or `platforms\wp8` directory.
+5. Use the cordova CLI tool to install any plugins you need. Note that
+ the CLI handles all core APIs as plugins, so they may need to be
+ added. Only 3.0.0 plugins are compatible with the CLI.
+6. Build and test.
-## Upgrade to 2.9.0 from 3.0.0 ##
+## Upgrade to 3.0.0 from 2.9.0 ##
In Visual Studio's Solution Explorer window:
@@ -35,14 +58,7 @@ In Visual Studio's Solution Explorer window:
Alternate upgrade method using the cordova CLI tool:
-1. Create a new Apache Cordova 3.0.0 project using the cordova CLI.
-2. Add your platforms the the cordova cli project (i.e `cordova platform add wp7 wp8`)
-3. Copy the contents of your projects `www` folder to the `www` folder at the root of the cordova project you just created.
-4. Copy or overwrite any native assets from your original project (SplashScreen, ApplicationIcon, etc), make sure to add any new files to the .csproj file. Your windows phone project wil be in `<project-root>\platforms\[wp7 | wp8]`.
-5. Use the cordova CLI tool to install any plugins you need, **all core APIs are now plugins and may need to be added**. Only 3.0.0 plugins will be compatible with the CLI.
-6. Build and test.
-
-## Upgrade to 2.8.0 from 2.9.0 ##
+## Upgrade to 2.9.0 from 2.8.0 ##
In Visual Studio's Solution Explorer window: