rhodes 6.2.0 → 7.5.1

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 = []
@@ -36,8 +38,8 @@ APPLE_PUSH = 0
 FCM_PUSH = 1
 UNKNOWN_PUSH = -1
 
-puts 'iphone.rake execute' if USE_TRACES
-puts 'ENV["RHO_BUNDLE_BUILD_LOG_FILE"] = '+ENV["RHO_BUNDLE_BUILD_LOG_FILE"].to_s if USE_TRACES
+puts 'iphone.rake execute' if Rake.application.options.trace
+puts 'ENV["RHO_BUNDLE_BUILD_LOG_FILE"] = '+ENV["RHO_BUNDLE_BUILD_LOG_FILE"].to_s if Rake.application.options.trace
 if (ENV["RHO_BUNDLE_BUILD_LOG_FILE"] != nil)
     $out_file_buf_path = ENV["RHO_BUNDLE_BUILD_LOG_FILE"]
     $out_file_buf_enable = true
@@ -142,6 +144,23 @@ def get_ext_plist_changes(ext_path_to_cfg_map)
   return extension_name, changed_value
 end
 
+def generate_appname
+    appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
+    return appname
+end
+
+def generate_appname_fixed
+    appname = generate_appname
+    appname_fixed = appname.split(/[^a-zA-Z0-9]/).map { |w| w }.join("")
+    return appname_fixed
+end
+
+def generate_correct_xcode_project_path
+    appname_fixed = generate_appname_fixed
+    iphone_project = File.join($app_path, "project","iphone","#{appname_fixed}.xcodeproj")
+    return iphone_project
+end
+
 
 #
 # def set_ui_prerendered_icon(val)
@@ -253,8 +272,8 @@ end
 
 
 def update_plist_procedure
-      appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
-      appname_fixed = appname.split(/[^a-zA-Z0-9]/).map { |w| w }.join("")
+      appname = generate_appname
+      appname_fixed = generate_appname_fixed
 
       vendor = $app_config['vendor'] ? $app_config['vendor'] : "rhomobile"
       bundle_identifier = "com.#{vendor}.#{appname}"
@@ -278,8 +297,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
@@ -381,11 +401,7 @@ end
 
 def set_signing_identity(identity,profile,entitlements,provisioning_style,development_team)
 
-  appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
-  appname_fixed = appname.split(/[^a-zA-Z0-9]/).map { |w| (w.capitalize) }.join("")
-
-  #fname = $config["build"]["iphonepath"] + "/rhorunner.xcodeproj/project.pbxproj"
-  fname = $app_path + "/project/iphone" + "/" + appname_fixed + ".xcodeproj/project.pbxproj"
+  fname = File.join(generate_correct_xcode_project_path, "project.pbxproj")
   buf = ""
   File.new(fname,"r").read.each_line do |line|
     if entitlements != nil
@@ -412,7 +428,20 @@ def set_signing_identity(identity,profile,entitlements,provisioning_style,develo
   File.open(fname,"w") { |f| f.write(buf) }
 end
 
+def update_xcodeproject_for_bitcode
+    value = "NO"
+    if $enable_bitcode
+        value = "YES"
+    end
+    fname = File.join(generate_correct_xcode_project_path, "project.pbxproj")
+    buf = ""
+    File.new(fname,"r").read.each_line do |line|
+      line.gsub!(/ENABLE_BITCODE = .*;/,"ENABLE_BITCODE = #{value};")
+      buf << line
+    end
 
+    File.open(fname,"w") { |f| f.write(buf) }
+end
 
 def make_app_info
   fname = File.join($app_path, 'bin', 'target', 'iOS', $sdk, $configuration, 'app_info.txt')
@@ -631,10 +660,7 @@ LOADINGIMAGES = [
 ]
 
 def remove_lines_from_xcode_project(array_with_substrings)
-    appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
-    appname_fixed = appname.split(/[^a-zA-Z0-9]/).map { |w| (w.capitalize) }.join("")
-
-    fname = $app_path + "/project/iphone" + "/" + appname_fixed + ".xcodeproj/project.pbxproj"
+    fname = File.join(generate_correct_xcode_project_path, "project.pbxproj")
     buf = ""
     File.new(fname,"r").read.each_line do |line|
         is_remove = false
@@ -722,6 +748,185 @@ def set_default_images(make_bak, plist_hash)
 
 end
 
+
+
+def update_xcode_project_files_by_extensions
+    fname = File.join(generate_correct_xcode_project_path, "project.pbxproj")
+    buf = ""
+
+    replaces = {}
+
+    #$app_extension_cfg[extpath] = extconf
+    #$app_extensions_list[extname] = extpath
+
+    custom_frameworks_list = []
+    system_frameworks_list = []
+    resources_list = []
+
+    IPhoneBuild.log Logger::DEBUG,  "***** process extensions for iphone frameworks and resources START"
+
+    frameworks_target_path = File.join($app_path, 'project', 'iphone', "Frameworks")
+    FileUtils.mkdir_p frameworks_target_path
+    resources_target_path = File.join($app_path, 'project', 'iphone')
+
+
+    $app_extensions_list.each do |extname, extpath|
+        IPhoneBuild.log Logger::DEBUG,  "     ** extension ["+extname+"] path ["+extpath+"]"
+        extconf = $app_extension_cfg[extpath]
+        if extconf != nil
+            if extconf["iphone"] != nil
+                IPhoneBuild.log Logger::DEBUG, "          ** iphone section found"
+                frameworks_file = extconf["iphone"]["frameworks_list"]
+                frameworks_path = extconf["iphone"]["frameworks_path"]
+                if (frameworks_file != nil) && (frameworks_path != nil)
+                    IPhoneBuild.log Logger::DEBUG, "          ** frameworks_file = "+frameworks_file.to_s
+                    IPhoneBuild.log Logger::DEBUG, "          ** frameworks_path = "+frameworks_path.to_s
+                    File.new(File.join(extpath, frameworks_file),"r").read.each_line do |line|
+                       item = line.chomp
+                       if item.size > 0
+                           IPhoneBuild.log Logger::DEBUG, "               ** framework item = "+item.to_s
+                           framework_path = File.join(extpath, frameworks_path, item)
+                           IPhoneBuild.log Logger::DEBUG, "                 ** framework path = "+framework_path.to_s
+                           if File.exist?(framework_path)
+                               # custom framework
+                               IPhoneBuild.log Logger::DEBUG, "                 ** custom !"
+                               custom_frameworks_list << item
+                               # copy frameworks to project folder
+                               cp_r framework_path, frameworks_target_path
+                           else
+                               # system framework
+                               IPhoneBuild.log Logger::DEBUG, "                 ** system !"
+                               system_frameworks_list << item
+                           end
+                       end
+                    end
+                end
+
+                resources_file = extconf["iphone"]["resources_list"]
+                resources_path = extconf["iphone"]["resources_path"]
+                if (resources_file != nil) && (resources_path != nil)
+                    IPhoneBuild.log Logger::DEBUG, "          ** resources_file = "+resources_file.to_s
+                    IPhoneBuild.log Logger::DEBUG, "          ** resources_path = "+resources_path.to_s
+                    File.new(File.join(extpath, resources_file),"r").read.each_line do |line|
+                       item = line.chomp
+                       if item.size > 0
+                           IPhoneBuild.log Logger::DEBUG, "               ** resources item = "+item.to_s
+                           resources_path = File.join(resources_path, item)
+                           resources_list << item
+                           if File.exist?(resources_path)
+                               IPhoneBuild.log Logger::DEBUG, "                 ** copy resource !"
+                               cp_r File.join(extpath, resources_path, item), resources_target_path
+                           else
+                               IPhoneBuild.log Logger::DEBUG, "                 ** resource file not found !"
+                           end
+                       end
+                    end
+                end
+
+            end
+        end
+    end
+
+    IPhoneBuild.log Logger::DEBUG, "***** custom_frameworks_list = "+custom_frameworks_list.to_s
+    IPhoneBuild.log Logger::DEBUG, "***** system_frameworks_list = "+system_frameworks_list.to_s
+    IPhoneBuild.log Logger::DEBUG, "***** resources_list = "+resources_list.to_s
+
+    # prepare replaces{}
+    replaces["<PLACEHOLDER FOR FRAMEWORKS 01>"] = []
+    replaces["<PLACEHOLDER FOR RESOURCES 01>"] = []
+    replaces["<PLACEHOLDER FOR FRAMEWORKS 02>"] = []
+    replaces["<PLACEHOLDER FOR RESOURCES 02>"] = []
+    replaces["<PLACEHOLDER FOR FRAMEWORKS 03>"] = []
+    replaces["<PLACEHOLDER FOR RESOURCES 03>"] = []
+    replaces["<PLACEHOLDER FOR FRAMEWORKS 04>"] = []
+    replaces["<PLACEHOLDER FOR RESOURCES 04>"] = []
+
+    frameworks_index = 1
+    resources_index = 1
+
+    custom_frameworks_list.each do |item|
+        uid1 = "AC1"+( "%03d" % frameworks_index )+"5F20615B6C00B818B8"
+        uid2 = "BC1"+( "%03d" % frameworks_index )+"5F20615B6C00B818B8"
+        frameworks_index = frameworks_index + 1
+        wrapper = "wrapper.framework"
+        if item.end_with?(".xcframework")
+            wrapper = "wrapper.xcframework"
+        end
+        replaces["<PLACEHOLDER FOR FRAMEWORKS 01>"] << ("        "+uid1+" /* "+item+" in Frameworks */ = {isa = PBXBuildFile; fileRef = "+uid2+" /* "+item+" */; };")
+        replaces["<PLACEHOLDER FOR FRAMEWORKS 02>"] << ("        "+uid2+" /* "+item+" */ = {isa = PBXFileReference; lastKnownFileType = "+wrapper+"; name = "+item+"; path = Frameworks/"+item+"; sourceTree = \"<group>\"; };")
+        replaces["<PLACEHOLDER FOR FRAMEWORKS 03>"] << ("        "+uid1+" /* "+item+" */,")
+        replaces["<PLACEHOLDER FOR FRAMEWORKS 04>"] << ("            "+uid2+" /* "+item+" */,")
+    end
+
+    system_frameworks_list.each do |item|
+        uid1 = "AC1"+( "%03d" % frameworks_index )+"5F20615B6C00B818B8"
+        uid2 = "BC1"+( "%03d" % frameworks_index )+"5F20615B6C00B818B8"
+        frameworks_index = frameworks_index + 1
+        wrapper = "wrapper.framework"
+        if item.end_with?(".xcframework")
+            wrapper = "wrapper.xcframework"
+        end
+        replaces["<PLACEHOLDER FOR FRAMEWORKS 01>"] << ("        "+uid1+" /* "+item+" in Frameworks */ = {isa = PBXBuildFile; fileRef = "+uid2+" /* "+item+" */; };")
+        replaces["<PLACEHOLDER FOR FRAMEWORKS 02>"] << ("        "+uid2+" /* "+item+" */ = {isa = PBXFileReference; lastKnownFileType = "+wrapper+"; name = "+item+"; path = System/Library/Frameworks/Frameworks/"+item+"; sourceTree = SDKROOT; };")
+        replaces["<PLACEHOLDER FOR FRAMEWORKS 03>"] << ("        "+uid1+" /* "+item+"  in Frameworks */,")
+        replaces["<PLACEHOLDER FOR FRAMEWORKS 04>"] << ("            "+uid2+" /* "+item+" */,")
+    end
+
+    resources_list.each do |item|
+        uid1 = "CC1"+( "%03d" % resources_index )+"5F20615B6C00B818B8"
+        uid2 = "DC1"+( "%03d" % resources_index )+"5F20615B6C00B818B8"
+        resources_index = resources_index + 1
+        replaces["<PLACEHOLDER FOR RESOURCES 01>"] << ("        "+uid1+" /* "+item+" in Resources */ = {isa = PBXBuildFile; fileRef = "+uid2+" /* "+item+" */; };")
+        replaces["<PLACEHOLDER FOR RESOURCES 02>"] << ("        "+uid2+" /* "+item+" */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = \""+item+"\"; sourceTree = \"<group>\"; };")
+        replaces["<PLACEHOLDER FOR RESOURCES 03>"] << ("            "+uid2+" /* "+item+" */,")
+        replaces["<PLACEHOLDER FOR RESOURCES 04>"] << ("            "+uid1+" /* "+item+" in Resources */,")
+    end
+
+    if ($ldflags_array != nil)
+        $ldflags_array.each do |libfile|
+            uid1 = "AC1"+( "%03d" % frameworks_index )+"5F20615B6C00B818B8"
+            uid2 = "BC1"+( "%03d" % frameworks_index )+"5F20615B6C00B818B8"
+            frameworks_index = frameworks_index + 1
+
+            libfilename = File.basename(libfile)
+
+            replaces["<PLACEHOLDER FOR FRAMEWORKS 01>"] << ("        "+uid1+" /* "+libfilename+" in Frameworks */ = {isa = PBXBuildFile; fileRef = "+uid2+" /* "+libfilename+" */; };")
+            replaces["<PLACEHOLDER FOR FRAMEWORKS 02>"] << ("        "+uid2+" /* "+libfilename+" */ = {isa = PBXFileReference; lastKnownFileType = "+"archive.ar"+"; name = "+libfilename+"; path = "+libfilename+"; sourceTree = \"<group>\"; };")
+            replaces["<PLACEHOLDER FOR FRAMEWORKS 03>"] << ("        "+uid1+" /* "+libfilename+" */,")
+            replaces["<PLACEHOLDER FOR FRAMEWORKS 04>"] << ("            "+uid2+" /* "+libfilename+" */,")
+        end
+    end
+
+
+
+    IPhoneBuild.log Logger::DEBUG, "  ***** process XCode file START"
+    File.new(fname,"r").read.each_line do |line|
+       lines_instead_of_line = []
+       # check for replaces
+       is_replaced = false
+       replaces.each do |key, lines|
+          if line.include? key
+              is_replaced = true
+              IPhoneBuild.log Logger::DEBUG, "    ** found "+key
+              IPhoneBuild.log Logger::DEBUG, "    ** replaced to: "
+              lines.each do |item_line|
+                  IPhoneBuild.log Logger::DEBUG, "      ** "+item_line
+                  buf << (item_line + "\n")
+              end
+          end
+       end
+       if !is_replaced
+           buf << line
+       end
+    end
+    IPhoneBuild.log Logger::DEBUG, "  ***** process XCode file FINISH"
+    File.open(fname,"w") { |f| f.write(buf) }
+
+    IPhoneBuild.log Logger::DEBUG, "***** process extensions for iphone frameworks and resources FINISH"
+
+end
+
+
 def update_xcode_project_files_by_capabilities
     info_plist = $app_path + "/project/iphone/Info.plist"
     dev_ent = $app_path + "/project/iphone/rhorunner_development.entitlements"
@@ -785,14 +990,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
 
@@ -861,61 +1066,6 @@ def update_xcode_project_files_by_capabilities
         remove_lines_from_xcode_project(['com.apple.Push = {enabled = 1;};'])
     end
 
-    if $push_type == APPLE_PUSH || !$ios_push_capability
-      lines_to_delete = []
-      lines_to_delete << 'AC1F5D5F20615B6C00B818B8 /* GoogleToolboxForMac.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC1F5D5620615B6B00B818B8 /* GoogleToolboxForMac.framework */; };'
-      lines_to_delete << 'AC1F5D6020615B6C00B818B8 /* FirebaseAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC1F5D5720615B6B00B818B8 /* FirebaseAnalytics.framework */; };'
-      lines_to_delete << 'AC1F5D6120615B6C00B818B8 /* FirebaseCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC1F5D5820615B6B00B818B8 /* FirebaseCore.framework */; };'
-      lines_to_delete << 'AC1F5D6220615B6C00B818B8 /* FirebaseCoreDiagnostics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC1F5D5920615B6B00B818B8 /* FirebaseCoreDiagnostics.framework */; };'
-      lines_to_delete << 'AC1F5D6320615B6C00B818B8 /* FirebaseInstanceID.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC1F5D5A20615B6B00B818B8 /* FirebaseInstanceID.framework */; };'
-      lines_to_delete << 'AC1F5D6420615B6C00B818B8 /* FirebaseMessaging.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC1F5D5B20615B6C00B818B8 /* FirebaseMessaging.framework */; };'
-      lines_to_delete << 'AC1F5D6520615B6C00B818B8 /* FirebaseNanoPB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC1F5D5C20615B6C00B818B8 /* FirebaseNanoPB.framework */; };'
-      lines_to_delete << 'AC1F5D6620615B6C00B818B8 /* Protobuf.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC1F5D5D20615B6C00B818B8 /* Protobuf.framework */; };'
-      lines_to_delete << 'AC1F5D6720615B6C00B818B8 /* nanopb.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC1F5D5E20615B6C00B818B8 /* nanopb.framework */; };'
-      lines_to_delete << 'AC1F5D6920615B8E00B818B8 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC1F5D6820615B8600B818B8 /* StoreKit.framework */; };'
-      lines_to_delete << 'ACB0C9CB2058111F00A7F5E0 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = ACB0C9CA2058111F00A7F5E0 /* GoogleService-Info.plist */; };'
-
-      lines_to_delete << 'AC1F5D5620615B6B00B818B8 /* GoogleToolboxForMac.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleToolboxForMac.framework; path = Frameworks/GoogleToolboxForMac.framework; sourceTree = "<group>"; };'
-      lines_to_delete << 'AC1F5D5720615B6B00B818B8 /* FirebaseAnalytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FirebaseAnalytics.framework; path = Frameworks/FirebaseAnalytics.framework; sourceTree = "<group>"; };'
-      lines_to_delete << 'AC1F5D5820615B6B00B818B8 /* FirebaseCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FirebaseCore.framework; path = Frameworks/FirebaseCore.framework; sourceTree = "<group>"; };'
-      lines_to_delete << 'AC1F5D5920615B6B00B818B8 /* FirebaseCoreDiagnostics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FirebaseCoreDiagnostics.framework; path = Frameworks/FirebaseCoreDiagnostics.framework; sourceTree = "<group>"; };'
-      lines_to_delete << 'AC1F5D5A20615B6B00B818B8 /* FirebaseInstanceID.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FirebaseInstanceID.framework; path = Frameworks/FirebaseInstanceID.framework; sourceTree = "<group>"; };'
-      lines_to_delete << 'AC1F5D5B20615B6C00B818B8 /* FirebaseMessaging.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FirebaseMessaging.framework; path = Frameworks/FirebaseMessaging.framework; sourceTree = "<group>"; };'
-      lines_to_delete << 'AC1F5D5C20615B6C00B818B8 /* FirebaseNanoPB.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FirebaseNanoPB.framework; path = Frameworks/FirebaseNanoPB.framework; sourceTree = "<group>"; };'
-      lines_to_delete << 'AC1F5D5D20615B6C00B818B8 /* Protobuf.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Protobuf.framework; path = Frameworks/Protobuf.framework; sourceTree = "<group>"; };'
-      lines_to_delete << 'AC1F5D5E20615B6C00B818B8 /* nanopb.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = nanopb.framework; path = Frameworks/nanopb.framework; sourceTree = "<group>"; };'
-      lines_to_delete << 'AC1F5D6820615B8600B818B8 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.1.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; };'
-      lines_to_delete << 'ACB0C9CA2058111F00A7F5E0 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };'
-
-      lines_to_delete << 'AC1F5D6920615B8E00B818B8 /* StoreKit.framework */,'
-      lines_to_delete << 'AC1F5D6020615B6C00B818B8 /* FirebaseAnalytics.framework */,'
-      lines_to_delete << 'AC1F5D6120615B6C00B818B8 /* FirebaseCore.framework */,'
-      lines_to_delete << 'AC1F5D6220615B6C00B818B8 /* FirebaseCoreDiagnostics.framework */,'
-      lines_to_delete << 'AC1F5D6320615B6C00B818B8 /* FirebaseInstanceID.framework */,'
-      lines_to_delete << 'AC1F5D6420615B6C00B818B8 /* FirebaseMessaging.framework */,'
-      lines_to_delete << 'AC1F5D6520615B6C00B818B8 /* FirebaseNanoPB.framework */,'
-      lines_to_delete << 'AC1F5D5F20615B6C00B818B8 /* GoogleToolboxForMac.framework */,'
-      lines_to_delete << 'AC1F5D6720615B6C00B818B8 /* nanopb.framework */,'
-      lines_to_delete << 'AC1F5D6620615B6C00B818B8 /* Protobuf.framework */,'
-
-      lines_to_delete << 'ACB0C9CA2058111F00A7F5E0 /* GoogleService-Info.plist */,'
-
-      lines_to_delete << 'AC1F5D6820615B8600B818B8 /* StoreKit.framework */,'
-      lines_to_delete << 'AC1F5D5720615B6B00B818B8 /* FirebaseAnalytics.framework */,'
-      lines_to_delete << 'AC1F5D5820615B6B00B818B8 /* FirebaseCore.framework */,'
-      lines_to_delete << 'AC1F5D5920615B6B00B818B8 /* FirebaseCoreDiagnostics.framework */,'
-      lines_to_delete << 'AC1F5D5A20615B6B00B818B8 /* FirebaseInstanceID.framework */,'
-      lines_to_delete << 'AC1F5D5B20615B6C00B818B8 /* FirebaseMessaging.framework */,'
-      lines_to_delete << 'AC1F5D5C20615B6C00B818B8 /* FirebaseNanoPB.framework */,'
-      lines_to_delete << 'AC1F5D5620615B6B00B818B8 /* GoogleToolboxForMac.framework */,'
-      lines_to_delete << 'AC1F5D5E20615B6C00B818B8 /* nanopb.framework */,'
-      lines_to_delete << 'AC1F5D5D20615B6C00B818B8 /* Protobuf.framework */,'
-
-      lines_to_delete << 'ACB0C9CB2058111F00A7F5E0 /* GoogleService-Info.plist in Resources */,'
-
-      remove_lines_from_xcode_project(lines_to_delete)
-    end
-
     #keychain access
     enable_keychain = false
     if $app_config['capabilities'] != nil
@@ -1044,8 +1194,54 @@ 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
+
+
+def get_archs_string_simulator
+    archs = "x86_64"
+    if !$app_config["iphone"].nil?
+        archs_array = $app_config["iphone"]["ARCHS_simulator"]
+        if !archs_array.nil?
+            if archs_array.kind_of?(Array)
+                archs = ""
+                archs_array.each do |ar|
+                    if archs != ""
+                        archs = archs + " "
+                    end
+                    archs = archs + ar.to_s
+                end
+            else
+                puts "ERROR !  ARCHS_simulator parameters in build.yml must be a array !"
+            end
+        end
+    end
+    return archs
+end
+
+def get_archs_string_device
+    archs = "arm64 armv7"
+    if !$app_config["iphone"].nil?
+        archs_array = $app_config["iphone"]["ARCHS_device"]
+        if !archs_array.nil?
+            if archs_array.kind_of?(Array)
+                archs = ""
+                archs_array.each do |ar|
+                    if archs != ""
+                        archs = archs + " "
+                    end
+                    archs = archs + ar.to_s
+                end
+            else
+                puts "ERROR !  ARCHS_device parameters in build.yml must be a array !"
+            end
+        end
+    end
+    return archs
 end
 
+
 namespace "config" do
 
   namespace "iphone" do
@@ -1139,12 +1335,27 @@ namespace "config" do
         end
     end
 
+    # unpack Google frameworks zip- only in case of sources of RHodes used - in case of GEM zip unpacked during installation
+    if RUBY_PLATFORM =~ /darwin/
+        currentdir = Dir.pwd()
+        if File.exists?(File.dirname(__FILE__) + "/../../../lib/extensions/fcm-push/ext/iphone/Frameworks/Frameworks.zip")
+            if !File.exists?(File.dirname(__FILE__)+ "/../../../lib/extensions/fcm-push/ext/iphone/Frameworks/FirebaseCore.xcframework")
+               chdir (File.dirname(__FILE__) + "/../../../lib/extensions/fcm-push/ext/iphone/Frameworks/")
+               system("unzip Frameworks.zip")
+               #rm_rf "Frameworks.zip"
+            end
+        end
+        Dir.chdir currentdir
+    end
+
+
+
     $devroot = '/Applications/Xcode.app/Contents/Developer' if $devroot.nil?
     $iphonesim = File.join($startdir, 'res/build-tools/iphonesim/build/Release/iphonesim_51') if $iphonesim.nil?
 
     #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 +1377,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
@@ -1233,6 +1444,7 @@ namespace "config" do
       $configuration = $config["env"]["iphone"]["configuration"]
       $sdk = $config["env"]["iphone"]["sdk"]
       $emulatortarget = 'iphone'
+      $enable_bitcode = true
     else
       $signidentity = $app_config["iphone"]["codesignidentity"]
       $provisionprofile = $app_config["iphone"]["provisionprofile"]
@@ -1245,8 +1457,21 @@ namespace "config" do
       if $emulatortarget == nil
          $emulatortarget = 'iphone'
       end
+      en_bitcode = $app_config["iphone"]["enable_bitcode"]
+      $enable_bitcode = true
+      if en_bitcode != nil
+          if (en_bitcode.class == TrueClass) || (en_bitcode.class == FalseClass)
+              $enable_bitcode = en_bitcode
+          else
+              if (en_bitcode == "false") || (en_bitcode == "0") || (en_bitcode == 0)
+                  $enable_bitcode = false
+              end
+          end
+      end
     end
 
+    puts "$enable_bitcode = "+$enable_bitcode.to_s
+
     if $entitlements == ""
         $entitlements = nil
     end
@@ -1266,6 +1491,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 +1508,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 +1548,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 +1719,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
+
+        iphone_project = generate_correct_xcode_project_path
+
+        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"]
+            args << 'OTHER_CFLAGS="-fembed-bitcode -DHAVE_CONFIG_H -DUSE_RHOSSL"' if $enable_bitcode
+            ret = IPhoneBuild.run_and_trace($xcodebuild,args,{:rootdir => $startdir,:string_for_add_to_command_line => ' CONFIGURATION_BUILD_DIR='+lib_iphoneos_dir+' ARCHS="'+get_archs_string_device+'"'})
+
+            args = ['clean', 'build', '-scheme', libconfig[:target], '-project', libname + ".xcodeproj", "-sdk", "iphonesimulator", "-configuration", "Release"]
+            args << 'OTHER_CFLAGS="-fembed-bitcode -DHAVE_CONFIG_H -DUSE_RHOSSL"' if $enable_bitcode
+            ret = IPhoneBuild.run_and_trace($xcodebuild,args,{:rootdir => $startdir,:string_for_add_to_command_line => ' CONFIGURATION_BUILD_DIR='+lib_iphonesimulator_dir+' ARCHS="'+get_archs_string_simulator+'"'})
+
+            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
+
+
+        ENV["TAU_DEV_ARCHS"] = get_archs_string_device
+        ENV["TAU_SIM_ARCHS"] = get_archs_string_simulator
+
+        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
+
+        iphone_project = generate_correct_xcode_project_path
+
+        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
 
@@ -1484,10 +2120,7 @@ namespace "build" do
 
         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")
+        iphone_project = generate_correct_xcode_project_path
 
         if !File.exist?(iphone_project)
 
@@ -1531,10 +2164,7 @@ namespace "build" do
         #puts 'targetdir = '+$targetdir.to_s
         #puts 'bindir = '+$bindir.to_s
 
-        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")
+        iphone_project = generate_correct_xcode_project_path
 
         if !File.exist?(iphone_project)
 
@@ -1711,6 +2341,7 @@ namespace "build" do
       bindir = ENV['PLATFORM_DEVELOPER_BIN_DIR']
       sdkroot = ENV['SDKROOT']
       arch = ENV['ARCHS']
+      #other_cflags = ENV['OTHER_CFLAGS']
       gccbin = bindir + '/gcc-4.2'
       arbin = bindir + '/ar'
       #xcode_version = ENV['XCODE_VERSION_ACTUAL']
@@ -1732,6 +2363,7 @@ namespace "build" do
 
       result_lib = result_lib_folder + '/lib'+xcodetarget+'.a'
       target_lib = targetdir + '/lib'+xcodetarget+'.a'
+      lib_in_root = File.join($app_path, "project", "iphone", 'ExtLibs', 'lib'+xcodetarget+'.a')
 
       puts "BEGIN build xcode extension : ["+extpath+"]"
       puts "      result_lib : ["+result_lib+"]"
@@ -1750,7 +2382,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 +2405,16 @@ 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]
+          args << 'OTHER_CFLAGS="-fembed-bitcode"' if $enable_bitcode
 
           additional_string = ''
           if simulator
               #args << '-arch'
               #args << 'i386'
-              additional_string = ' ARCHS="i386 x86_64"'
+              additional_string = ' CONFIGURATION_BUILD_DIR='+result_lib_folder+' ARCHS="'+get_archs_string_simulator+'"'
+          else
+              additional_string = ' CONFIGURATION_BUILD_DIR='+result_lib_folder+' ARCHS="'+get_archs_string_device+'"'
           end
 
           require   rootdir + '/lib/build/jake.rb'
@@ -1793,6 +2429,7 @@ namespace "build" do
       end
 
       cp result_lib,target_lib
+      cp result_lib,lib_in_root
 
       Dir.chdir currentdir
       puts "END build xcode extension : ["+extpath+"]"
@@ -1834,7 +2471,13 @@ 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 ? get_archs_string_simulator : get_archs_string_device
+
+      if $enable_bitcode
+          ENV["RHO_OTHER_CFLAGS"] ||= "-fembed-bitcode"
+      end
+
+
       ENV["RHO_ROOT"] = $startdir
 
       # added by dmitrys
@@ -1867,11 +2510,23 @@ namespace "build" do
             else
                  puts 'build script in extension already executable : '+build_script
             end
+            additional_string = ""
+            if simulator
+                additional_string = ' ARCHS="'+get_archs_string_simulator+'"'
+            else
+                additional_string = ' ARCHS="'+get_archs_string_device+'"'
+            end
+            if $enable_bitcode
+                additional_string = additional_string + ' OTHER_CFLAGS="-fembed-bitcode"'
+            end
+            ENV["XCODE_BUILD_ADDITIONAL_STRING_TO_COMMAND_LINE"] = additional_string
+
             #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,7 +2634,10 @@ namespace "build" do
 
     end
 
+
+
     #[build:iphone:extension_libs]
+    desc "Build all extensions for all platforms and make one accumulated lib (*.a file) for each extension"
     task :extension_libs => ["config:iphone", "build:bundle:noxruby"] do
       #chdir 'platform/iphone'
       chdir File.join($app_path, 'project/iphone')
@@ -2013,7 +2671,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 +2687,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 +2701,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')
@@ -2051,14 +2732,15 @@ namespace "build" do
                  libbinpath = File.join($app_builddir, "extensions", ext, "lib", "lib"+libname+".a")
 
                  ENV["TARGET_TEMP_DIR"] = prebuiltpath
-                 ENV["ARCHS"] = "i386 x86_64"
+                 ENV["ARCHS"] = get_archs_string_simulator
+                 ENV["RHO_OTHER_CFLAGS"] = "-fembed-bitcode" if $enable_bitcode
                  ENV["SDK_NAME"] = simsdk
 
                  build_extension_lib(extpath, simsdk, prebuiltpath, xcodeproject, xcodetarget, depfile)
                  cp libpath, libsimpath
                  rm_f libpath
 
-                 ENV["ARCHS"] = nil
+                 ENV["ARCHS"] = get_archs_string_device
                  ENV["SDK_NAME"] = devsdk
                  build_extension_lib(extpath, devsdk, prebuiltpath, xcodeproject, xcodetarget, depfile)
                  cp libpath, libdevpath
@@ -2091,6 +2773,8 @@ namespace "build" do
           end
         end
       end
+      print_timestamp('build extension libs FINISH')
+
 
 
     end
@@ -2104,8 +2788,9 @@ namespace "build" do
       if ENV["TARGET_TEMP_DIR"] and ENV["TARGET_TEMP_DIR"] != ""
          target_dir = ENV["TARGET_TEMP_DIR"]
       else
-         target_dir = File.join($app_path, "/project/iphone") + "/build/rhorunner.build/#{$configuration}-" +
-            ( simulator ? "iphonesimulator" : "iphoneos") + "/rhorunner.build"
+         #target_dir = File.join($app_path, "/project/iphone") + "/build/rhorunner.build/#{$configuration}-" +
+         #    ( simulator ? "iphonesimulator" : "iphoneos") + "/rhorunner.build"
+         target_dir = File.join($app_path, "/project/iphone/ExtLibs")
       end
 
       build_extension_libs($sdk, target_dir)
@@ -2155,13 +2840,18 @@ 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
            #    args << '-arch'
            #    args << 'i386 x86_64'
-               additional_string = ' ARCHS="i386 x86_64"'
+               additional_string = ' ARCHS="'+get_archs_string_simulator+'"'
+           else
+               additional_string = ' ARCHS="'+get_archs_string_device+'"'
+           end
+           if $enable_bitcode
+               additional_string = additional_string + ' OTHER_CFLAGS="-fembed-bitcode"'
            end
 
            require   $startdir + '/lib/build/jake.rb'
@@ -2363,12 +3053,18 @@ 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')
-      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")
+      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 = generate_appname
+      appname_fixed = generate_appname_fixed
+
+      iphone_project = generate_correct_xcode_project_path
 
       xcode_project_checker = GeneralTimeChecker.new
       xcode_project_checker.init($startdir, $app_path, "xcode_project")
@@ -2398,8 +3094,9 @@ namespace "build" do
               rm_rf File.join('project','iphone','toremoved')
               rm_rf File.join('project','iphone','toremovef')
             end
-            
+
             update_xcode_project_files_by_capabilities
+            update_xcode_project_files_by_extensions
 
         else
             puts "$ build.yml not changed after last XCode project generation !"
@@ -2433,8 +3130,8 @@ namespace "build" do
     task :make_xcode_project => ["config:iphone"] do
 
       print_timestamp('build:iphone:make_xcode_project START')
-      appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
-      appname_fixed = appname.split(/[^a-zA-Z0-9]/).map { |w| w }.join("")
+      appname = generate_appname
+      appname_fixed = generate_appname_fixed
 
       chdir $app_path
 
@@ -2473,10 +3170,28 @@ namespace "build" do
       rm_rf File.join('project','iphone','toremoved')
       rm_rf File.join('project','iphone','toremovef')
 
+      mkdir_p File.join('project', 'iphone', 'ExtLibs')
+
       update_xcode_project_files_by_capabilities
+      update_xcode_project_files_by_extensions
+      update_xcodeproject_for_bitcode
 
       copy_generated_sources_and_binaries
 
+      #cocoapods support
+      podfile_app_path = File.join($app_path, "Podfile")
+      if File.exists?(podfile_app_path)
+          podfile_project_path = File.join($app_path, 'project','iphone', 'Podfile')
+          cp podfile_app_path,podfile_project_path
+
+          chdir File.join($app_path, 'project','iphone')
+
+          puts "We found Podfile in app's root and copy them to iphone project folder. Now we run 'pod install' to generate workspace, etc."
+          Jake.run('pod', ['install'])
+
+          chdir $app_path
+      end
+
       print_timestamp('build:iphone:make_xcode_project FINISH')
 
     end
@@ -2484,9 +3199,6 @@ namespace "build" do
     #[build:iphone:rhodes]
     task :rhodes => "config:iphone" do
 
-       appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
-       appname_fixed = appname.split(/[^a-zA-Z0-9]/).map { |w| w }.join("")
-
        Rake::Task['build:iphone:setup_xcode_project'].invoke
 
        Rake::Task['build:iphone:rhodes_old'].invoke
@@ -2497,9 +3209,10 @@ namespace "build" do
 #    desc "Build rhodes"
     task :rhodes_old => ["config:iphone", "build:iphone:rhobundle"] do
       print_timestamp('build:iphone:rhodes START')
-      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"
+      appname = generate_appname
+      appname_fixed = generate_appname_fixed
+      appname_camel = appname_fixed.slice(0, 1).capitalize + appname_fixed.slice(1..-1)
+      appname_project = appname_camel + ".xcodeproj"
 
       #saved_name = ''
       #saved_version = ''
@@ -2531,7 +3244,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,19 +3270,56 @@ 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']
+      simulator = $sdk =~ /iphonesimulator/
 
       additional_string = ''
-      if $sdk =~ /iphonesimulator/
+      if simulator
       #   args << '-arch'
       #   args << 'i386'
-        additional_string = ' ARCHS="i386 x86_64"'
+        additional_string = ' ARCHS="'+get_archs_string_simulator+'"'
+      else
+          additional_string = ' ARCHS="'+get_archs_string_device+'"'
+      end
+
+      puts "rhorunner build $enable_bitcode = "+$enable_bitcode.to_s
+      if $enable_bitcode
+          additional_string = additional_string + ' OTHER_CFLAGS="-fembed-bitcode -DHAVE_CONFIG_H -DUSE_RHOSSL"'
       end
 
+      #support cocoapods - check for workspave
+      workspace_path = File.join($app_path, "project", "iphone", appname_camel+".xcworkspace")
+
+      copy_from_derived = false
+
+      if File.exists?(workspace_path)
+          #we should build workspace instead of project !
+
+          build_path = File.join($app_path, "project", "iphone", '/build/' + $configuration + '-' + ( simulator ? "iphonesimulator" : "iphoneos"))
+          temp_path = File.join($app_path, "project", "iphone", "/build/rhorunner.build")
+          derived_path = File.join($app_path, "project", "iphone", "/build/deriveddata")
+
+          rhorunner_app_in_derived = File.join(derived_path, "Build", "Products", $configuration + '-' + ( simulator ? "iphonesimulator" : "iphoneos"), "rhorunner.app")
+
+          copy_from_derived = true
+
+          args = ['build', '-workspace', appname_camel + ".xcworkspace", '-scheme', 'rhorunner', '-configuration', $configuration, '-sdk', $sdk, '-quiet', '-derivedDataPath', "\""+derived_path+"\""]
+          #additional_string = additional_string + " BUILT_PRODUCTS_DIR="+ build_path+" CONFIGURATION_BUILD_DIR="+build_path+" PROJECT_TEMP_DIR="+temp_path+" BUILD_DIR="+build_path+" BUILD_ROOT="+build_path
+      else
+          args = ['build', '-scheme', 'rhorunner', '-configuration', $configuration, '-sdk', $sdk, '-project', appname_project, '-quiet']
+      end
+
+
+
+
       ret = 0
 
       if !$skip_build_rhodes_main
         ret = IPhoneBuild.run_and_trace($xcodebuild,args,{:rootdir => $startdir, :string_for_add_to_command_line => additional_string})
+
+        if copy_from_derived
+            mkdir_p build_path
+            cp_r rhorunner_app_in_derived, File.join(build_path, "rhorunner.app")
+        end
       end
 
 
@@ -3181,8 +3933,11 @@ namespace "clean" do
 
       iphone_project_folder = File.join($app_path, "project","iphone")
 
-      appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
-      appname_fixed = appname.split(/[^a-zA-Z0-9]/).map { |w| w }.join("")
+      iphone_build_folder = File.join(iphone_project_folder,"build")
+      rm_rf iphone_build_folder if File.exists? iphone_build_folder
+
+      appname = generate_appname
+      appname_fixed = generate_appname_fixed
       appname_project = appname_fixed.slice(0, 1).capitalize + appname_fixed.slice(1..-1) + ".xcodeproj"
 
 
@@ -3190,7 +3945,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,13 +4041,13 @@ 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="'+get_archs_string_device+'"'
       if simulator
       #    args << '-arch'
       #    args << 'i386'
-        additional_string = ' ARCHS="i386 x86_64"'
+        additional_string = ' ARCHS="'+get_archs_string_simulator+'"'
       end
 
       require   rootdir + '/lib/build/jake.rb'
@@ -3328,7 +4083,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 ? get_archs_string_simulator : get_archs_string_device
       ENV["RHO_ROOT"] = $startdir
 
       # added by dmitrys
@@ -3445,10 +4200,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 +4538,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>"