rhodes 6.2.0 → 7.1.17

data/platform/iphone/RhodesBaseDelegate.h

@@ -10,7 +10,7 @@
 #import "Classes/Rhodes.h"
 
 @interface RhodesBaseDelegate : Rhodes <UIApplicationDelegate,
-UITabBarControllerDelegate, AVAudioPlayerDelegate, UIAlertViewDelegate>
+UITabBarControllerDelegate, AVAudioPlayerDelegate, UIAlertViewDelegate, UNUserNotificationCenterDelegate>
 {
     
 }

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

@@ -6,6 +6,20 @@
 	objectVersion = 46;
 	objects = {
 
+/* Begin PBXAggregateTarget section */
+		FAD35703226422FF00419673 /* curlAggregated */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = FAD35707226422FF00419673 /* Build configuration list for PBXAggregateTarget "curlAggregated" */;
+			buildPhases = (
+				FAD357082264230300419673 /* ShellScript */,
+			);
+			dependencies = (
+			);
+			name = curlAggregated;
+			productName = curlAggregated;
+		};
+/* End PBXAggregateTarget section */
+
 /* Begin PBXBuildFile section */
 		AC1791A41FC71C4A0065041B /* amigaos.c in Sources */ = {isa = PBXBuildFile; fileRef = AC1791A11FC71C4A0065041B /* amigaos.c */; };
 		AC1791A51FC71C4A0065041B /* amigaos.h in Headers */ = {isa = PBXBuildFile; fileRef = AC1791A21FC71C4A0065041B /* amigaos.h */; };
@@ -787,6 +801,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0500;
+				TargetAttributes = {
+					FAD35703226422FF00419673 = {
+						CreatedOnToolsVersion = 10.1;
+						DevelopmentTeam = PNQRMU2LPM;
+						ProvisioningStyle = Automatic;
+					};
+				};
 			};
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "curl" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -800,10 +821,31 @@
 			projectRoot = "";
 			targets = (
 				D2AAC045055464E500DB518D /* curl */,
+				FAD35703226422FF00419673 /* curlAggregated */,
 			);
 		};
 /* End PBXProject section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		FAD357082264230300419673 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "LIB_NAME=\"curl\"\n\n#MY_BUILD_DIR = \"${BUILD_DIR}\"\nMY_BUILD_DIR=\"./build\"\n\nSIMULATOR_LIBRARY_PATH=\"${MY_BUILD_DIR}/${CONFIGURATION}-iphonesimulator/lib${LIB_NAME}.a\"\n\nDEVICE_LIBRARY_PATH=\"${MY_BUILD_DIR}/${CONFIGURATION}-iphoneos/lib${LIB_NAME}.a\"\n\nOUTPUT_DIR=\"./${LIB_NAME}-Aggregated\"\n\nrm -rf \"${MY_BUILD_DIR}/${CONFIGURATION}-iphonesimulator\"\nrm -rf \"${MY_BUILD_DIR}/${CONFIGURATION}-iphoneos\"\n\n\nARCHS=\"i386 x86_64\"\n\nXcodebuild -project ${PROJECT_NAME}.Xcodeproj -scheme ${LIB_NAME} -sdk iphonesimulator -configuration ${CONFIGURATION} install CONFIGURATION_BUILD_DIR=${MY_BUILD_DIR}/${CONFIGURATION}-iphonesimulator ARCHS=\"i386 x86_64\"\n\nARCHS=\"arm64 armv7 armv7s\"\n\nXcodebuild -project ${PROJECT_NAME}.Xcodeproj -scheme ${LIB_NAME} -sdk iphoneos -configuration ${CONFIGURATION} install CONFIGURATION_BUILD_DIR=${MY_BUILD_DIR}/${CONFIGURATION}-iphoneos ARCHS=\"arm64 armv7 armv7s\"\n\nrm -rf \"${OUTPUT_DIR}\"\n\nmkdir \"${OUTPUT_DIR}\"\n\nlipo \"${SIMULATOR_LIBRARY_PATH}\" \"${DEVICE_LIBRARY_PATH}\" -create -output \"${OUTPUT_DIR}/lib${LIB_NAME}.a\"\n\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		D2AAC044055464E500DB518D /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -962,12 +1004,13 @@
 		1DEB91F008733DB70010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_C_LANGUAGE_STANDARD = c99;
 				CLANG_CXX_LIBRARY = "libc++";
+				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../../shared;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
 				SDKROOT = iphoneos;
@@ -977,11 +1020,12 @@
 		1DEB91F108733DB70010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_C_LANGUAGE_STANDARD = c99;
 				CLANG_CXX_LIBRARY = "libc++";
+				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../../shared;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = NO;
 				PREBINDING = NO;
 				SDKROOT = iphoneos;
@@ -991,11 +1035,12 @@
 		BDC9885010AEBA3C00A80FD0 /* Distribution */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_C_LANGUAGE_STANDARD = c99;
 				CLANG_CXX_LIBRARY = "libc++";
+				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../../shared;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = NO;
 				PREBINDING = NO;
 				SDKROOT = iphoneos;
@@ -1024,6 +1069,33 @@
 			};
 			name = Distribution;
 		};
+		FAD35704226422FF00419673 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = PNQRMU2LPM;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		FAD35705226422FF00419673 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = PNQRMU2LPM;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		FAD35706226422FF00419673 /* Distribution */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = PNQRMU2LPM;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Distribution;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -1047,6 +1119,16 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		FAD35707226422FF00419673 /* Build configuration list for PBXAggregateTarget "curlAggregated" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				FAD35704226422FF00419673 /* Debug */,
+				FAD35705226422FF00419673 /* Release */,
+				FAD35706226422FF00419673 /* Distribution */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;

data/platform/iphone/rbuild/ApplicationPlist.erb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "https://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 	<dict>
 		<key>items</key>

data/platform/iphone/rbuild/iphone.rake

@@ -29,6 +29,8 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'iphonecommon'))
 require File.dirname(__FILE__) + '/../../../lib/build/BuildConfig'
 
 
+$use_temp_keychain = false
+
 $out_file_buf_enable = false
 $out_file_buf_path = 'rhobuildlog.txt'
 $out_file_buf = []
@@ -278,8 +280,9 @@ def update_plist_procedure
       ext_name, changed_value = get_ext_plist_changes($app_extension_cfg)
 
       set_app_plist_options($app_path + "/project/iphone/Info.plist", appname, bundle_identifier, $app_config["version"], $app_config["iphone"]["BundleURLScheme"]) do |hash|
-         hash['UIApplicationExitsOnSuspend'] = on_suspend_value
-
+         if !(on_suspend.nil?)
+             hash['UIApplicationExitsOnSuspend'] = on_suspend_value
+         end
         changed_value.each do |k, v|
           puts "Info.plist: Setting key #{k} = #{v} from #{File.basename(ext_name[k])}"
           hash[k] = v
@@ -785,14 +788,14 @@ def update_xcode_project_files_by_capabilities
         if $app_config['iphone'] != nil
             if $app_config['iphone']['barcode_engine'] != nil
                 $barcode_engine = $app_config['iphone']['barcode_engine'].upcase
-                if $barcode_engine != 'ZXING' &&  $barcode_engine != 'ZBAR' then
-                    raise 'ERROR: Unknown barcode engine, select ZBar or ZXing please in build.yml [iphone][barcode_engine] setup to ZXING or ZBAR !'
+                if $barcode_engine != 'ZXING' &&  $barcode_engine != 'APPLE_BARCODE_ENGINE' then
+                    raise 'ERROR: Unknown barcode engine, select Apples or ZXing please in build.yml [iphone][barcode_engine] setup to APPLE_BARCODE_ENGINE or ZXING ! ZBAR is unsupported now by UIWebView issue!!!'
                 end
             else
-                $barcode_engine = 'ZXING'
+                $barcode_engine = 'APPLE_BARCODE_ENGINE'
             end
         else
-            $barcode_engine = 'ZXING'
+            $barcode_engine = 'APPLE_BARCODE_ENGINE'
         end
     end
 
@@ -1044,6 +1047,8 @@ def kill_iphone_simulator
   `killall -9 iphonesim_6`
   `killall -9 iphonesim_7`
   `killall -9 iphonesim_8`
+  `killall -9 com.apple.CoreSimulator.CoreSimulatorService`
+  `killall -9 Simulator`
 end
 
 namespace "config" do
@@ -1144,7 +1149,7 @@ namespace "config" do
 
     #check for XCode 6
     xcode_version = get_xcode_version
-    xcode_version = xcode_version[0..(xcode_version.index('.')-1)]	
+    xcode_version = xcode_version[0..(xcode_version.index('.')-1)]
     if xcode_version.to_i >= 6
       $iphonesim = File.join($startdir, 'res/build-tools/iphonesim/build/Release/iphonesim_6')
     end
@@ -1166,7 +1171,7 @@ namespace "config" do
       if !File.exists? '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks/DVTiPhoneSimulatorRemoteClient.framework'
         #check for XCode 6
         xcode_version = get_xcode_version
-        xcode_version = xcode_version[0..(xcode_version.index('.')-1)]	
+        xcode_version = xcode_version[0..(xcode_version.index('.')-1)]
         if xcode_version.to_i >= 8
           $iphonesim = File.join($startdir, 'res/build-tools/iphonesim/build/Release/iphonesim_8')
         elsif xcode_version.to_i >= 7
@@ -1266,6 +1271,15 @@ namespace "config" do
         mp_latest_Time = nil
 
         if File.exists? mp_folder
+
+            if $use_temp_keychain
+                puts "Prepare temporary keychain for use security tool"
+                args = ['delete-keychain', 'tmp']
+                Jake.run2('security',args)
+                args = ['create-keychain', '-p ""','rhobuildtmp']
+                Jake.run2('security',args)
+            end
+
             Dir.entries(mp_folder).select do |entry|
                 path = File.join(mp_folder,entry)
                 #puts '$$$ '+path.to_s
@@ -1274,11 +1288,17 @@ namespace "config" do
                     plist_path = path
                     # make XML
                     xml_lines_arr = []
-                    args = ['cms', '-D', '-i', plist_path]
+
+                    if $use_temp_keychain
+                        args = ['cms', '-D', '-k', 'rhobuildtmp', '-i', plist_path]
+                    else
+                        args = ['cms', '-D', '-i', plist_path]
+                    end
                     Jake.run2('security',args,{:rootdir => $startdir, :hide_output => true}) do |line|
                         xml_lines_arr << line.to_s
                         true
                     end
+
                     xml_lines = xml_lines_arr.join.to_s
                     #puts '%%%%%%% '+xml_lines
 
@@ -1308,6 +1328,12 @@ namespace "config" do
                     end
                 end
             end
+
+            if $use_temp_keychain
+                args = ['delete-keychain', 'rhobuildtmp']
+                Jake.run2('security',args)
+            end
+
         end
         if mp_latest_UUID != nil
             $provisionprofile = mp_latest_UUID
@@ -1473,6 +1499,396 @@ namespace "build" do
 
     end
 
+
+    # [build:iphone:rhodeslib_framework]
+    desc "Build iphone framework - set target path :  rake build:iphone:rhodeslib_framework['/Users/myuser/mypath']"
+    task :rhodeslib_framework, [:target_path]  => ["config:set_iphone_platform", "config:common"] do |t, args|
+
+        require   $startdir + '/lib/build/jake.rb'
+
+        print_timestamp('build:iphone:rhodeslib_framework START')
+        currentdir = Dir.pwd()
+
+
+        # copied from build upgrade bundle
+
+        target_path = args[:target_path]
+
+        Rake::Task['config:iphone'].invoke
+
+        appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
+        appname_fixed = appname.split(/[^a-zA-Z0-9]/).map { |w| w }.join("")
+
+        iphone_project = File.join($app_path, "project","iphone","#{appname_fixed}.xcodeproj")
+
+        if !File.exist?(iphone_project)
+
+          puts '$ make iphone XCode project for application'
+          Rake::Task['build:iphone:make_xcode_project'].invoke
+
+        end
+
+
+
+        # prepare tmp folder
+        lib_temp_dir = File.join($startdir, "platform/iphone/Framework/LibFactory")
+        rm_rf lib_temp_dir if File.exists? lib_temp_dir
+        mkdir_p lib_temp_dir
+
+        libs = []
+
+        # build rhodes system libs
+        rhodes_libs = {}
+        rhodes_libs['RhoApplication'] = { :path => File.join($startdir, "platform/iphone/Framework/RhoApplication"), :target => "RhoApplication"}
+        rhodes_libs['rhoextlib'] = { :path => File.join($startdir, "platform/iphone/rhoextlib"), :target => 'rhoextlib'}
+        rhodes_libs['rhosynclib'] = { :path => File.join($startdir, "platform/iphone/rhosynclib"), :target => 'rhosynclib'}
+        rhodes_libs['rhorubylib'] = { :path => File.join($startdir, "platform/iphone/rhorubylib"), :target => 'rhorubylib'}
+        rhodes_libs['RhoLib'] = { :path => File.join($startdir, "platform/iphone/RhoLib"), :target => 'RhoLib'}
+        rhodes_libs['curl'] = { :path => File.join($startdir, "platform/iphone/curl"), :target => 'curl'}
+        rhodes_libs['RhoAppBaseLib'] = { :path => File.join($startdir, "platform/iphone/RhoAppBaseLib"), :target => 'RhoAppBaseStandaloneLib'}
+
+        # skip this step - now all of those libsincluded into framework project
+        rhodes_libs = {}
+        rhodes_libs.each do |libname, libconfig|
+            # build
+            #args = ['install', '-scheme', libconfig[:target]+"Aggregated", '-project', libname + ".xcodeproj"]
+            Dir.chdir libconfig[:path]
+            #ret = IPhoneBuild.run_and_trace($xcodebuild,args,{:rootdir => $startdir})
+
+            lib_iphoneos_dir = File.join(libconfig[:path], "iphoneos")
+            lib_iphonesimulator_dir = File.join(libconfig[:path], "iphonesimulator")
+            lib_aggregated_dir = File.join(libconfig[:path], "aggregated")
+
+            lib_file_name = "lib" + libconfig[:target] + ".a"
+            lib_iphoneos_path = File.join(lib_iphoneos_dir, lib_file_name)
+            lib_iphonesimulator_path = File.join(lib_iphonesimulator_dir, lib_file_name)
+            lib_aggregated_path = File.join(lib_aggregated_dir, lib_file_name)
+
+            rm_rf lib_iphoneos_dir if File.exists? lib_iphoneos_dir
+            rm_rf lib_iphonesimulator_dir if File.exists? lib_iphonesimulator_dir
+            rm_rf lib_aggregated_dir if File.exists? lib_aggregated_dir
+
+            args = ['clean', 'build', '-scheme', libconfig[:target], '-project', libname + ".xcodeproj", "-sdk", "iphoneos", "-configuration", "Release"]
+            ret = IPhoneBuild.run_and_trace($xcodebuild,args,{:rootdir => $startdir,:string_for_add_to_command_line => ' CONFIGURATION_BUILD_DIR='+lib_iphoneos_dir+' ARCHS="arm64 arm64e armv7 armv7s"'})
+
+            args = ['clean', 'build', '-scheme', libconfig[:target], '-project', libname + ".xcodeproj", "-sdk", "iphonesimulator", "-configuration", "Release"]
+            ret = IPhoneBuild.run_and_trace($xcodebuild,args,{:rootdir => $startdir,:string_for_add_to_command_line => ' CONFIGURATION_BUILD_DIR='+lib_iphonesimulator_dir+' ARCHS="i386 x86_64"'})
+
+            mkdir_p lib_aggregated_dir
+
+            #result_lib = File.join(libconfig[:path], libconfig[:target]+"-Aggregated", lib_file_name)
+            args = []
+            args << "-create"
+            args << "-output"
+            args << lib_aggregated_path
+            args << lib_iphonesimulator_path
+            args << lib_iphoneos_path
+            IPhoneBuild.run_and_trace("lipo",args,{:rootdir => $startdir})
+
+            #copy result
+            target_lib = File.join(lib_temp_dir, lib_file_name)
+            cp_r lib_aggregated_path,target_lib
+
+            # count lib
+            libs << lib_file_name
+        end
+
+        #build extensions
+        Dir.chdir currentdir
+        Rake::Task['build:iphone:extension_libs'].invoke
+        #Rake::Task["build:bundle:noxruby"].execute
+
+        #copy extensions libs to tmp folder
+        puts "$$$ $app_extensions_list = "+$app_extensions_list.to_s
+        $app_extensions_list.each do |ext, commin_ext_path |
+            lib_ext_path = File.join($app_builddir, "extensions", ext, "lib")
+            # copy all libs from this folder
+            psize = lib_ext_path.size+1
+            Dir.glob(File.join(lib_ext_path,'*.a')).each do |artefact|
+                puts "    $$$ artefact = "+artefact.to_s
+               if (File.file? artefact)
+                   relpath = artefact[psize..-1]
+                   libs << relpath
+                   target_lib = File.join(lib_temp_dir, relpath)
+                   cp_r artefact, target_lib
+               end
+            end
+        end
+
+        #join libs to one fat
+        Dir.chdir lib_temp_dir
+
+        #libtool -static -o result.a libCoreAPI.a
+        #args = ["-static", "-o", "RhodesFrameworkStaticLib.a"]
+        args = ["-static", "-o", "libRhodesExtensionsLib.a"]
+        lib_list = ""
+        libs.each do |lib|
+            args << lib
+            lib_list << File.join(lib_temp_dir, lib) + "\n"
+        end
+        #ret = IPhoneBuild.run_and_trace("libtool",args,{:rootdir => $startdir})
+
+        #build framework base
+        framework_dir = File.join($startdir, "platform/iphone/Framework/Rhodes")
+        File.open(File.join(framework_dir,"rhodeslibs.txt"),"w") { |f| f.write lib_list }
+
+        framework_build_dir = File.join(framework_dir, "build")
+        rm_rf framework_build_dir
+
+        args = ['clean', 'install', '-target', "Framework",'-project', "Rhodes.xcodeproj"]
+        Dir.chdir framework_dir
+        ret = IPhoneBuild.run_and_trace($xcodebuild,args,{:rootdir => $startdir})
+
+        # copy lib
+        #framework_lib_path = File.join(framework_dir, "Rhodes-Aggregated/Rhodes.framework/Rhodes")
+        #target_lib = File.join(lib_temp_dir, "Rhodes.a")
+        #cp_r framework_lib_path, target_lib
+        #libs << "Rhodes.a"
+
+        #copy final lib to framework
+        #rm_rf framework_lib_path
+        #cp_r File.join(lib_temp_dir, "RhodesFrameworkLib.a"), framework_lib_path
+
+        # copy result framework to target path
+        framework_path = File.join(framework_dir, "Rhodes-Aggregated/Rhodes.framework")
+        framework_target_path = File.join(target_path, "Rhodes.framework")
+        rm_rf framework_target_path if File.exists? framework_target_path
+        cp_r framework_path, framework_target_path
+
+        Dir.chdir currentdir
+        print_timestamp('build:iphone:rhodeslib_framework FINISH')
+    end
+
+    # [build:iphone:rhodeslib_prepare_xcodeproject]
+    #desc "Prepare customers's XCode project for Rhodes Framework - set target path :  rake build:iphone:rhodeslib_prepare_xcodeproject['/Users/myuser/my_xcode_project_fullpath']"
+    task :rhodeslib_prepare_xcodeproject, [:project_path, :target_name]  => ["config:set_iphone_platform", "config:common"] do |t, args|
+
+        print_timestamp('build:iphone:rhodeslib_prepare_xcodeproject START')
+        currentdir = Dir.pwd()
+
+
+        # copied from build upgrade bundle
+
+        project_path = args[:project_path]
+        target_name = args[:target_name]
+        project_dir = File.dirname(project_path)
+
+        require 'xcodeproj'
+
+        project = Xcodeproj::Project.open(project_path)
+
+
+
+
+
+
+
+
+        Dir.chdir currentdir
+        print_timestamp('build:iphone:rhodeslib_prepare_xcodeproject FINISH')
+    end
+
+=begin
+
+         #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
+
+             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 = File.join($app_path, "/project/iphone") + "/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
+
+             puts "app guid: #{$guid}"
+
+             mkdir_p File.join($simdir, $sdkver)
+
+             simapp = File.join($simdir, $sdkver, "Applications")
+             simlink = File.join($simdir, $sdkver, "Library", "Preferences")
+
+             $simrhodes = File.join(simapp, $guid)
+             chmod 0744, File.join($simrhodes, "rhorunner.app", "rhorunner") unless !File.exists?(File.join($simrhodes, "rhorunner.app", "rhorunner"))
+
+             mkdir_p File.join($simrhodes, "Documents")
+             mkdir_p File.join($simrhodes, "Library", "Preferences")
+             mkdir_p File.join($simrhodes, "Library", "Caches", "Private Documents")
+
+             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 + "/Library/Caches/Private Documents/rholog.txt"
+
+
+            #simpublic = simapp + "/" + $guid + "/Documents/apps/public"
+            simpublic = simapp + "/" + $guid + "/Library/Caches/Private Documents/apps/public"
+
+            apppublic = $app_path + "/sim-public-#{$sdkver}"
+
+
+            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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    # [build:iphone:rhodeslib_bundle]
+    desc "Build iphone rhobundle - set target path :  rake build:iphone:rhodeslib_bundle['/Users/myuser/mypath']"
+    task :rhodeslib_bundle, [:target_path]  => ["config:set_iphone_platform", "config:common"] do |t, args|
+
+        print_timestamp('build:iphone:rhodeslib_bundle START')
+        # copied from build upgrade bundle
+
+        target_path = args[:target_path]
+
+        $skip_checking_XCode = true
+        $skip_build_rhodes_main = true
+        $skip_build_extensions = true
+        $skip_build_xmls = true
+        $use_prebuild_data = true
+
+        Rake::Task['config:iphone'].invoke
+
+        appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
+        appname_fixed = appname.split(/[^a-zA-Z0-9]/).map { |w| w }.join("")
+
+        iphone_project = File.join($app_path, "project","iphone","#{appname_fixed}.xcodeproj")
+
+        if !File.exist?(iphone_project)
+
+          puts '$ make iphone XCode project for application'
+          Rake::Task['build:iphone:make_xcode_project'].invoke
+
+        end
+
+        Rake::Task['build:iphone:rhobundle'].invoke
+
+        #puts '$$$$$$$$$$$$$$$$$$'
+        #puts 'targetdir = '+$targetdir.to_s
+        #puts 'bindir = '+$bindir.to_s
+
+
+        mkdir_p target_path if not File.exists? target_path
+        # copy RhoBundle folder from $bindir to target_path
+
+        source_RhoBundle = File.join($bindir, "RhoBundle")
+        target_RhoBundle = File.join(target_path, "RhoBundle")
+        rm_rf target_RhoBundle if File.exists? target_RhoBundle
+        cp_r source_RhoBundle, target_path
+
+        print_timestamp('build:iphone:rhodeslib_bundle FINISH')
+    end
+
+
+
     desc "build upgrade package with full bundle"
     task :upgrade_package => ["config:set_iphone_platform", "config:common"] do
 
@@ -1750,7 +2166,8 @@ namespace "build" do
           "sdk" => sdk,
           "xcode_version" => xcode_version,
           "is_jsapp" => $js_application.to_s,
-          "is_nodejsapp" => $nodejs_application.to_s
+          "is_nodejsapp" => $nodejs_application.to_s,
+          "is_rubynodejsapp" => $rubynodejs_application.to_s
       }
 
       is_opt_c = is_options_was_changed( check_configuration, File.join(result_lib_folder, "lastbuildoptions.yml"))
@@ -1772,13 +2189,15 @@ namespace "build" do
           #rm_rf 'build'
           rm_rf result_lib_folder
 
-          args = ['build', '-target', xcodetarget, '-configuration', configuration, '-sdk', sdk, '-project', xcodeproject]
+          args = ['build', '-scheme', xcodetarget, '-configuration', configuration, '-sdk', sdk, '-project', xcodeproject]
 
           additional_string = ''
           if simulator
               #args << '-arch'
               #args << 'i386'
-              additional_string = ' ARCHS="i386 x86_64"'
+              additional_string = ' CONFIGURATION_BUILD_DIR='+result_lib_folder+' ARCHS="i386 x86_64"'
+          else
+              additional_string = ' CONFIGURATION_BUILD_DIR='+result_lib_folder+' ARCHS="arm64 arm64e armv7 armv7s"'
           end
 
           require   rootdir + '/lib/build/jake.rb'
@@ -1834,7 +2253,9 @@ namespace "build" do
       ENV["TARGET_TEMP_DIR"] ||= target_dir
       ENV["TEMP_FILES_DIR"] ||= ENV["TARGET_TEMP_DIR"]
 
-      ENV["ARCHS"] ||= simulator ? "i386 x86_64" : "armv7 armv7s arm64"
+      ENV["ARCHS"] ||= simulator ? "i386 x86_64" : "arm64 arm64e armv7 armv7s"
+
+
       ENV["RHO_ROOT"] = $startdir
 
       # added by dmitrys
@@ -1867,11 +2288,17 @@ namespace "build" do
             else
                  puts 'build script in extension already executable : '+build_script
             end
+            if simulator
+                ENV["XCODE_BUILD_ADDITIONAL_STRING_TO_COMMAND_LINE"] = ' ARCHS="i386 x86_64"'
+            else
+                ENV["XCODE_BUILD_ADDITIONAL_STRING_TO_COMMAND_LINE"] = ' ARCHS="arm64 arm64e armv7 armv7s"'
+            end
             #puts '$$$$$$$$$$$$$$$$$$     START'
             currentdir = Dir.pwd()
             Dir.chdir extpath
             sh %{$SHELL ./build}
             #Jake.run32("$SHELL "+build_script)
+            ENV["XCODE_BUILD_ADDITIONAL_STRING_TO_COMMAND_LINE"] = ''
             Dir.chdir currentdir
             #puts '$$$$$$$$$$$$$$$$$$     FINISH'
             #if File.executable? build_script
@@ -1979,6 +2406,8 @@ namespace "build" do
 
     end
 
+
+
     #[build:iphone:extension_libs]
     task :extension_libs => ["config:iphone", "build:bundle:noxruby"] do
       #chdir 'platform/iphone'
@@ -2013,7 +2442,13 @@ namespace "build" do
 
       puts "extpaths: #{$app_config["extpaths"].inspect.to_s}"
       $stdout.flush
+
+      print_timestamp('build extension libs START')
+
       $app_extensions_list.each do |ext, commin_ext_path |
+
+        puts " ±±± extension ["+ext.to_s+"],["+commin_ext_path.to_s+"]"
+
         if commin_ext_path != nil
 
           extpath = File.join( commin_ext_path, 'ext')
@@ -2023,6 +2458,9 @@ namespace "build" do
           xcodetarget = nil   #xcodetarget
           depfile = nil       #rebuild_deplist
 
+          puts " ±±± extension ext.yml ["+extyml.to_s+"]"
+
+
           if File.file? extyml
             extconf = Jake.config(File.open(extyml))
             #extconf_iphone = extconf['iphone']
@@ -2034,10 +2472,24 @@ namespace "build" do
             xcodetarget = extconf_iphone['xcodetarget'] if extconf_iphone and extconf_iphone['xcodetarget']
             depfile = extconf_iphone['rebuild_deplist'] if extconf_iphone and extconf_iphone['rebuild_deplist']
 
+
             libes = extconf["libraries"]
+            if extconf_iphone
+                if extconf_iphone["libraries"] != nil
+                    libes = extconf_iphone["libraries"]
+                end
+            end
+
+            puts " ±±± extension libes ["+libes.to_s+"] exttype ["+exttype.to_s+"]"
+
+
             if (libes != nil) && (exttype != 'prebuilt')
               libname = libes.first
               prebuiltpath = Dir.glob(File.join(extpath, '**', 'iphone'))
+
+              puts " ±±± extension prebuiltpath ["+prebuiltpath.to_s+"]"
+
+
               if prebuiltpath != nil && prebuiltpath.count > 0
 
                 print_timestamp('build extension "'+ext+'" START')
@@ -2058,7 +2510,7 @@ namespace "build" do
                  cp libpath, libsimpath
                  rm_f libpath
 
-                 ENV["ARCHS"] = nil
+                 ENV["ARCHS"] = "arm64 arm64e armv7 armv7s"
                  ENV["SDK_NAME"] = devsdk
                  build_extension_lib(extpath, devsdk, prebuiltpath, xcodeproject, xcodetarget, depfile)
                  cp libpath, libdevpath
@@ -2091,6 +2543,8 @@ namespace "build" do
           end
         end
       end
+      print_timestamp('build extension libs FINISH')
+
 
 
     end
@@ -2155,7 +2609,7 @@ namespace "build" do
            rm_rf 'build'
            rm_rf target_lib
 
-           args = ['build', '-target', xcodetarget, '-configuration', configuration, '-sdk', sdk, '-project', xcodeproject, '-quiet']
+           args = ['build', '-scheme', xcodetarget, '-configuration', configuration, '-sdk', sdk, '-project', xcodeproject, '-quiet']
 
            additional_string = ''
            if simulator
@@ -2363,8 +2817,14 @@ namespace "build" do
 
     #[build:iphone:setup_xcode_project]
     desc "make/change generated XCode project for build application"
-    task :setup_xcode_project => ["config:iphone"] do
+    task :setup_xcode_project, [:use_temp_keychain] do |t, args|
       print_timestamp('build:iphone:setup_xcode_project START')
+
+      args.with_defaults(:use_temp_keychain => "do_not_use_temp_keychain")
+      $use_temp_keychain = args[:use_temp_keychain] == "use_temp_keychain"
+
+      Rake::Task['config:iphone'].invoke
+
       appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
       appname_fixed = appname.split(/[^a-zA-Z0-9]/).map { |w| w }.join("")
 
@@ -2398,7 +2858,7 @@ namespace "build" do
               rm_rf File.join('project','iphone','toremoved')
               rm_rf File.join('project','iphone','toremovef')
             end
-            
+
             update_xcode_project_files_by_capabilities
 
         else
@@ -2531,7 +2991,9 @@ namespace "build" do
       end
 
       update_plist_block($app_path + "/project/iphone/Info.plist") do |hash|
-        hash['UIApplicationExitsOnSuspend'] = on_suspend_value
+        if !(on_suspend.nil?)
+            hash['UIApplicationExitsOnSuspend'] = on_suspend_value
+        end
       end
 
       #icon_has_gloss_effect = $app_config["iphone"]["IconHasGlossEffect"] unless $app_config["iphone"]["IconHasGlossEffect"].nil?
@@ -2555,7 +3017,7 @@ namespace "build" do
       #chdir $config["build"]["iphonepath"]
       chdir File.join($app_path, "project","iphone")
 
-      args = ['build', '-target', 'rhorunner', '-configuration', $configuration, '-sdk', $sdk, '-project', appname_project, '-quiet']
+      args = ['build', '-scheme', 'rhorunner', '-configuration', $configuration, '-sdk', $sdk, '-project', appname_project, '-quiet']
 
       additional_string = ''
       if $sdk =~ /iphonesimulator/
@@ -3181,6 +3643,9 @@ namespace "clean" do
 
       iphone_project_folder = File.join($app_path, "project","iphone")
 
+      iphone_build_folder = File.join(iphone_project_folder,"build")
+      rm_rf iphone_build_folder if File.exists? iphone_build_folder
+
       appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
       appname_fixed = appname.split(/[^a-zA-Z0-9]/).map { |w| w }.join("")
       appname_project = appname_fixed.slice(0, 1).capitalize + appname_fixed.slice(1..-1) + ".xcodeproj"
@@ -3190,7 +3655,7 @@ namespace "clean" do
 
         chdir iphone_project_folder
 
-        args = ['clean', '-target', 'rhorunner', '-configuration', $configuration, '-sdk', $sdk, '-project', appname_project, '-quiet']
+        args = ['clean', '-scheme', 'rhorunner', '-configuration', $configuration, '-sdk', $sdk, '-project', appname_project, '-quiet']
         if RUBY_PLATFORM =~ /(win|w)32$/
         else
           ret = IPhoneBuild.run_and_trace($xcodebuild,args,{:rootdir => $startdir})
@@ -3286,9 +3751,9 @@ namespace "clean" do
 
       rm_rf 'build'
 
-      args = ['clean', '-target', xcodetarget, '-configuration', configuration, '-sdk', sdk, '-project', xcodeproject]
+      args = ['clean', '-scheme', xcodetarget, '-configuration', configuration, '-sdk', sdk, '-project', xcodeproject]
 
-      additional_string = ''
+      additional_string = ' ARCHS="arm64 arm64e armv7 armv7s"'
       if simulator
       #    args << '-arch'
       #    args << 'i386'
@@ -3328,7 +3793,7 @@ namespace "clean" do
       #ENV["TARGET_TEMP_DIR"] ||= target_dir
       ENV["TEMP_FILES_DIR"] ||= ENV["TARGET_TEMP_DIR"]
 
-      ENV["ARCHS"] ||= simulator ? "i386 x86_64" : "armv7 armv7s arm64"
+      ENV["ARCHS"] ||= simulator ? "i386 x86_64" : "arm64 arm64e armv7 armv7s"
       ENV["RHO_ROOT"] = $startdir
 
       # added by dmitrys
@@ -3445,10 +3910,17 @@ namespace "device" do
   namespace "iphone" do
     # device:iphone:production
     desc "Builds and signs iphone for production"
-    task :production => ["config:iphone", "build:iphone:rhodes"] do
+    task :production, [:use_temp_keychain] do |t, args|
       print_timestamp('device:iphone:production START')
       #copy build results to app folder
 
+      args.with_defaults(:use_temp_keychain => "do_not_use_temp_keychain")
+      $use_temp_keychain = args[:use_temp_keychain] == "use_temp_keychain"
+
+      Rake::Task['config:iphone'].invoke
+      Rake::Task['build:iphone:rhodes'].invoke
+
+
       app_path = File.join($app_path, 'bin', 'target', 'iOS', $sdk, $configuration)
 
       iphone_path = File.join($app_path, "/project/iphone")
@@ -3776,7 +4248,7 @@ namespace "device" do
 
               File.open(entitlements, '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 "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"https://www.apple.com/DTDs/PropertyList-1.0.dtd\">"
                   f.puts "<plist version=\"1.0\">"
                   f.puts "<dict>"
                   f.puts "<key>aps-environment</key>"