Updated VERSION to 1.7.0rc1, updated Makefile to include new guides.

filmaj · Apr 23, 2012 · f22c4f2 · f22c4f2
1 parent 6162cc1
commit f22c4f2
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 8 deletions.
diff --git a/CordovaInstaller/docs/releasenotes.md b/CordovaInstaller/docs/releasenotes.md
@@ -2,6 +2,23 @@
 
 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.7.0rc1 (20120423) ###
+
+* Fixed CB-183, CB-54 - ios camera targetWidth/Height don't match the documentation Fixes CB-183 and CB-54
+* Fixed CB-511 Changed deviceproperties version to "cordova" property
+* Fixed CB-483 - FileTransfer - unknown property attribute 'atomic' when building from source (Xcode 3 only)
+* Fixed CB-507 - Remove excessive debug logging in execute delegate method in CDVViewController
+* Implemented CB-536 - Add new selector to CDVViewController to create a new CDVCordovaView, so subclasses can override it
+* Workaround for CB-509 - geolocation.clearWatch doesn't shut the GPS down under iOS
+* Fixed CB-537 - media.seekTo fails with NSRangeException
+* Fixed CB-544 - iOS Geolocation fails if Cordova.plist EnableLocation = YES
+* Fixed CB-543 - FileTransfer.upload WebKit discarded an uncaught exception
+* Fixed CB-391 - camera.getPicture crash
+* Implemented CB-535 - Add a way to log JavaScript exceptions, parse errors, and get JS stack frame events (with line numbers, etc)
+* Fixed CB-494 - Move Cordova.plist section from "How to use Cordova as a Component Guide" to its own doc
+
+<br />
+
 ### 1.6.1 (20120416) ###
 
 * Fixed CB-496 - Camera.getPicture - will always return FILE\_URI even though DATA\_URL specified

diff --git a/CordovaLib/Classes/CDVAvailability.h b/CordovaLib/Classes/CDVAvailability.h
@@ -27,18 +27,19 @@
 #define __CORDOVA_1_5_0  10500
 #define __CORDOVA_1_6_0  10600
 #define __CORDOVA_1_6_1  10601
+#define __CORDOVA_1_7_0  10700
 #define __CORDOVA_NA     99999  /* not available */
 
 
 /*
- #if CORDOVA_VERSION_MIN_REQUIRED >= __CORDOVA_1_5_0
-    // do something when its at least 1.5.0
+ #if CORDOVA_VERSION_MIN_REQUIRED >= __CORDOVA_1_7_0
+    // do something when its at least 1.7.0
  #else
-    // do something else (non 1.5.0)
+    // do something else (non 1.7.0)
  #endif
  */
 #ifndef CORDOVA_VERSION_MIN_REQUIRED
-    #define CORDOVA_VERSION_MIN_REQUIRED __CORDOVA_1_6_1
+    #define CORDOVA_VERSION_MIN_REQUIRED __CORDOVA_1_7_0
 #endif
 
 /* 

diff --git a/CordovaLib/VERSION b/CordovaLib/VERSION
@@ -1 +1 @@
-1.6.1
+1.7.0rc1
diff --git a/Makefile b/Makefile
@@ -208,6 +208,8 @@ installer: check-utils clean markdown wkhtmltopdf cordova-lib xcode3-template xc
 	@$(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)
+	@$(WKHTMLTOPDF) --footer-center "Cordova ${CDV_VER} Settings File" CordovaInstaller/docs/settings_file.html 'dist/files/Guides/Cordova Settings File.pdf' > /dev/null 2>> $(PKG_ERROR_LOG)
+	@$(WKHTMLTOPDF) --footer-center "Cordova ${CDV_VER} JavaScript Exception Logging" CordovaInstaller/docs/exception_logging.html 'dist/files/Guides/Cordova JavaScript Exception Logging.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)
@@ -290,3 +292,11 @@ 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
+	@# generate 'Cordova Settings File' html from markdown
+	@echo '<html><body style="font-family: Helvetica Neue;font-size:10pt;">' >	 CordovaInstaller/docs/settings_file.html
+	@perl Markdown_1.0.1/Markdown.pl 'guides/Cordova Settings File.md' >> CordovaInstaller/docs/settings_file.html
+	@echo '</body></html>'  >> CordovaInstaller/docs/settings_file.html
+	@# generate 'Cordova JavaScript Exception Logging' html from markdown
+	@echo '<html><body style="font-family: Helvetica Neue;font-size:10pt;">' >	 CordovaInstaller/docs/exception_logging.html
+	@perl Markdown_1.0.1/Markdown.pl 'guides/Cordova JavaScript Exception Logging.md' >> CordovaInstaller/docs/exception_logging.html
+	@echo '</body></html>'  >> CordovaInstaller/docs/exception_logging.html
diff --git a/guides/Cordova JavaScript Exception Logging.md b/guides/Cordova JavaScript Exception Logging.md
@@ -13,6 +13,9 @@ NOTE: when you include these files, it will **always pop up a warning dialog at
             return [[CDVDebugWebView alloc] initWithFrame:bounds];
         }
         
+4. Don't forget to add the import at the top of your **MainViewController.m** file as well:
+
+        #import "CDVDebugView.h";
 
 
 

diff --git a/guides/Cordova Upgrade Guide.md b/guides/Cordova Upgrade Guide.md
@@ -2,9 +2,17 @@
 
 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.
 
-- To upgrade from 1.3.0 to 1.6.x, please go to the 1.4.0 instructions first, then 1.5.0, then 1.6.x
-- To upgrade from 1.4.x to 1.6.x, please go to the 1.5.0 instructions first, then 1.6.x
-- To upgrade from 1.5.0 to 1.6.x, go straight to the 1.6.x instructions
+- To upgrade from 1.3.0 to 1.6.x, please go to the 1.4.0 instructions first, then 1.5.0, then 1.6.x, then 1.7.0
+- To upgrade from 1.4.x to 1.6.x, please go to the 1.5.0 instructions first, then 1.6.x, then 1.7.0
+- To upgrade from 1.5.0 to 1.7.0, please go to the 1.6.0 instructions first, then 1.7.0
+- To upgrade from 1.6.x to 1.7.0, go straight to the 1.7.0 instructions
+
+## Upgrading Cordova 1.6.0 projects to 1.7.0 ##
+
+1. **Install** Cordova 1.7.0
+2. **Create a new project** - you will have to grab assets from this new project
+3. **Copy** the **www/cordova-1.7.0.js** file from the new project into your **www** folder, and delete your **www/cordova-1.6.0.js** file
+4. **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-1.7.0.js** file
 
 ## Upgrading Cordova 1.5.0 projects to 1.6.x ##