Merge pull request #48 from leavez/dsym

fix missing of dSYM for dynamic framework

Author: leavez

lib/cocoapods-binary/Integration.rb

@@ -55,7 +55,7 @@ def mirror_with_symlink(source, basefolder, target_folder)
                 walk(real_file_folder) do |child|
                     source = child
                     # only make symlink to file and `.framework` folder
-                    if child.directory? and child.extname == ".framework"
+                    if child.directory? and [".framework", ".dSYM"].include? child.extname
                         mirror_with_symlink(source, real_file_folder, target_folder)
                         next false  # return false means don't go deeper
                     elsif child.file?
@@ -243,8 +243,9 @@ class EmbedFrameworksScript
                     # ---- this is added by cocoapods-binary ---
                     # Readlink cannot handle relative symlink well, so we override it to a new one
                     # If the path isn't an absolute path, we add a realtive prefix.
+                    old_read_link=`which readlink`
                     readlink () {
-                        path=`/usr/bin/readlink $1`;
+                        path=`$old_read_link $1`;
                         if [ $(echo "$path" | cut -c 1-1) = '/' ]; then
                             echo $path;
                         else
@@ -253,6 +254,10 @@ class EmbedFrameworksScript
                     }
                     # --- 
                 SH
+
+                # patch the rsync for copy dSYM symlink
+                script = script.gsub "rsync --delete", "rsync --copy-links --delete"
+                
                 patch + script
             end
         end

lib/cocoapods-binary/rome/build_framework.rb

@@ -27,7 +27,7 @@ def build_for_iosish_platform(sandbox,
     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=x86_64', 'ONLY_ACTIVE_ARCH=NO'])
+  xcodebuild(sandbox, target_label, simulator, deployment_target, other_options + ['ARCHS=x86_64', 'ONLY_ACTIVE_ARCH=NO', 'DEBUG_INFORMATION_FORMAT=dwarf'])
 
   # paths
   root_name = target.pod_name
@@ -53,6 +53,17 @@ def build_for_iosish_platform(sandbox,
     FileUtils.cp_r simulator_swiftmodule_path + "/.", device_swiftmodule_path
   end
 
+  # 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
+    FileUtils.mv device_dsym, output_path, :force => true
+  end
+
   # output
   output_path.mkpath unless output_path.exist?
   FileUtils.mv device_framwork_path, output_path, :force => true