rhodes 7.1.17 → 7.4.1

data/platform/iphone/rbuild/iphone.rake

@@ -38,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
@@ -144,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)
@@ -255,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}"
@@ -384,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
@@ -415,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')
@@ -634,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
@@ -725,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"
@@ -864,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
@@ -1051,6 +1198,50 @@ def kill_iphone_simulator
   `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
@@ -1144,6 +1335,21 @@ 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?
 
@@ -1238,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"]
@@ -1250,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
@@ -1516,10 +1736,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)
 
@@ -1569,10 +1786,12 @@ namespace "build" do
             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 << '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"]
-            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"'})
+            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
 
@@ -1857,10 +2076,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)
 
@@ -1900,10 +2116,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)
 
@@ -1947,10 +2160,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)
 
@@ -2127,6 +2337,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']
@@ -2148,6 +2359,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+"]"
@@ -2190,14 +2402,15 @@ namespace "build" do
           rm_rf result_lib_folder
 
           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 = ' CONFIGURATION_BUILD_DIR='+result_lib_folder+' 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="arm64 arm64e armv7 armv7s"'
+              additional_string = ' CONFIGURATION_BUILD_DIR='+result_lib_folder+' ARCHS="'+get_archs_string_device+'"'
           end
 
           require   rootdir + '/lib/build/jake.rb'
@@ -2212,6 +2425,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+"]"
@@ -2253,7 +2467,11 @@ namespace "build" do
       ENV["TARGET_TEMP_DIR"] ||= target_dir
       ENV["TEMP_FILES_DIR"] ||= ENV["TARGET_TEMP_DIR"]
 
-      ENV["ARCHS"] ||= simulator ? "i386 x86_64" : "arm64 arm64e armv7 armv7s"
+      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
@@ -2288,11 +2506,17 @@ namespace "build" do
             else
                  puts 'build script in extension already executable : '+build_script
             end
+            additional_string = ""
             if simulator
-                ENV["XCODE_BUILD_ADDITIONAL_STRING_TO_COMMAND_LINE"] = ' ARCHS="i386 x86_64"'
+                additional_string = ' ARCHS="'+get_archs_string_simulator+'"'
             else
-                ENV["XCODE_BUILD_ADDITIONAL_STRING_TO_COMMAND_LINE"] = ' ARCHS="arm64 arm64e armv7 armv7s"'
+                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
@@ -2409,6 +2633,7 @@ namespace "build" do
 
 
     #[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')
@@ -2503,14 +2728,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"] = "arm64 arm64e armv7 armv7s"
+                 ENV["ARCHS"] = get_archs_string_device
                  ENV["SDK_NAME"] = devsdk
                  build_extension_lib(extpath, devsdk, prebuiltpath, xcodeproject, xcodetarget, depfile)
                  cp libpath, libdevpath
@@ -2558,8 +2784,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)
@@ -2615,7 +2842,12 @@ namespace "build" do
            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'
@@ -2825,10 +3057,10 @@ 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("")
+      appname = generate_appname
+      appname_fixed = generate_appname_fixed
 
-      iphone_project = File.join($app_path, "project","iphone","#{appname_fixed}.xcodeproj")
+      iphone_project = generate_correct_xcode_project_path
 
       xcode_project_checker = GeneralTimeChecker.new
       xcode_project_checker.init($startdir, $app_path, "xcode_project")
@@ -2860,6 +3092,7 @@ namespace "build" do
             end
 
             update_xcode_project_files_by_capabilities
+            update_xcode_project_files_by_extensions
 
         else
             puts "$ build.yml not changed after last XCode project generation !"
@@ -2893,8 +3126,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
 
@@ -2933,10 +3166,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
@@ -2944,9 +3195,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
@@ -2957,9 +3205,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 = ''
@@ -3017,19 +3266,56 @@ namespace "build" do
       #chdir $config["build"]["iphonepath"]
       chdir File.join($app_path, "project","iphone")
 
-      args = ['build', '-scheme', '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
 
 
@@ -3646,8 +3932,8 @@ namespace "clean" do
       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 = generate_appname
+      appname_fixed = generate_appname_fixed
       appname_project = appname_fixed.slice(0, 1).capitalize + appname_fixed.slice(1..-1) + ".xcodeproj"
 
 
@@ -3753,11 +4039,11 @@ namespace "clean" do
 
       args = ['clean', '-scheme', xcodetarget, '-configuration', configuration, '-sdk', sdk, '-project', xcodeproject]
 
-      additional_string = ' ARCHS="arm64 arm64e armv7 armv7s"'
+      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'
@@ -3793,7 +4079,7 @@ namespace "clean" do
       #ENV["TARGET_TEMP_DIR"] ||= target_dir
       ENV["TEMP_FILES_DIR"] ||= ENV["TARGET_TEMP_DIR"]
 
-      ENV["ARCHS"] ||= simulator ? "i386 x86_64" : "arm64 arm64e armv7 armv7s"
+      ENV["ARCHS"] ||= simulator ? get_archs_string_simulator : get_archs_string_device
       ENV["RHO_ROOT"] = $startdir
 
       # added by dmitrys