pod-builder 2.0.0.beta.25 → 2.0.0.beta.26

data/lib/pod_builder/podfile.rb

@@ -593,7 +593,7 @@ module PodBuilder
       base = File.expand_path(File.join(PodBuilder::project_path, ".."))
       bin_js = Dir.glob("#{base}/node_modules/@react-native-community/cli/build/bin.js")
 
-      raise "\n\nReact native cli bin_js not found!".red unless bin_js.count == 1
+      raise "\n\nReact native cli bin_js not found! Did you run yarn install?".red unless bin_js.count == 1
       bin_js = bin_js.first
 
       config_dest_path = PodBuilder::basepath("rn_config.json")

data/lib/pod_builder/rome/post_install.rb

@@ -2,6 +2,7 @@
 
 require 'fourflusher'
 require 'colored'
+require 'pathname'
 
 module PodBuilder
   def self.build_for_iosish_platform_framework(sandbox, build_dir, target, device, simulator, configuration, deterministic_build, build_for_apple_silicon)
@@ -80,10 +81,10 @@ module PodBuilder
   def self.build_for_iosish_platform_lib(sandbox, build_dir, target, device, simulator, configuration, deterministic_build, build_for_apple_silicon)
     raise "\n\nApple silicon hardware still unsupported since it requires to migrate to xcframeworks".red if build_for_apple_silicon
 
-    device_headers_folder = File.join(build_dir, "Headers", device)
-    simulator_headers_folder = File.join(build_dir, "Headers", simulator)
-    FileUtils.mkdir_p(device_headers_folder)
-    FileUtils.mkdir_p(simulator_headers_folder)
+    device_headers_path = File.join(build_dir, "Headers", device)
+    simulator_headers_path = File.join(build_dir, "Headers", simulator)
+    FileUtils.mkdir_p(device_headers_path)
+    FileUtils.mkdir_p(simulator_headers_path)
         
     deployment_target = target.platform_deployment_target
     target_label = target.cocoapods_target_label
@@ -92,43 +93,39 @@ module PodBuilder
 
     xcodebuild(sandbox, target_label, device, deployment_target, configuration, deterministic_build, [])
     spec_names.each do |root_name, module_name|
-      headers_private = "#{sandbox.headers_root.to_s}/Private/#{root_name}/#{module_name}"
-      headers_public = "#{sandbox.headers_root.to_s}/Public/#{root_name}/#{module_name}"
-  
-      device_base = "#{build_dir}/#{configuration}-#{device}/#{root_name}" 
-      device_lib = "#{device_base}/lib#{module_name}.a"
+      headers_path = "#{sandbox.headers_root.to_s}/Public/#{root_name}"
+      dest_path = "#{device_headers_path}/#{root_name}"
+      FileUtils.mkdir_p(dest_path)
 
-      FileUtils.cp headers_private, device_headers_folder
-      FileUtils.cp headers_public, device_headers_folder
+      Dir.glob("#{headers_path}/*") do |path|
+        real_path = Pathname.new(path).realpath
+        FileUtils.cp_r(real_path, dest_path)
+      end
     end
 
     excluded_archs = build_for_apple_silicon ? [] : ["arm64"]
     xcodebuild(sandbox, target_label, simulator, deployment_target, configuration, deterministic_build, excluded_archs)
     spec_names.each do |root_name, module_name|
-      headers_private = "#{sandbox.headers_root.to_s}/Private/#{root_name}/#{module_name}"
-      headers_public = "#{sandbox.headers_root.to_s}/Public/#{root_name}/#{module_name}"
-  
-      simulator_base = "#{build_dir}/#{configuration}-#{simulator}/#{root_name}"
-      simulator_lib = "#{simulator_base}/lib#{module_name}.a"
-
-      FileUtils.cp headers_private, simulator_headers_folder
-      FileUtils.cp headers_public, simulator_headers_folder
+      headers_path = "#{sandbox.headers_root.to_s}/Public/#{root_name}"
+      dest_path = "#{simulator_headers_path}/#{root_name}"
+      FileUtils.mkdir_p(dest_path)
+      
+      Dir.glob("#{headers_path}/*") do |path|
+        real_path = Pathname.new(path).realpath
+        FileUtils.cp_r(real_path, dest_path)
+      end
     end
 
     spec_names.each do |root_name, module_name|
-      device_headers_private = ""
-      device_headers_public = ""
-      simulator_headers_private = ""
-      simulator_headers_public = ""
+      simulator_base = "#{build_dir}/#{configuration}-#{simulator}/#{root_name}"
+      simulator_lib = "#{simulator_base}/lib#{module_name}.a"
 
       device_base = "#{build_dir}/#{configuration}-#{device}/#{root_name}" 
       device_lib = "#{device_base}/lib#{module_name}.a"
-      simulator_base = "#{build_dir}/#{configuration}-#{simulator}/#{root_name}"
-      simulator_lib = "#{simulator_base}/lib#{module_name}.a"
   
       next unless File.file?(device_lib) && File.file?(simulator_lib)
 
-            # Starting with Xcode 12b3 the simulator binary contains an arm64 slice as well which conflict with the one in the device_lib
+      # Starting with Xcode 12b3 the simulator binary contains an arm64 slice as well which conflict with the one in the device_lib
       # when creating the fat library. A naive workaround is to remove the arm64 from the simulator_lib however this is wrong because 
       # we might actually need to have 2 separated arm64 slices, one for simulator and one for device each built with different
       # compile time directives (e.g #if targetEnvironment(simulator))
@@ -139,22 +136,34 @@ module PodBuilder
       end
       
       raise "Lipo failed on #{device_lib}" unless system("xcrun lipo -create -output #{device_lib} #{device_lib} #{simulator_lib}")
-      
-      # Merge swift headers as per Xcode 10.2 release notes
-      if File.exist?(device_swift_header_path) && File.exist?(simulator_swift_header_path)
-        device_content = File.read(device_swift_header_path)
-        simulator_content = File.read(simulator_swift_header_path)
-        merged_content = %{
+
+      device_headers = Dir.glob("#{device_headers_path}/**/*.h")
+      simulator_headers = Dir.glob("#{simulator_headers_path}/**/*.h")
+      device_headers.each do |device_path|
+        simulator_path = device_path.gsub(device_headers_path, simulator_headers_path)
+        if File.exist?(simulator_path)
+          device_content = File.read(device_path)
+          simulator_content = File.read(simulator_path)
+          merged_content = %{
+            #if TARGET_OS_SIMULATOR
+            #{simulator_content}
+            #else
+            #{device_content}
+            #endif
+          }        
+          File.write(device_path, merged_content)
+        end
+      end
+      simulator_only_headers = simulator_headers - device_headers.map { |t| t.gsub(device_headers_path, simulator_headers_path) }
+      simulator_only_headers.each do |path|
+        simulator_content = File.read(path)
+        content = %{
           #if TARGET_OS_SIMULATOR
           #{simulator_content}
-          #else
-          #{device_content}
           #endif
         }        
-        File.write(device_swift_header_path, merged_content)
+        File.write(path, content)
       end
-
-
     end
 
 
@@ -306,8 +315,6 @@ module PodBuilder
     end
     project.save
   end
-
-  
 end
 
 Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_context, user_options|
@@ -389,7 +396,10 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
     end
     
     if enable_dsym
-      FileUtils.mv("#{build_dir}/dSYM", sandbox_root.parent)
+      dsym_source = "#{build_dir}/dSYM"
+      if File.directory?(dsym_source)
+        FileUtils.mv(dsym_source, sandbox_root.parent)
+      end
     else
       raise "Not implemented"
     end

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "2.0.0.beta.25"
+  VERSION = "2.0.0.beta.26"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.25
+  version: 2.0.0.beta.26
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -187,9 +187,8 @@ files:
 - lib/pod_builder/command/build.rb
 - lib/pod_builder/command/build_all.rb
 - lib/pod_builder/command/clean.rb
-- lib/pod_builder/command/clear_lldbinit.rb
 - lib/pod_builder/command/deintegrate.rb
-- lib/pod_builder/command/generate_lfs.rb
+- lib/pod_builder/command/generate_lldbinit.rb
 - lib/pod_builder/command/generate_podspec.rb
 - lib/pod_builder/command/info.rb
 - lib/pod_builder/command/init.rb
@@ -199,7 +198,6 @@ files:
 - lib/pod_builder/command/switch.rb
 - lib/pod_builder/command/sync_podfile.rb
 - lib/pod_builder/command/update.rb
-- lib/pod_builder/command/update_lldbinit.rb
 - lib/pod_builder/configuration.rb
 - lib/pod_builder/core.rb
 - lib/pod_builder/info.rb

data/lib/pod_builder/command/clear_lldbinit.rb

@@ -1,48 +0,0 @@
-require 'pod_builder/core'
-require 'digest'
-
-module PodBuilder
-  module Command
-    class ClearLldbInit
-      def self.call
-        Configuration.check_inited
-        if Configuration.build_using_repo_paths
-          raise "\n\nlldb shenanigans not supported when 'build_using_repo_paths' is enabled".red
-        end
-
-        argument_pods = ARGV.dup
-        
-        unless argument_pods.count > 0 
-          return -1
-        end
-        unless argument_pods.count == 1
-          raise "\n\nExpecting LLDBINIT_PATH\n\n".red 
-        end
-            
-        lldbinit_path = File.expand_path(argument_pods[0])
-        lldbinit_content = File.exist?(lldbinit_path) ? File.read(lldbinit_path) : ""
-
-        lldbinit_lines = []
-        skipNext = false
-        File.read(lldbinit_path).each_line do |line|
-          if line.include?("# <pb")
-            skipNext = true
-            next
-          elsif skipNext
-            skipNext = false
-            next
-          elsif line != "\n"
-            lldbinit_lines.push(line)
-          end
-        end
-      
-        File.write(lldbinit_path, lldbinit_lines.join())
-
-        if OPTIONS.nil? == false
-          puts "\n\n🎉 done!\n".green
-        end
-        return 0
-      end
-    end
-  end
-end

data/lib/pod_builder/command/generate_lfs.rb

@@ -1,70 +0,0 @@
-require 'pod_builder/core'
-
-module PodBuilder
-  module Command
-    class GenerateLFS
-      def self.call
-        Configuration.check_inited
-
-        unless Configuration.lfs_update_gitattributes
-           return -1
-        end
-
-        gitattributes_excludes = ["*.h", "*.hh", "*.m", "*.mm", "*.i", "*.c", "*.cc", "*.cxx", "*.cpp", "*.def", "*.inc", "*.inl", "*.swift", "*.modulemap", "*.strings", "*.png", "*.jpg", "*.gif", "*.html", "*.htm", "*.js", "*.json", "*.xml", "*.txt", "*.md", "*.rb", "*.sh", "*.py", "*.plist", "*.resolved", ".*", "README*", "LICENSE*"]
-
-        gitattributes_includes_frameworks = ["**/* filter=lfs diff=lfs merge=lfs !text"]
-        write_attributes(PodBuilder::prebuiltpath, gitattributes_includes_frameworks, gitattributes_excludes)
-        write_attributes(PodBuilder::dsympath, gitattributes_includes_frameworks, gitattributes_excludes)
-
-        if Configuration.lfs_include_pods_folder
-          gitattributes_includes_pods = ["**/*.framework/**/* filter=lfs diff=lfs merge=lfs !text"]
-          write_attributes(PodBuilder::project_path("Pods"), gitattributes_includes_pods, gitattributes_excludes)
-        end
-
-        return 0
-      end
-
-      private
-
-      def self.filter_files_by_size(files, size_kb)
-        return files.select { |x| File.size(x) / 1024 > Configuration.lfs_min_file_size }
-      end
-
-      def self.write_attributes(path, gitattributes_includes, gitattributes_excludes)
-        stop_marker = "# pb<stop>"
-        start_marker = "# pb<start> (lines up to `#{stop_marker}` are autogenerated, don't modify this section)"
-
-        gitattributes_items = [start_marker]
-        gitattributes_items += gitattributes_includes + gitattributes_excludes.map { |x| "#{x} !filter !merge !diff" }
-        gitattributes_items += [stop_marker]
-
-        gitattributes_path = File.join(gitattributes_path, ".gitattributes")
-
-        if !File.exist?(gitattributes_path)
-          FileUtils.touch(gitattributes_path)
-        end
-        
-        gitattributes_content = File.read(gitattributes_path)
-
-        podbuilder_start_line_found = false
-        gitattributes_content.each_line do |line|
-          stripped_line = line.strip
-          if stripped_line.start_with?(stop_marker)
-            podbuilder_start_line_found = false
-            next
-          elsif stripped_line.start_with?(start_marker)
-            podbuilder_start_line_found = true
-          end
-
-          unless !podbuilder_start_line_found
-            next
-          end
-
-          gitattributes_items.push(line.strip)
-        end
-        
-        File.write(gitattributes_path, gitattributes_items.join("\n"))
-      end
-    end
-  end
-end       

data/lib/pod_builder/command/update_lldbinit.rb

@@ -1,162 +0,0 @@
-require 'pod_builder/core'
-require 'digest'
-
-module PodBuilder
-  module Command
-    class UpdateLldbInit
-      def self.call
-        Configuration.check_inited
-        if Configuration.build_using_repo_paths
-          raise "\n\nlldb shenanigans not supported when 'build_using_repo_paths' is enabled".red
-        end
-
-        argument_pods = ARGV.dup
-        
-        unless argument_pods.count > 0 
-          return -1
-        end
-        unless argument_pods.count == 2
-          raise "\n\nExpecting LLDBINIT_PATH and a single PATH to the folder containing the prebuilt framework's source code\n\n".red 
-        end
-            
-        base_path = PodBuilder::basepath("")
-
-        podfile_restore_content = File.read(PodBuilder::basepath("Podfile.restore"))
-        app_podfile_content = File.read(PodBuilder::project_path("Podfile"))
-
-        lldbinit_path = File.expand_path(argument_pods[0])
-        lldbinit_content = File.exist?(lldbinit_path) ? File.read(lldbinit_path) : ""
-        status_hash = podfiles_status_hash(app_podfile_content, podfile_restore_content)
-        if lldbinit_content.include?("# <pb_md5:#{base_path}:#{status_hash}")
-          puts "\n\n🎉 already in sync!\n".green
-          return 0
-        end
-
-        source_path = argument_pods[1]
-        
-        is_absolute = ["~", "/"].include?(source_path[0])
-        if !is_absolute
-          source_path = Pathname.new(File.join(base_path, source_path))
-        end
-        
-        source_path = File.expand_path(source_path)
-        
-        framework_paths = Dir.glob("#{base_path}/**/*.framework")
-        
-        unless framework_paths.count > 0
-          raise "\n\nNo prebuilt frameworks found in `#{framework_paths}`\n\n".red 
-        end
-
-        puts "Extracting debug information".yellow
-
-        podspec_paths = Dir.glob("#{source_path}/**/*.podspec") + Dir.glob("#{source_path}/**/*.podspec.json")
-        podspec_contents = podspec_paths.map { |t| File.read(t).gsub(/\s+/, "").gsub("\"", "'") }
-        
-        replace_paths = []
-        
-        framework_paths.each do |framework_path|
-          name = File.basename(framework_path, File.extname(framework_path)) 
-          executable_path = File.join(framework_path, name)
-
-          parent_framework_path = File.expand_path(File.joing(framework_path, ".."))
-          framework_info_path = File.join(parent_framework_path, Configuration.prebuilt_info_filename)
-          data = JSON.parse(File.read(framework_info_path))
-
-          original_compile_path = data["original_compile_path"]
-          is_prebuilt = data.fetch("is_prebuilt", true)
-
-          if original_compile_path.nil?
-            puts "\n\n#{framework_path} was compiled with an older version of PodBuilder, please rebuild it to update `#{lldbinit_path}`"
-            next
-          end
-          
-          if is_prebuilt
-            next
-          end
-
-          if podspec_path = find_podspec_path_for(name, podspec_paths, podspec_contents)
-            if !is_development_pod(podspec_path, app_podfile_content)
-              replace_paths.push("#{original_compile_path}/Pods/#{name},#{File.dirname(podspec_path)}")
-            else
-              puts "#{name} is in development pod, skipping"
-            end
-          else
-            puts "Failed to find podspec for #{name}, skipping".blue
-          end   
-        end
-        
-        replace_paths.uniq!
-
-        source_map_lines = replace_paths.flat_map { |t| ["# <pb:#{base_path}>\n", "settings append target.source-map '#{t.split(",").first}' '#{t.split(",").last}'\n"] }
-        rewrite_lldinit(lldbinit_path, source_map_lines, base_path, app_podfile_content, podfile_restore_content)
-        
-        puts "\n\n🎉 done!\n".green
-        return 0
-      end
-
-      def self.is_development_pod(podspec_path, app_podfile_content)
-        development_path = Pathname.new(podspec_path).relative_path_from(Pathname.new(PodBuilder::project_path)).parent.to_s
-
-        return app_podfile_content.include?(":path => '#{development_path}'")
-      end
-
-      def self.find_podspec_path_for(name, podspec_paths, podspec_contents)
-        if (path = podspec_paths.detect { |t| File.basename(t, ".podspec") == name.gsub("_", "-") })
-          return path
-        elsif (path_index = podspec_contents.find_index { |t| t.include?(".module_name='#{name}'") })
-          return podspec_paths[path_index]
-        elsif (path_index = podspec_contents.find_index { |t| t.include?(".name='#{name}") }) # kind of optimistic,, but a last resort
-          return podspec_paths[path_index]
-        elsif (path_index = podspec_contents.find_index { |t| t.include?("'module_name':'#{name}'") }) # [json podspec]
-          return podspec_paths[path_index]
-        elsif (path_index = podspec_contents.find_index { |t| t.include?("'name':'#{name}") }) # [json podspec] kind of optimistic,, but a last resort
-          return podspec_paths[path_index]
-        else
-          return nil
-        end
-      end
-
-      def self.podfiles_status_hash(app_podfile_content, podfile_restore_content)
-        # Change to either Podfile.restore (which presumely mean new prebuilds done)
-        # or app's Podfile (which my occurr when pods are switched to development pod)
-        # should force a regeneration of the status identifier
-        Digest::MD5.hexdigest(podfile_restore_content + app_podfile_content)
-      end
-
-      def self.rewrite_lldinit(lldbinit_path, source_map_lines, base_path, app_podfile_content, podfile_restore_content)
-        puts "Writing #{lldbinit_path}".yellow
-
-        FileUtils.touch(lldbinit_path)
-        raise "\n\nDestination file should be a file".red unless File.exist?(lldbinit_path)
-
-        lldbinit_lines = []
-        skipNext = false
-        File.read(lldbinit_path).each_line do |line|
-          if line.include?("# <pb:#{base_path}>") || line.include?("# <pb>")
-            skipNext = true
-            next
-          elsif skipNext
-            skipNext = false
-            next
-          elsif line != "\n"
-            if line.include?("settings set target.source-map")
-              raise "\n\n#{lldbinit_destination_path} already includes a manual `settings set target.source-map`. This is unsupported and you'll have to manually remove that entry\n".red
-            end
-            lldbinit_lines.push(line)
-          end
-        end
-
-        status_hash = podfiles_status_hash(app_podfile_content, podfile_restore_content)
-
-        source_map_lines.insert(0, "# <pb>\n")
-        source_map_lines.insert(1, "settings clear target.source-map\n")
-        source_map_lines.insert(2, "# <pb:#{base_path}>\n")
-        source_map_lines.insert(3, "# <pb_md5:#{base_path}:#{status_hash}>\n")
-
-        lldbinit_lines += source_map_lines
-      
-        File.write(lldbinit_path, lldbinit_lines.join())
-      end
-    end
-  end
-end