Merge branch '0.4.2'

Author: leavez

lib/cocoapods-binary/Integration.rb

@@ -212,6 +212,32 @@ def empty_source_files(spec)
                     spec.attributes_hash["resources"] += bundle_names.map{|n| n+".bundle"}
                 end
 
+                # to remove the resurce bundle target. 
+                # When specify the "resource_bundles" in podspec, xcode will generate a bundle 
+                # target after pod install. But the bundle have already built when the prebuit
+                # phase and saved in the framework folder. We will treat it as a normal resource
+                # file.
+                # https://github.com/leavez/cocoapods-binary/issues/29
+                if spec.attributes_hash["resource_bundles"]
+                    bundle_names = spec.attributes_hash["resource_bundles"].keys
+                    spec.attributes_hash["resource_bundles"] = nil 
+                    spec.attributes_hash["resources"] ||= []
+                    spec.attributes_hash["resources"] += bundle_names.map{|n| n+".bundle"}
+                end
+
+                # to remove the resurce bundle target. 
+                # When specify the "resource_bundles" in podspec, xcode will generate a bundle 
+                # target after pod install. But the bundle have already built when the prebuit
+                # phase and saved in the framework folder. We will treat it as a normal resource
+                # file.
+                # https://github.com/leavez/cocoapods-binary/issues/29
+                if spec.attributes_hash["resource_bundles"]
+                    bundle_names = spec.attributes_hash["resource_bundles"].keys
+                    spec.attributes_hash["resource_bundles"] = nil 
+                    spec.attributes_hash["resources"] ||= []
+                    spec.attributes_hash["resources"] += bundle_names.map{|n| n+".bundle"}
+                end
+
                 # to avoid the warning of missing license
                 spec.attributes_hash["license"] = {} 
             end

lib/cocoapods-binary/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBinary
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
 end

lib/cocoapods-binary/helper/podfile_options.rb

@@ -11,7 +11,6 @@ class TargetDefinition
 
         ## --- option for setting using prebuild framework ---
         def parse_prebuild_framework(name, requirements)
-
             should_prebuild = Pod::Podfile::DSL.prebuild_all
 
             options = requirements.last

lib/cocoapods-binary/rome/build_framework.rb

@@ -25,11 +25,10 @@ def build_for_iosish_platform(sandbox,
 
   other_options = [] 
   if bitcode_enabled
-    other_options += ['OTHER_CFLAGS="-fembed-bitcode"']
     other_options += ['BITCODE_GENERATION_MODE=bitcode']
   end
   xcodebuild(sandbox, target_label, device, deployment_target, other_options)
-  xcodebuild(sandbox, target_label, simulator, deployment_target, other_options + ["ARCHS=#{simulator_default_arch}",'ONLY_ACTIVE_ARCH=NO', 'DEBUG_INFORMATION_FORMAT=dwarf'])
+  xcodebuild(sandbox, target_label, simulator, deployment_target, other_options + ["ARCHS=#{simulator_default_arch}",'ONLY_ACTIVE_ARCH=NO'])
 
   # paths
   target_name = target.name # equals target.label, like "AFNeworking-iOS" when AFNetworking is used in multiple platforms.
@@ -58,11 +57,11 @@ def build_for_iosish_platform(sandbox,
   # handle the dSYM files
   device_dsym = "#{device_framwork_path}.dSYM"
   if File.exist? device_dsym
-    ## lipo the simulator dsym
-    # tmp_lipoed_binary_path = "#{output_path}/#{module_name}.draft"
-    # lipo_log = `lipo -create -output #{tmp_lipoed_binary_path} #{device_framwork_path}.dSYM/Contents/Resources/DWARF/#{module_name} #{simulator_framwork_path}.dSYM/Contents/Resources/DWARF/#{module_name}`
-    # puts lipo_log unless File.exist?(tmp_lipoed_binary_path)
-    # FileUtils.mv tmp_lipoed_binary_path, "#{device_framwork_path}.dSYM/Contents/Resources/DWARF/#{module_name}", :force => true
+    # lipo the simulator dsym
+    tmp_lipoed_binary_path = "#{output_path}/#{module_name}.draft"
+    lipo_log = `lipo -create -output #{tmp_lipoed_binary_path} #{device_dsym}/Contents/Resources/DWARF/#{module_name} #{simulator_framwork_path}.dSYM/Contents/Resources/DWARF/#{module_name}`
+    puts lipo_log unless File.exist?(tmp_lipoed_binary_path)
+    FileUtils.mv tmp_lipoed_binary_path, "#{device_framwork_path}.dSYM/Contents/Resources/DWARF/#{module_name}", :force => true
     FileUtils.mv device_dsym, output_path, :force => true
   end