rhodes 2.3.2 → 2.4.0.beta.1

data/platform/iphone/Info.plist

@@ -38,7 +38,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.3.2</string>
+	<string>2.4.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchImageFile</key>

data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		5C0F94DF132979140093FA1B /* RhoTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C0F94DE132979140093FA1B /* RhoTime.cpp */; };
 		5C2CE15C122ACA9E005EDBC4 /* RhoAppAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C2CE15B122ACA9E005EDBC4 /* RhoAppAdapter.cpp */; };
 		5C2CE255122AEC87005EDBC4 /* RhoAppAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C2CE254122AEC87005EDBC4 /* RhoAppAdapter.h */; };
 		5C5335530FC2977600F268F0 /* IRhoThreadImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C5335500FC2977600F268F0 /* IRhoThreadImpl.h */; };
@@ -78,6 +79,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		5C0F94DE132979140093FA1B /* RhoTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RhoTime.cpp; path = ../../shared/common/RhoTime.cpp; sourceTree = SOURCE_ROOT; };
 		5C2CE15B122ACA9E005EDBC4 /* RhoAppAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RhoAppAdapter.cpp; path = ../../shared/rubyext/RhoAppAdapter.cpp; sourceTree = SOURCE_ROOT; };
 		5C2CE254122AEC87005EDBC4 /* RhoAppAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhoAppAdapter.h; path = ../../shared/common/RhoAppAdapter.h; sourceTree = SOURCE_ROOT; };
 		5C5335500FC2977600F268F0 /* IRhoThreadImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IRhoThreadImpl.h; path = ../../shared/common/IRhoThreadImpl.h; sourceTree = SOURCE_ROOT; };
@@ -213,6 +215,7 @@
 		5C7162600F8B7DEE0096B6AA /* common */ = {
 			isa = PBXGroup;
 			children = (
+				5C0F94DE132979140093FA1B /* RhoTime.cpp */,
 				FA5F58DD12ADDA6D00C7613A /* app_build_configs.c */,
 				FA5F58DE12ADDA6D00C7613A /* app_build_configs.h */,
 				5C2CE254122AEC87005EDBC4 /* RhoAppAdapter.h */,
@@ -443,6 +446,7 @@
 				FA5F58DF12ADDA6D00C7613A /* app_build_configs.c in Sources */,
 				5CE03CCC12DB7E990058B474 /* sqlite3.c in Sources */,
 				5CB821AE1312487100778441 /* INetRequest.cpp in Sources */,
+				5C0F94DF132979140093FA1B /* RhoTime.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

data/platform/iphone/curl/curl.xcodeproj/project.pbxproj

@@ -756,7 +756,7 @@
 					"-DUSE_RHOSSL",
 				);
 				PRODUCT_NAME = curl;
-				SDKROOT = iphonesimulator3.2;
+				SDKROOT = iphoneos;
 				SYMROOT = ../build;
 			};
 			name = Debug;
@@ -774,7 +774,7 @@
 					"-DUSE_RHOSSL",
 				);
 				PRODUCT_NAME = curl;
-				SDKROOT = iphoneos3.2;
+				SDKROOT = iphoneos;
 				SYMROOT = ../build;
 			};
 			name = Release;
@@ -833,7 +833,7 @@
 					"-DUSE_RHOSSL",
 				);
 				PRODUCT_NAME = curl;
-				SDKROOT = iphoneos3.2;
+				SDKROOT = iphoneos;
 				SYMROOT = ../build;
 			};
 			name = Distribution;

data/platform/iphone/rbuild/iphone.rake

@@ -1,6 +1,5 @@
 #
 
-
 def extract_value_from_strings(line)
    pre_str = '<string>'
    post_str = '</string>'
@@ -396,7 +395,7 @@ namespace "build" do
     
 #    desc "Build rhodes"
     task :rhodes => ["config:iphone", "build:iphone:rhobundle"] do
-  
+      
       saved_name = ''
       saved_version = ''
       saved_identifier = ''
@@ -456,12 +455,8 @@ end
 namespace "run" do
   namespace "iphone" do
 
- 
-
-
-
     task :spec => ["clean:iphone",:buildsim] do
-
+ 	
       # Run local http server
       $iphonespec = true
       httpserver = false
@@ -482,27 +477,30 @@ namespace "run" do
       log_name  =   File.join($tmpdir, 'logout')
       File.delete(log_name) if File.exist?(log_name)
 
+      $iphone_end_spec = false
+
       Thread.new {
             # run spec
+            rhorunner = File.join($startdir, $config["build"]["iphonepath"],"build/#{$configuration}-iphonesimulator/rhorunner.app")
             iphonesim = File.join($startdir, 'res/build-tools/iphonesim/build/Release/iphonesim')
-            commandis = iphonesim + ' launch "' + File.join($simrhodes, 'rhorunner.app') + '" ' + $sdkver.gsub(/([0-9]\.[0-9]).*/,'\1') + ' ' + $emulatortarget + ' "' +log_name+'"'
+            commandis = iphonesim + ' launch "' + rhorunner + '" ' + $sdkver.gsub(/([0-9]\.[0-9]).*/,'\1') + ' ' + $emulatortarget + ' "' +log_name+'"'
             puts 'use iphonesim tool - open iPhone Simulator and execute our application, also support device family (iphone/ipad)'
             puts 'execute command : ' + commandis
-            system(commandis)  	
+            system(commandis)
             $iphone_end_spec = true
-     }
+      }
 
-        start = Time.now        
+      start = Time.now        
 
-        puts "waiting for log"
+      puts "waiting for log"
       
-        while !File.exist?(log_name)
+        while (!File.exist?(log_name)) && (!$iphone_end_spec)
             sleep(1)
         end
 
         puts "start read log"
         
-        $iphone_end_spec = false
+        #$iphone_end_spec = false
 
         while !$iphone_end_spec do
             io = File.new(log_name, "r")
@@ -533,6 +531,7 @@ namespace "run" do
       NetHTTPSpecs.stop_server if httpserver
 
       exit $failed.to_i unless $dont_exit_on_failure
+ 
     end
 
     task :spec_old => ["clean:iphone",:buildsim] do
@@ -622,9 +621,38 @@ namespace "run" do
       exit $failed.to_i
     end
 
+    #<<<<<<<<<
+    task :get_log => ["config:iphone"] do
+      puts $simapppath
+       $sdkver = $emulator_version.to_s unless $emulator_version.nil?
+      
+       simapp = File.join($simdir, $sdkver, "Applications")
+      
+       Dir.glob(File.join($simdir, $sdkver, "Applications", "*")).each do |simapppath|
+           need_rm = true if File.directory? simapppath
+           if File.exists?(File.join(simapppath, 'rhorunner.app', 'name'))
+             name = File.read(File.join(simapppath, 'rhorunner.app', 'name'))
+             puts "found app name: #{name}"
+             guid = File.basename(simapppath)
+             puts "found guid: #{guid}"
+             if name == $app_config['name']
+                 $guid = guid
+                 need_rm = false
+             end
+         end
+         rm_rf simapppath if need_rm
+         rm_rf simapppath + ".sb" if need_rm
+       end
+      
+       simapp = File.join($simdir, $emulator_version, "Applications")
+       
+       
+       rholog = simapp + "/" + $guid + "/Documents/RhoLog.txt"
+       puts "log_file=" + rholog
+    end 
 
   end
-
+  
   task :buildsim => ["config:iphone", "build:iphone:rhodes"] do
     
      unless $sdk =~ /^iphonesimulator/
@@ -633,139 +661,160 @@ namespace "run" do
      end
      `killall "iPhone Simulator"`
 
+
+      puts 'kill iPhone Simulator'
+      `killall -9  "iPhone Simulator"`
+      `killall -9 iphonesim`
+
+     use_old_scheme = ($emulatortarget != 'iphone') && ($emulatortarget != 'ipad')
+
+
      $sdkver = $sdk.gsub(/^iphonesimulator/, '')
      # Workaround: sometimes sdkver could differ from emulator version.
      # Example: iPhone SDK 4.0.1. In this case sdk is still iphonesimulator4.0 but version of simulator is 4.0.1
      $sdkver = $emulator_version.to_s unless $emulator_version.nil?
 
-     elements = []
-     binplist = File.join(ENV['HOME'], 'Library', 'Preferences', 'com.apple.iphonesimulator.plist')
-     xmlplist = '/tmp/iphone.plist'
-     if File.exists? binplist
-       `plutil -convert xml1 -o #{xmlplist} #{binplist}`
-
-       elements = []
-       doc = REXML::Document.new(File.new(xmlplist))
-       nextignore = false
-       doc.elements.each('plist/dict/*') do |element|
-         if nextignore
-           nextignore = false
-           next
-         end
-         if element.name == 'key'
-           if element.text == 'currentSDKRoot' or element.text == 'SimulateDevice'
-             nextignore = true
-             next
-           end
-         end
-         
-         elements << element
-       end
-     end
-
-     e = REXML::Element.new 'key'
-     e.text = 'SimulateDevice'
-     elements << e
-     e = REXML::Element.new 'string'
-     e.text = $sdkver == '3.2' ? 'iPad' : 'iPhone'
-     elements << e
-     e = REXML::Element.new 'key'
-     e.text = 'currentSDKRoot'
-     elements << e
-     e = REXML::Element.new 'string'
-     e.text = $sdkroot
-     elements << e
-
-     File.open(xmlplist, 'w') do |f|
-       f.puts "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-       f.puts "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">"
-       f.puts "<plist version=\"1.0\">"
-       f.puts "<dict>"
-       elements.each do |e|
-         f.puts "\t#{e.to_s}"
-       end
-       f.puts "</dict>"
-       f.puts "</plist>"
-     end
 
-     `plutil -convert binary1 -o #{binplist} #{xmlplist}`
 
-     rhorunner = $config["build"]["iphonepath"] + "/build/#{$configuration}-iphonesimulator/rhorunner.app"
-     puts "rhorunner: #{rhorunner}"
+     #if use_old_scheme
+
+          elements = []
+          binplist = File.join(ENV['HOME'], 'Library', 'Preferences', 'com.apple.iphonesimulator.plist')
+          xmlplist = '/tmp/iphone.plist'
+          if File.exists? binplist
+              `plutil -convert xml1 -o #{xmlplist} #{binplist}`
+
+              elements = []
+              doc = REXML::Document.new(File.new(xmlplist))
+              nextignore = false
+              doc.elements.each('plist/dict/*') do |element|
+                  if nextignore
+                      nextignore = false
+                      next
+                  end
+                  if element.name == 'key'
+                      if element.text == 'currentSDKRoot' or element.text == 'SimulateDevice'
+                          nextignore = true
+                          next
+                      end
+                  end
+         
+                  elements << element
+              end
+         end
 
-     puts "our app name: #{$app_config['name']}"
-     puts "simdir: #{$simdir}"
+         e = REXML::Element.new 'key'
+         e.text = 'SimulateDevice'
+         elements << e
+         e = REXML::Element.new 'string'
+         e.text = $sdkver == '3.2' ? 'iPad' : 'iPhone'
+         elements << e
+         e = REXML::Element.new 'key'
+         e.text = 'currentSDKRoot'
+         elements << e
+         e = REXML::Element.new 'string'
+         e.text = $sdkroot
+         elements << e
+
+         File.open(xmlplist, 'w') do |f|
+             f.puts "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+             f.puts "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">"
+             f.puts "<plist version=\"1.0\">"
+             f.puts "<dict>"
+             elements.each do |e|
+                 f.puts "\t#{e.to_s}"
+             end
+             f.puts "</dict>"
+             f.puts "</plist>"
+         end
 
-     Dir.glob(File.join($simdir, $sdkver, "Applications", "*")).each do |simapppath|
-       need_rm = true if File.directory? simapppath
-       if File.exists?(File.join(simapppath, 'rhorunner.app', 'name'))
-         name = File.read(File.join(simapppath, 'rhorunner.app', 'name'))
-         puts "found app name: #{name}"
-         guid = File.basename(simapppath)
-         puts "found guid: #{guid}"
-         if name == $app_config['name']
-           $guid = guid
-           need_rm = false
+         `plutil -convert binary1 -o #{binplist} #{xmlplist}`
+
+         rhorunner = $config["build"]["iphonepath"] + "/build/#{$configuration}-iphonesimulator/rhorunner.app"
+         puts "rhorunner: #{rhorunner}"
+
+         puts "our app name: #{$app_config['name']}"
+         puts "simdir: #{$simdir}"
+
+         Dir.glob(File.join($simdir, $sdkver, "Applications", "*")).each do |simapppath|
+             need_rm = true if File.directory? simapppath
+             if File.exists?(File.join(simapppath, 'rhorunner.app', 'name'))
+                 name = File.read(File.join(simapppath, 'rhorunner.app', 'name'))
+                 puts "found app name: #{name}"
+                 guid = File.basename(simapppath)
+                 puts "found guid: #{guid}"
+                 if name == $app_config['name']
+                     $guid = guid
+                     need_rm = false
+                 end
+             end
+             rm_rf simapppath if need_rm
+             rm_rf simapppath + ".sb" if need_rm
          end
-       end
-       rm_rf simapppath if need_rm
-       rm_rf simapppath + ".sb" if need_rm
-     end
 
-     puts "app guid: #{$guid}"
+         puts "app guid: #{$guid}"
 
-     mkdir_p File.join($simdir, $sdkver)
+         mkdir_p File.join($simdir, $sdkver)
 
-     simapp = File.join($simdir, $sdkver, "Applications")
-     simlink = File.join($simdir, $sdkver, "Library", "Preferences")
+         simapp = File.join($simdir, $sdkver, "Applications")
+         simlink = File.join($simdir, $sdkver, "Library", "Preferences")
 
-     $simrhodes = File.join(simapp, $guid)
+         $simrhodes = File.join(simapp, $guid)
 
-     mkdir_p File.join($simrhodes, "Documents")
-     mkdir_p File.join($simrhodes, "Library", "Preferences")
+         mkdir_p File.join($simrhodes, "Documents")
+         mkdir_p File.join($simrhodes, "Library", "Preferences")
 
-     rm_rf File.join($simrhodes, 'rhorunner.app')
-     cp_r rhorunner, $simrhodes
-     ['com.apple.PeoplePicker.plist', '.GlobalPreferences.plist'].each do |f|
-       `ln -f -s "#{simlink}/#{f}" "#{$simrhodes}/Library/Preferences/#{f}"`
-     end
+         rm_rf File.join($simrhodes, 'rhorunner.app')
+         cp_r rhorunner, $simrhodes
+         ['com.apple.PeoplePicker.plist', '.GlobalPreferences.plist'].each do |f|
+             `ln -f -s "#{simlink}/#{f}" "#{$simrhodes}/Library/Preferences/#{f}"`
+         end
 
-     `echo "#{$applog}" > "#{$simrhodes}/Documents/rhologpath.txt"`
-     rholog = simapp + "/" + $guid + "/Documents/RhoLog.txt"
+#>>>>>>>>>>
+        `echo "#{$applog}" > "#{$simrhodes}/Documents/rhologpath.txt"`
+        rholog = simapp + "/" + $guid + "/Documents/RhoLog.txt"
 
 
-     simpublic = simapp + "/" + $guid + "/Documents/apps/public"
-     apppublic = $app_path + "/sim-public-#{$sdkver}"
+        simpublic = simapp + "/" + $guid + "/Documents/apps/public"
+        apppublic = $app_path + "/sim-public-#{$sdkver}"
 
-     apprholog = $app_path + "/rholog-#{$sdkver}.txt"
-     rm_f apprholog
-     rm_f apppublic
-     `ln -f -s "#{simpublic}" "#{apppublic}"`
-     `ln -f -s "#{rholog}" "#{apprholog}"`
-     `echo > "#{rholog}"`
-     f = File.new("#{simapp}/#{$guid}.sb","w")
-     f << "(version 1)\n(debug deny)\n(allow default)\n"
-     f.close
-     
+
+        apprholog = $app_path + "/rholog-#{$sdkver}.txt"
+        apprholog = $app_path + "/" + $app_config["applog"] if $app_config["applog"]
+
+        rm_f apprholog
+        rm_f apppublic
+        `ln -f -s "#{simpublic}" "#{apppublic}"`
+        `ln -f -s "#{rholog}" "#{apprholog}"`
+        `echo > "#{rholog}"`
+        f = File.new("#{simapp}/#{$guid}.sb","w")
+        f << "(version 1)\n(debug deny)\n(allow default)\n"
+        f.close
+     #end    
   end
 
   # split this off separate so running it normally is run:iphone
   # testing we will not launch emulator directly
   desc "Builds everything, launches iphone simulator"
   task :iphone => :buildsim do
-
+    
     iphonesim = File.join($startdir, 'res/build-tools/iphonesim/build/Release/iphonesim')
 
-    commandis = iphonesim + ' launch "' + File.join($simrhodes, 'rhorunner.app') + '" ' + $sdkver.gsub(/([0-9]\.[0-9]).*/,'\1') + ' ' + $emulatortarget
-
-    if ($emulatortarget != 'iphone') && ($emulatortarget != 'ipad')
-        puts  'use old execution way - just open iPhone Simulator'
-        system("open \"#{$sim}/iPhone Simulator.app\"")
-    else
-        puts 'use iphonesim tool - open iPhone Simulator and execute our application, also support device family (iphone/ipad)'
-        system(commandis)  	
-    end
+    rhorunner = File.join($startdir, $config["build"]["iphonepath"],"build/#{$configuration}-iphonesimulator/rhorunner.app")
+    commandis = iphonesim + ' launch "' + rhorunner + '" ' + $sdkver.gsub(/([0-9]\.[0-9]).*/,'\1') + ' ' + $emulatortarget
 
+    Thread.new {
+       if ($emulatortarget != 'iphone') && ($emulatortarget != 'ipad')
+           puts  'use old execution way - just open iPhone Simulator'
+           system("open \"#{$sim}/iPhone Simulator.app\"")
+       else
+           puts 'use iphonesim tool - open iPhone Simulator and execute our application, also support device family (iphone/ipad)'
+           system(commandis)
+       end
+    }
+  
+    puts "end build iphone app"  
+    exit
   end
   
   task :allspecs do

data/platform/iphone/rhoextlib/rhoextlib.xcodeproj/project.pbxproj

@@ -160,7 +160,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = rhoextlib;
-				SDKROOT = iphonesimulator3.2;
+				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -178,7 +178,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = rhoextlib;
-				SDKROOT = iphoneos3.2;
+				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -246,7 +246,9 @@
 				GCC_PREFIX_HEADER = rhoextlib_Prefix.pch;
 				GCC_VERSION = "";
 				INSTALL_PATH = /usr/local/lib;
+				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = rhoextlib;
+				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Distribution;