xcode-archive-cache 0.0.10.pre.1 → 0.0.10.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea58d5804a6b809038af9c443a49426935c3f1b82673ce4029cadcd5dcdb21a2
-  data.tar.gz: edae37d1c99f73465be2486e910e32bb4b445811d4ef8dd4db91e45853f34a6e
+  metadata.gz: de08375420b8d97642ead0ec3ebc63a78f9f2c372347038054f3b66927d7cad4
+  data.tar.gz: 3712950c9e6038a5193a0db108127a5e89cb29edea098929e527346db24d838c
 SHA512:
-  metadata.gz: a753ce67b8129209b5da8e0afbdbd542da9660651ae47559fcfacbcf25ed9d35bedc45dbc05d23f13b33b1e4d05885f54bb43aaea2d3e2b4085f3fc1e960be63
-  data.tar.gz: c90dee530d492db4c3986c0e0ca6d651e0099a8f0348cdb4f5fa0110a32d143932809bdfce295ab4dc36e8180456320a208ff9f927cc2478f9b8d086cc016c32
+  metadata.gz: 8e6f791d1a84b4835981617e9092e5a24db3beaa6ee3119b351c47ff99cbed1a222c0168659e5b2bc89c3bc999fb57fd47611c0eb6daf601ef50985ef4959469
+  data.tar.gz: 588243bf92bf878d5020296f69252a83bc99eb58da5150237b62881a9e023539f6365e630e191b1f39bfc6681dbfeda87d321ce915459b1f624280e65c6ce3af

data/lib/injection/build_flags_changer.rb

@@ -23,6 +23,28 @@ module XcodeArchiveCache
         end
       end
 
+      # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      #
+      def add_static_lib_linker_flag(build_configuration, node)
+        flag = get_linker_flag(node)
+        if flag
+          debug("using ld flag #{flag}")
+          add_linker_flag(build_configuration, flag)
+        end
+      end
+
+      # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      #
+      def add_static_lib_libtool_flag(build_configuration, node)
+        flag = get_linker_flag(node)
+        if flag
+          debug("using libtool flag #{flag}")
+          add_libtool_flag(build_configuration, flag)
+        end
+      end
+
       # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
       # @param [XcodeArchiveCache::BuildGraph::Node] node
       #
@@ -93,6 +115,7 @@ module XcodeArchiveCache
       OTHER_CFLAGS_KEY = "OTHER_CFLAGS"
       OTHER_CPLUSPLUSFLAGS_KEY = "OTHER_CPLUSPLUSFLAGS"
       OTHER_LDFLAGS_KEY = "OTHER_LDFLAGS"
+      OTHER_LIBTOOLFLAGS_KEY = "OTHER_LIBTOOLFLAGS"
       OTHER_SWIFT_FLAGS_KEY = "OTHER_SWIFT_FLAGS"
       INHERITED_SETTINGS_VALUE = "$(inherited)"
 
@@ -103,6 +126,13 @@ module XcodeArchiveCache
         add_flag_to_configuration(build_configuration, OTHER_LDFLAGS_KEY, flag)
       end
 
+      # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
+      # @param [String] flag
+      #
+      def add_libtool_flag(build_configuration, flag)
+        add_flag_to_configuration(build_configuration, OTHER_LIBTOOLFLAGS_KEY, flag)
+      end
+
       # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
       # @param [String] flag
       #
@@ -191,6 +221,18 @@ module XcodeArchiveCache
         "-framework \"#{framework_name}\""
       end
 
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      #
+      # @return [String]
+      #
+      #         libSomething.a -> -lSomething
+      #
+      def get_linker_flag(node)
+        return unless node.product_file_name
+
+        node.product_file_name.gsub(/^lib/, "-l").gsub(/\.a$/, "")
+      end
+
       # @param [Hash] build_settings
       # @param [String] flags_key
       # @param [Array<String>] old_modulemap_names

data/lib/injection/dependency_remover.rb

@@ -12,11 +12,21 @@ module XcodeArchiveCache
         debug("removing #{prebuilt_target.name} from #{dependent_target.display_name}")
 
         remove_from_dependencies(prebuilt_target, dependent_target)
+        remove_from_linking(prebuilt_node, dependent_target)
         remove_from_schemes(prebuilt_target, dependent_target)
 
         debug("finished removing #{prebuilt_target.name} from #{dependent_target.display_name}")
       end
 
+      # @param [XcodeArchiveCache::BuildGraph::Node] prebuilt_node
+      # @param [Xcodeproj::Project::Object::PBXNativeTarget] dependent_target
+      #
+      # @return [Boolean]
+      #
+      def is_linked(prebuilt_node, dependent_target)
+        !find_linked(prebuilt_node, dependent_target).empty?
+      end
+
       private
 
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] prebuilt_target
@@ -46,7 +56,7 @@ module XcodeArchiveCache
       #
       def remove_from_linking(prebuilt_node, dependent_target)
         debug("product name is #{prebuilt_node.product_file_name}")
-        frameworks = dependent_target.frameworks_build_phase.files.select {|file| file.display_name == prebuilt_node.product_file_name}
+        frameworks = find_linked(prebuilt_node, dependent_target)
         debug("found #{frameworks.length} linked products")
 
         frameworks.each do |framework|
@@ -67,6 +77,17 @@ module XcodeArchiveCache
         end
       end
 
+      # @param [Xcodeproj::Project::Object::PBXNativeTarget] dependent_target
+      # @param [XcodeArchiveCache::BuildGraph::Node] prebuilt_node
+      #
+      # @return [Array<PBXBuildFile>]
+      #
+      def find_linked(prebuilt_node, dependent_target)
+        return [] unless dependent_target.frameworks_build_phase
+
+        dependent_target.frameworks_build_phase.files.select {|file| file.display_name == prebuilt_node.product_file_name}
+      end
+
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
       #
       # @return [Array<Xcodeproj::XCScheme>]

data/lib/injection/injector.rb

@@ -43,7 +43,7 @@ module XcodeArchiveCache
             modulemap_fixer.fix_modulemap(node)
           end
 
-          add_as_prebuilt_dependency(node, target, node.is_root)
+          add_as_prebuilt_dependency(node, target)
           remove_native_target_from_project(node)
         end
 
@@ -146,8 +146,7 @@ module XcodeArchiveCache
                                    .all_dependent_nodes
                                    .select(&:waiting_for_rebuild)
         dependent_to_rebuild.each do |dependent_node|
-          should_link = prebuilt_node.dependent.include?(dependent_node)
-          add_as_prebuilt_dependency(prebuilt_node, dependent_node.native_target, should_link)
+          add_as_prebuilt_dependency(prebuilt_node, dependent_node.native_target)
         end
 
         remove_native_target_from_project(prebuilt_node)
@@ -164,7 +163,7 @@ module XcodeArchiveCache
       # @param [XcodeArchiveCache::BuildGraph::Node] prebuilt_node
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] dependent_target
       #
-      def add_as_prebuilt_dependency(prebuilt_node, dependent_target, should_link)
+      def add_as_prebuilt_dependency(prebuilt_node, dependent_target)
         debug("adding #{prebuilt_node.name} as prebuilt to #{dependent_target.display_name}")
 
         unless prebuilt_node.has_acceptable_product?
@@ -174,7 +173,7 @@ module XcodeArchiveCache
         if prebuilt_node.has_framework_product?
           add_as_prebuilt_framework(prebuilt_node, dependent_target)
         elsif prebuilt_node.has_static_library_product?
-          add_as_prebuilt_static_lib(prebuilt_node, dependent_target, should_link)
+          add_as_prebuilt_static_lib(prebuilt_node, dependent_target)
         end
 
         debug("done with #{prebuilt_node.name} for #{dependent_target.display_name}")
@@ -190,14 +189,17 @@ module XcodeArchiveCache
         build_flags_changer.add_framework_search_path(build_configuration, artifact_location)
         build_flags_changer.add_framework_headers_iquote(build_configuration, artifact_location, prebuilt_node)
 
+        if dependency_remover.is_linked(prebuilt_node, dependent_target)
+          build_flags_changer.add_framework_linker_flag(build_configuration, prebuilt_node)
+        end
+
         dependency_remover.remove_dependency(prebuilt_node, dependent_target)
       end
 
       # @param [XcodeArchiveCache::BuildGraph::Node] prebuilt_node
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] dependent_target
-      # @param [Boolean] should_link
       #
-      def add_as_prebuilt_static_lib(prebuilt_node, dependent_target, should_link)
+      def add_as_prebuilt_static_lib(prebuilt_node, dependent_target)
         build_configuration = find_build_configuration(dependent_target)
 
         injected_modulemap_file_path = storage.get_modulemap_path(prebuilt_node)
@@ -206,10 +208,16 @@ module XcodeArchiveCache
           build_flags_changer.fix_module_map_path(build_configuration, modulemap_file_names, injected_modulemap_file_path)
         end
 
-        # if should_link
-          artifact_location = storage.get_storage_path(prebuilt_node)
-          build_flags_changer.add_library_search_path(build_configuration, artifact_location)
-        # end
+        artifact_location = storage.get_storage_path(prebuilt_node)
+        build_flags_changer.add_library_search_path(build_configuration, artifact_location)
+
+        if dependency_remover.is_linked(prebuilt_node, dependent_target)
+          if dependent_target.product_type == Xcodeproj::Constants::PRODUCT_TYPE_UTI[:static_library]
+            build_flags_changer.add_static_lib_libtool_flag(build_configuration, prebuilt_node)
+          else
+            build_flags_changer.add_static_lib_linker_flag(build_configuration, prebuilt_node)
+          end
+        end
 
         dependency_remover.remove_dependency(prebuilt_node, dependent_target)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-archive-cache
 version: !ruby/object:Gem::Version
-  version: 0.0.10.pre.1
+  version: 0.0.10.pre.2
 platform: ruby
 authors:
 - Ilya Dyakonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2020-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj