rhodes 3.0.1.beta.2 → 3.0.1.beta.3

data/doc/build.txt

@@ -95,6 +95,16 @@ Open up a command window and switch to your application's directory. Run:
 	
 This changes your rhobuild.yml in the SDK folder to point to your application.
 
+Prepare XCode rrhorunner.xcodeproj and other files for current application :
+
+	:::term
+  	rake build:iphone:setup_xcode_project
+
+Restore original XCode rrhorunner.xcodeproj and other files :
+
+	:::term
+  	rake build:iphone:restore_xcode_project
+
 After you change application code just run 'Build and Go' command in XCode to build for the simulator.
 
 If you want to build for the device, open the 'rhorunner' target and select your code signing information that you installed from the apple developer site and change your active sdk to a device.

data/doc/device-caps.txt

@@ -24,7 +24,7 @@ Rhodes provide access to device specific capabilities such as GPS, PIM, camera,
 	<tr><td class='cap'>Toolbar</td><td>1.2.2</td><td>2.3</td><td>3.0</td><td class='tbd'>n/a</td><td>1.5</td><td>3.0</td></tr>
 	<tr><td class='cap'>Tab Bar</td><td>1.2.2</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td class='tbd'>n/a</td><td>1.5</td><td class='tbd'>3.5</td></tr>
 	<tr><td class='cap'>Nav Bar</td><td>2.0</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td class='tbd'>n/a</td><td>2.0</td><td class='tbd'>4.0</td></tr>
-	<tr><td class='cap'>Signature Capture</td><td>2.1</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td class='tbd'>3.5</td><td>2.1</td><td class='tbd'>4.0</td></tr>
+	<tr><td class='cap'>Signature Capture</td><td>2.1</td><td>3.0</td><td class='tbd'>TBD</td><td class='tbd'>3.5</td><td>2.1</td><td class='tbd'>4.0</td></tr>
 	<tr class='tbd'><td class='cap'>Audio/Video capture</td><td>4.0</td><td>4.0</td><td class='tbd'>TBD</td><td>4.0</td><td>4.0</td><td>4.0</td></tr>
 	<tr><td class='cap'>Bluetooth</td><td>2.2</td><td>2.2</td><td class='tbd'>TBD</td><td>2.2</td><td>2.2</td><td class='tbd'>4.0</td></tr>
 	<tr><td class='cap'>NFC</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td>3.0</td><td class='tbd'>4.0</td></tr>

data/doc/ui.txt

@@ -160,7 +160,7 @@ If you are using xCode to build for iPhone, you should add to your project Defau
 * Default-LandscapeLeft.png; size 1024x768 - for iPad in LandscapeLeft orientation on start, if not defined then Default-Landscape.png will be used
 * Default-LandscapeRight.png; size 1024x768 - for iPad in LandscapeRight orientation on start, if not defined then Default-Landscape.png will be used
 
-**NOTE: Use rake command once and it will update xcode project. **
+**NOTE: Use rake command  "rake build:iphone:setup_xcode_project" for setup XCode project for current application (include loading images, icons, etc.) **
 
 You can see examples of all these images in [Rhodes-System-Api-Samples](http://github.com/rhomobile/rhodes-system-api-samples) application.
 

data/lib/extensions/debugger/debugger.rb

@@ -180,7 +180,7 @@ def debug_handle_cmd(inline)
     end
   end
   if processed
-    $_cmd = $_cmd.sub(/^([^\n\r]*)[\n\r]+(.*$)/, "\\2")
+    $_cmd = $_cmd.sub(/^([^\n\r]*)([\n\r]+(.*)|)$/, "\\3")
     $_wait = wait if inline
   end
   processed

data/platform/iphone/rbuild/iphone.rake

@@ -101,6 +101,41 @@ def set_app_url_scheme(newname)
   return ret_value
 end
 
+BAKUP_FILES = ['rhorunner.xcodeproj', 'Entitlements.plist', 'icon.png', 'icon114.png', 'icon57.png', 'icon72.png', 'Info.plist']
+CLEAR_FILES = ['Default.png', 'Default@2x.png', 'Default-Portrait.png', 'Default-PortraitUpsideDown.png', 'Default-Landscape.png', 'Default-LadscapeLeft.png', 'Default-LandscapeRight.png']
+
+def make_project_bakup
+     BAKUP_FILES.each do |f|
+           filename_origin = $config["build"]["iphonepath"] + "/" +f
+           filename_bak = $config["build"]["iphonepath"] + "/project_bakup/" +f
+           is_folder = File.directory? filename_bak 
+           if File.exists? filename_origin
+                if (!File.exists? filename_bak) && (!is_folder) 
+                    bak_folder = $config["build"]["iphonepath"] + "/project_bakup"
+                    mkdir_p bak_folder
+                    cp_r filename_origin,filename_bak
+                end
+           end        
+     end
+end
+
+def restore_project_from_bak
+     BAKUP_FILES.each do |f|
+           filename_origin = $config["build"]["iphonepath"] + "/" +f
+           filename_bak = $config["build"]["iphonepath"] + "/project_bakup/" +f
+           if File.exists? filename_bak
+                   rm_rf filename_origin 
+                   cp_r filename_bak,filename_origin                      
+           end        
+     end
+     CLEAR_FILES.each do |f|
+           filename = $config["build"]["iphonepath"] + "/" +f
+           if File.exists? filename
+                   rm_rf filename                      
+           end        
+     end
+end
+
 def set_app_url_name(newname)
   ret_value = ''
   fname = $config["build"]["iphonepath"] + "/Info.plist"
@@ -148,7 +183,7 @@ def restore_app_icon
   end
 end
 
-def set_app_icon
+def set_app_icon(make_bak)
   puts "set icon"
   ipath = $config["build"]["iphonepath"]
   begin
@@ -156,7 +191,9 @@ def set_app_icon
       ibak = File.join(ipath, name + '.bak')
       icon = File.join(ipath, name + '.png')
       appicon = File.join($app_path, 'icon', name + '.png')
-      cp icon, ibak unless File.exists? ibak
+      if make_bak 
+         cp icon, ibak unless File.exists? ibak
+      end
       cp appicon, ipath
     end
   rescue => e
@@ -181,7 +218,7 @@ def restore_default_images
   end
 end
 
-def set_default_images
+def set_default_images(make_bak)
   puts "set_default_images"
   ipath = $config["build"]["iphonepath"]
   begin
@@ -192,7 +229,9 @@ def set_default_images
       appimage = File.join($app_path, 'app', name + '.png')
       appsimage = File.join($app_path, 'app', name + '.iphone.png')
       if File.exists? imag
-        cp imag, ibak unless File.exists? ibak
+        if make_bak
+           cp imag, ibak unless File.exists? ibak
+        end 
       end
       #bundlei = File.join($srcdir, defname + '.png')
       #cp appimage, bundlei unless !File.exist? appimage
@@ -357,6 +396,7 @@ namespace "config" do
     #xcode_configuration = ENV['CONFIGURATION']
     #$configuration = xcode_configuration if not xcode_configuration.nil?
 
+    make_project_bakup
   end
 end
 
@@ -419,7 +459,35 @@ namespace "build" do
         end
       end
     end
-    
+
+    task :restore_xcode_project => ["config:iphone"] do
+       restore_project_from_bak 
+    end    
+
+    task :setup_xcode_project => ["config:iphone"] do
+      restore_project_from_bak
+
+      appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
+      vendor = $app_config['vendor'] ? $app_config['vendor'] : "rhomobile"
+      bundle_identifier = "com.#{vendor}.#{appname}"
+      bundle_identifier = $app_config["iphone"]["BundleIdentifier"] unless $app_config["iphone"]["BundleIdentifier"].nil?
+      saved_identifier = set_app_bundle_identifier(bundle_identifier)
+      
+      saved_url_scheme = set_app_url_scheme($app_config["iphone"]["BundleURLScheme"]) unless $app_config["iphone"]["BundleURLScheme"].nil?
+      saved_url_name = set_app_url_name(bundle_identifier)
+
+      set_app_icon(false)
+      set_default_images(false)
+
+      if $entitlements == ""
+          if $configuration == "Distribution"
+              $entitlements = "Entitlements.plist"
+          end
+      end
+
+      set_signing_identity($signidentity,$provisionprofile,$entitlements.to_s) if $signidentity.to_s != ""
+    end
+
 #    desc "Build rhodes"
     task :rhodes => ["config:iphone", "build:iphone:rhobundle"] do
       
@@ -432,6 +500,7 @@ namespace "build" do
       saved_name = set_app_name($app_config["name"]) unless $app_config["name"].nil?
       saved_version = set_app_version($app_config["version"]) unless $app_config["version"].nil?
 
+
       appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
       vendor = $app_config['vendor'] ? $app_config['vendor'] : "rhomobile"
       bundle_identifier = "com.#{vendor}.#{appname}"
@@ -441,8 +510,8 @@ namespace "build" do
       saved_url_scheme = set_app_url_scheme($app_config["iphone"]["BundleURLScheme"]) unless $app_config["iphone"]["BundleURLScheme"].nil?
       saved_url_name = set_app_url_name(bundle_identifier)
 
-      set_app_icon
-      set_default_images
+      set_app_icon(true)
+      set_default_images(true)
 
       if $entitlements == ""
           if $configuration == "Distribution"

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = "3.0.1.beta.2"
+  s.version = "3.0.1.beta.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 62196431
+  hash: 62196429
   prerelease: true
   segments: 
   - 3
   - 0
   - 1
   - beta
-  - 2
-  version: 3.0.1.beta.2
+  - 3
+  version: 3.0.1.beta.3
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 -07:00
+date: 2011-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -1075,6 +1075,7 @@ files:
 - lib/test/rho_stubs.rb
 - lib/test/syncdb.sqlite
 - LICENSE
+- Manifest.txt
 - platform/android/build/android.rake
 - platform/android/build/androidcommon.rb
 - platform/android/build/libcurl_build.files