cocoapods-packager-ext 0.0.21 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fe4f327fcf1e83c2c98b3e7536e32d0a7a282d35d2a01785e976ec5d42ea490
-  data.tar.gz: 8e511d747b8cd997dad144f8bdbc07fb291798524022db110c63a23eb0a0d2d2
+  metadata.gz: 23cd72018e39de209dccf062d026da054ae4019c38b0fb57ca0a7437efd4b565
+  data.tar.gz: ed3fc72518c0d7163c9ed6a19d760c28d76968890bd7047611807f9852e41ade
 SHA512:
-  metadata.gz: f3d309b76e55409eb00290a3a8417f748f78ebc381d3ad4276d262d602b87391381765e60e469caf0f4922de3846f0de8181f3d130cde37fa2da899f72024ffd
-  data.tar.gz: '05863f3099b61ba477b227eca7734f52fcb2deac2cd549f55042cdcd6b51ec9d9712df4acee2d572981ef768b3b0bbc06959f0ae2185d8596931b8ff7f73ed37'
+  metadata.gz: b9a31f722da895eb96d120a86f408b5e2ae97e4a48da9fdc41ed1e88335e1a655e5156d8fc2721e5f3d6a4cc3c3784c7dd9d488e44c248e1d19f8f5259629e37
+  data.tar.gz: b8f915b856efeed8eeff81368bfe086323083469f05f6d73bbf85f9a225b5a9932d57c406ed32647a3151cb6f3374c4751a4071b5bc9215c00baa0ba882ba81a

data/cocoapods-packager-ext.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
-  spec.add_runtime_dependency(%q<cocoapods-packager>.freeze,["1.5.1"])
+  spec.add_runtime_dependency(%q<cocoapods-packager>.freeze,["1.5.1.alpha.0"])
   
 end

data/lib/cocoapods-packager-ext/command/package_ext.rb

@@ -1,5 +1,7 @@
 require 'cocoapods-packager-ext/ext/downloader/lnpath'
 require 'cocoapods-packager-ext/ext/downloader_ext'
+require 'cocoapods-packager-ext/ext/pod_utils'
+
 module Pod
   class Command
     # This is an example of a cocoapods plugin adding a top-level subcommand
@@ -26,9 +28,7 @@ module Pod
                 alias options_t options
                 def options
                     o = options_t
-                    o.push(['--all-deps','embedded all-depends'])
                     o.push(['--archs','select archs'])
-                    o.push(['--black-deps','select exclude deps'])
                     o.push(['--podfile','select deps version from podfile'])
                     o.push(['--platform','select platform'])
                     o.concat(super)
@@ -42,14 +42,57 @@ module Pod
 
         alias initialize_t initialize
         def initialize(argv)
-            @all_deps = argv.flag?('all-deps',false)
+            @exclude_dep_items = argv.option('exclude-deps','').split(',')
             @select_archs = argv.option('archs','').split(',')
-            @black_deps = argv.option('black-deps','').split(',')
             @podfile = argv.option('podfile','')
             @platform = argv.option('platform','')
             initialize_t argv
         end
 
+        alias build_in_sandbox_t build_in_sandbox
+        def build_in_sandbox(platform)
+            config.installation_root  = Pathname.new(Dir.pwd)
+            config.sandbox_root       = 'Pods'
+
+            static_sandbox = build_static_sandbox(@dynamic)
+            static_installer = install_pod(platform.name, static_sandbox)
+
+            if @dynamic
+                dynamic_sandbox = build_dynamic_sandbox(static_sandbox, static_installer)
+                install_dynamic_pod(dynamic_sandbox, static_sandbox, static_installer, platform)
+            end
+
+            begin
+                perform_build(platform, static_sandbox, dynamic_sandbox, static_installer)
+            ensure # in case the build fails; see Builder#xcodebuild.
+                if ENV['ENABLE_BACKUP_WORKSPACE'] && (ENV['ENABLE_BACKUP_WORKSPACE'].upcase == 'YES' || ENV['ENABLE_BACKUP_WORKSPACE'].upcase == 'TRUE')
+                else
+                    Pathname.new(config.sandbox_root).rmtree
+                    FileUtils.rm_f('Podfile.lock')
+                end
+            end
+        end
+
+        def spec_library(platform)
+            spec = <<RB
+  s.#{platform.name.to_s}.deployment_target    = '#{platform.deployment_target}'
+  s.#{platform.name.to_s}.vendored_libraries  = ['#{platform.name.to_s}/*.a']
+  s.#{platform.name.to_s}.public_header_files = ['#{platform.name.to_s}/Headers/*.{h}']
+  s.#{platform.name.to_s}.source_files = ['#{platform.name.to_s}/Headers/*.{h}']
+  s.#{platform.name.to_s}.resource = ['#{platform.name.to_s}/Resources/*.bundle']
+  s.#{platform.name.to_s}.module_map   = "#{platform.name.to_s}/Modules/module.modulemap"
+RB
+        end
+
+        def spec_framework(platform)
+            spec = <<RB
+  s.#{platform.name.to_s}.public_header_files = ['#{platform.name.to_s}/Headers/*.{h}']
+  s.#{platform.name.to_s}.source_files = ['#{platform.name.to_s}/**/Headers/*.{h}']
+  s.#{platform.name.to_s}.resource = ['#{platform.name.to_s}/**/Resources/*.bundle']
+  s.#{platform.name.to_s}.module_map   = "#{platform.name.to_s}/**/Modules/module.modulemap"
+RB
+        end
+
         alias build_package_t build_package
         def build_package
             if @platform == ''
@@ -62,7 +105,13 @@ module Pod
                     if @platform.include?(platform.name.to_s)
                         UI.puts 'build package platform:'+platform.name.to_s
                         build_in_sandbox(platform)
-                        newspec += builder.spec_platform(platform)
+                        if @library
+                            newspec += spec_library(platform)
+                        else
+                            newspec += builder.spec_platform(platform)
+                        end
+
+
                     else
                         UI.puts 'jump build platforms:'+platform.to_s
                     end
@@ -72,13 +121,11 @@ module Pod
                 File.open(@spec.name + '.podspec', 'w') { |file| file.write(newspec) }
             end
 
-
-
         end
 
         alias perform_build_t perform_build
         def perform_build(platform, static_sandbox, dynamic_sandbox,static_installer)
-            if @all_deps || @select_archs.length > 0
+            if @select_archs.length > 0 || @exclude_dep_items.length > 0
                 static_sandbox_root = config.sandbox_root.to_s
 
                 if @dynamic
@@ -100,8 +147,7 @@ module Pod
                   @config,
                   @bundle_identifier,
                   @exclude_deps,
-                  @all_deps,
-                  @black_deps,
+                  @exclude_dep_items,
                   @select_archs
                 )
 

data/lib/cocoapods-packager-ext/ext/builder.rb

@@ -2,81 +2,103 @@ require "fileutils"
 
 module Pod
   class Builder
-    #移动资源文件和静态库文件到build目录
-    def deal_target(path)
-      for item in @target_type_ext
-        if File.extname(path) == item
-          isBlack = false 
-          for black in @black_deps
-            if File.basename(path).include? black
-              isBlack = true
-            end
-          end
-          if isBlack
-            return
-          end
-          begin
-          if File.directory? path
-            FileUtils.copy_entry(path,"#{@target_dir_ext_ext}/#{File.basename(path)}", false,false, true)
-          else
-            FileUtils.cp(path,"#{@target_dir_ext_ext}/#{File.basename(path)}")
-          end
-          rescue Exception => e
-            puts e
-          end
-            return
-        end
-      end
-      if File.directory? path
-        is_black = false 
-        for black in @black_list_ext    
-          if black == path
-            is_black = true
-            break
-          end
-        end
-        if is_black
-          return
-        end
-        Dir.foreach(path) do |file|
-          if file != '.' && file != '..'
-            deal_target(path+'/'+file)
-          end
+
+    alias build_static_library_t build_static_library
+    def build_static_library
+      build_static_library_t
+      platform_path = Pathname.new(@platform.name.to_s)
+      header_path = platform_path+'Headers'
+      header_path.mkpath unless header_path.exist?
+
+      module_map_path = platform_path+'Modules'
+      module_map_path.mkpath unless module_map_path.exist?
+      copy_headers_to_target header_path,module_map_path
+
+      resources_path = platform_path+'Resources'
+      resources_path.mkpath unless resources_path.exist?
+      copy_resources_to_target resources_path
+    end
+    alias build_static_library_for_ios_t build_static_library_for_ios
+    def build_static_library_for_ios(output)
+      if @exclude_dep_items.length > 0
+        static_libs = static_libs_in_sandbox('build') + static_libs_in_sandbox('build-sim') + vendored_libraries
+        static_libs.reject! {|lib| @exclude_dep_items.any? {|item| lib.to_s.include? item}}
+        libs = ios_architectures.map do |arch|
+          library = "#{@static_sandbox_root}/build/package-#{arch}.a"
+          `libtool -arch_only #{arch} -static -o #{library} #{static_libs.join(' ')}`
+          library
         end
+
+        `lipo -create -output #{output} #{libs.join(' ')}`
         
+        # static_libs = static_libs_in_sandbox('build')
+        # sim_libs = static_libs_in_sandbox('build-sim')
+        # for item in @black_deps
+        #   static_libs.delete_if do |obj|
+        #     obj.include? item
+        #   end
+        #   sim_libs.delete_if do |obj|
+        #     obj.include? item
+        #   end
+        # end
+        # UI.puts "links statics:#{static_libs.join(' ')}, sim_libs:#{sim_libs.join(' ')}"
+        # `xcrun -r libtool -no_warning_for_no_symbols -static -o #{output} #{static_libs.join(' ')} #{sim_libs.join(' ')}`
+      else
+        build_static_library_for_ios_t output
       end
     end
 
 
-    alias build_static_library_for_ios_t build_static_library_for_ios
-    def build_library(output)
-      deal_target(@static_sandbox_root)
-      if @all_deps
-        static_libs = static_libs_in_sandbox('build')
-        sim_libs = static_libs_in_sandbox('build-sim')
-        for item in @black_deps
-          static_libs.delete_if do |obj|
-            obj.include? item
-          end
-          sim_libs.delete_if do |obj|
-            obj.include? item
-          end
-        end
-        UI.puts "links statics:#{static_libs.join(' ')}, sim_libs:#{sim_libs.join(' ')}"
-        `xcrun -r libtool -no_warning_for_no_symbols -static -o #{output} #{static_libs.join(' ')} #{sim_libs.join(' ')}`
+    alias static_linker_flags_in_sandbox_t ios_architectures
+    def static_linker_flags_in_sandbox
+      static_libs = static_libs_in_sandbox('build') + static_libs_in_sandbox('build-sim') + vendored_libraries
+      linker_flags = static_libs.map do |lib|
+        lib = lib.chomp('.a').split('/').last
+        lib.slice!('lib')
+        "-l#{lib}"
+      end
+      linker_flags.reject { |e| e == "-l#{@spec.name}" || e == '-lPods-packager' }
+    end
+
+    def ios_build_options
+      if ENV['DISABLE_BITCODE'] && (ENV['DISABLE_BITCODE'].upcase == 'YES' || ENV['DISABLE_BITCODE'].upcase == 'TRUE')
+        "ARCHS=\'#{ios_architectures.join(' ')}\' OTHER_CFLAGS=\'-Qunused-arguments\'"
       else
-        build_static_library_for_ios output
+        "ARCHS=\'#{ios_architectures.join(' ')}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'"
       end
     end
 
-    # alias ios_build_options_t ios_build_options
-    # def ios_build_options
-    #   if @select_archs.size != 0
-    #     return "ARCHS=\'#{@select_archs.join(' ')}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'"
-    #   else
-    #     return ios_build_options_t
-    #   end
-    # end
+    def static_linker_defines
+      static_libs = static_libs_in_sandbox('build') + static_libs_in_sandbox('build-sim')
+      static_libs = static_libs.map { |path| Pathname("#{Dir.pwd}/#{path}").parent.to_s }
+      vendored_libs = vendored_libraries.map { |path| Pathname(path).parent.to_s }
+      link_paths = static_libs + vendored_libs
+      link_paths.uniq.join(" ")
+    end
+    alias build_dynamic_framework_for_ios_t build_dynamic_framework_for_ios
+    def build_dynamic_framework_for_ios(defines, output)
+      # Specify frameworks to link and search paths
+      linker_flags = static_linker_flags_in_sandbox
+      defines = "#{defines} OTHER_LDFLAGS='$(inherited) #{linker_flags.join(' ')}'"
+
+      # Build Target Dynamic Framework for both device and Simulator
+      device_defines = "#{defines} LIBRARY_SEARCH_PATHS=\"#{static_linker_defines}\""
+      device_options = ios_build_options << ' -sdk iphoneos'
+      xcodebuild(device_defines, device_options, 'build', @spec.name.to_s, @dynamic_sandbox_root.to_s)
+      if @select_archs.size == 0 || @select_archs.include?('i386') || @select_archs.include?('x86_64')
+        sim_defines = "#{defines} LIBRARY_SEARCH_PATHS=\"#{Dir.pwd}/#{@static_sandbox_root}/build-sim\" ONLY_ACTIVE_ARCH=NO"
+        xcodebuild(sim_defines, '-sdk iphonesimulator', 'build-sim', @spec.name.to_s, @dynamic_sandbox_root.to_s)
+        # Combine architectures
+        `lipo #{@dynamic_sandbox_root}/build/#{@spec.name}.framework/#{@spec.name} #{@dynamic_sandbox_root}/build-sim/#{@spec.name}.framework/#{@spec.name} -create -output #{output}`
+      else
+        `mv #{@dynamic_sandbox_root}/build/#{@spec.name}.framework/#{@spec.name} #{output}`
+      end
+
+      FileUtils.mkdir(@platform.name.to_s)
+      `mv #{@dynamic_sandbox_root}/build/#{@spec.name}.framework #{@platform.name}`
+      `mv #{@dynamic_sandbox_root}/build/#{@spec.name}.framework.dSYM #{@platform.name}`
+    end
+
     alias ios_architectures_t ios_architectures
     def ios_architectures
       if @select_archs.size != 0
@@ -86,6 +108,100 @@ module Pod
       end
     end
 
+    alias copy_headers_t copy_headers
+    def copy_headers
+      copy_headers_to_target @fwk.headers_path
+    end
+
+    def copy_headers_to_target(headers_target_path = nil ,module_map_target_path = nil )
+      headers_target_path = @fwk.headers_path if headers_target_path.nil?
+      module_map_target_path = @fwk.module_map_path if module_map_target_path.nil?
+
+      headers_source_root = "#{@public_headers_root}/#{@spec.name}"
+
+      Dir.glob("#{headers_source_root}/**/*.h").
+        each { |h| `ditto #{h} #{headers_target_path}/#{h.sub(headers_source_root, '')}` }
+
+      # If custom 'module_map' is specified add it to the framework distribution
+      # otherwise check if a header exists that is equal to 'spec.name', if so
+      # create a default 'module_map' one using it.
+      if !@spec.module_map.nil?
+        module_map_file = @file_accessors.flat_map(&:module_map).first
+        module_map = File.read(module_map_file) if Pathname(module_map_file).exist?
+      elsif File.exist?("#{@public_headers_root}/#{@spec.name}/#{@spec.name}.h")
+        module_map = <<MAP
+framework module #{@spec.name} {
+  umbrella header "#{@spec.name}.h"
+
+  export *
+  module * { export * }
+}
+MAP
+      else
+
+        f = File.new(File.join("#{headers_target_path}","#{@spec.name}.h"), "w+")
+        f.puts("#import <UIKit/UIKit.h>")
+        f.puts("#import <Foundation/Foundation.h>")
+        Dir.foreach(headers_target_path) do |filename|
+          if filename != "." and filename != ".."
+            f.puts("#import \"#{filename}\"")
+          end
+        end
+        f.close
+
+        module_map = <<MAP
+framework module #{@spec.name} {
+  umbrella header "#{@spec.name}.h"
+
+  export *
+  module * { export * }
+}
+MAP
+      end
+
+      unless module_map.nil?
+        module_map_target_path.mkpath unless module_map_target_path.exist?
+        File.write("#{module_map_target_path}/module.modulemap", module_map)
+      end
+    end
+
+    alias copy_resources_t copy_resources
+    def copy_resources
+      copy_resources_to_target @fwk.resources_path
+    end
+    def copy_resources_to_target(resources_target_path = nil )
+      resources_target_path = @fwk.resources_path if resources_target_path.nil?
+      if @exclude_deps
+        bundles = @static_installer.pod_targets.flat_map(&:file_accessors).flat_map{|item|item.resources}
+      else
+        bundles = @static_installer.pod_targets.reject { |t| @exclude_dep_items.any?{|item|t.pod_name == item}}.flat_map(&:file_accessors).flat_map{|item|item.resources}
+      end
+      if @dynamic
+        resources_path = "ios/#{@spec.name}.framework"
+        bundles.tap{|path| FileUtils.cp_r path,resources_path}
+        `cp -rp #{@static_sandbox_root}/build/*.bundle #{resources_path} 2>&1`
+      else
+        `cp -rp #{@static_sandbox_root}/build/*.bundle #{resources_path} 2>&1`
+        resources = expand_paths(@spec.consumer(@platform).resources)
+        if resources.count == 0 && bundles.count == 0
+          if @fwk
+            @fwk.delete_resources
+          else
+            if resources_target_path.exist?
+              FileUtils.rm_rf resources_target_path
+            end
+          end
+          return
+        end
+        if resources.count > 0
+          `cp -rp #{resources.join(' ')} #{resources_target_path}`
+        end
+        if bundles.count > 0
+          `cp -rp #{bundles.join(' ')} #{resources_target_path}`
+        end
+      end
+    end
+
     alias build_sim_libraries_t build_sim_libraries
     def build_sim_libraries(defines)
         if @select_archs.size != 0 && !@select_archs.include?('i386') && !@select_archs.include?('x86_64')
@@ -97,13 +213,9 @@ module Pod
     end
 
     alias initialize_t initialize
-    def initialize(platform, static_installer, source_dir, static_sandbox_root, dynamic_sandbox_root, public_headers_root, spec, embedded, mangle, dynamic, config, bundle_identifier, exclude_deps,all_deps= false ,black_deps=[],select_archs=[])
-      @all_deps = all_deps
-      @black_deps = black_deps
+    def initialize(platform, static_installer, source_dir, static_sandbox_root, dynamic_sandbox_root, public_headers_root, spec, embedded, mangle, dynamic, config, bundle_identifier, exclude_deps,exclude_dep_items=[],select_archs=[])
+      @exclude_dep_items = exclude_dep_items
       @select_archs = select_archs
-      @target_type_ext = ['.a','.bundle']
-      @target_dir_ext_ext = "#{static_sandbox_root}/build"
-      @black_list_ext = ["#{static_sandbox_root}/build","#{static_sandbox_root}/build-sim"]
       initialize_t(platform, static_installer,source_dir, static_sandbox_root, dynamic_sandbox_root, public_headers_root, spec, embedded, mangle, dynamic, config, bundle_identifier, exclude_deps)
     end 
   end

data/lib/cocoapods-packager-ext/ext/pod_utils.rb

@@ -0,0 +1,57 @@
+module Pod
+  class Command
+    class Package
+
+      # @param [Pod::Installer] static_installer
+      #
+      # @return [Pod::PodTarget]
+      #
+      alias build_dynamic_target_t build_dynamic_target
+
+      def build_dynamic_target(dynamic_sandbox, static_installer, platform)
+        spec_targets = static_installer.pod_targets.select do |target|
+          target.name == @spec.name
+        end
+        static_target = spec_targets[0]
+
+        file_accessors = create_file_accessors(static_target, dynamic_sandbox)
+
+        archs = []
+        dynamic_target = Pod::PodTarget.new(dynamic_sandbox, BuildType.dynamic_framework, static_target.user_build_configurations, archs, platform, static_target.specs, static_target.target_definitions, file_accessors)
+        dynamic_target
+      end
+      alias copy_dynamic_target_t copy_dynamic_target
+      def copy_dynamic_target(static_sandbox, _dynamic_target, dynamic_sandbox)
+        command = "ln -sf #{static_sandbox.root}/#{@spec.name} #{dynamic_sandbox.root}"
+        `#{command}`
+      end
+
+      alias write_pod_project_t write_pod_project
+      def write_pod_project(dynamic_project, dynamic_sandbox)
+        UI.message "- Writing Xcode project file to #{UI.path dynamic_sandbox.project_path}" do
+          dynamic_project.pods.remove_from_project if dynamic_project.pods.empty?
+          dynamic_project.development_pods.remove_from_project if dynamic_project.development_pods.empty?
+          dynamic_project.sort(:groups_position => :below)
+          dynamic_project.recreate_user_schemes(false)
+
+          # Edit search paths so that we can find our dependency headers
+          dynamic_project.targets.first.build_configuration_list.build_configurations.each do |config|
+            header_path = Dir.glob("#{Dir.pwd}/Pods/Static/Headers/*/*")
+            header_path.push "#{Dir.pwd}/Pods/Static/Headers/Public"
+            header_path.push "#{Dir.pwd}/Pods/Static/Headers/Private"
+            header_path.reject! {|item|item.split('/').last == dynamic_project.targets.first.name}
+            header_path = header_path.join " "
+            config.build_settings['HEADER_SEARCH_PATHS'] = "$(inherited) #{header_path}"
+            config.build_settings['USER_HEADER_SEARCH_PATHS'] = "$(inherited) #{header_path}"
+            config.build_settings['OTHER_LDFLAGS'] = '$(inherited) -ObjC'
+
+            if ENV['DISABLE_BITCODE'] && (ENV['DISABLE_BITCODE'].upcase == 'YES' || ENV['DISABLE_BITCODE'].upcase == 'TRUE')
+              config.build_settings['ENABLE_BITCODE'] = 'NO'
+            end
+          end
+          dynamic_project.save
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-packager-ext/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPackagerExt
-  VERSION = "0.0.21"
+  VERSION = "0.0.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-packager-ext
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.26
 platform: ruby
 authors:
 - kyle.zhou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.5.1.alpha.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.5.1.alpha.0
 description: A short description of cocoapods-packager-ext.
 email:
 - kyle.zhou@qq.com
@@ -72,6 +72,7 @@ files:
 - lib/cocoapods-packager-ext/ext/builder.rb
 - lib/cocoapods-packager-ext/ext/downloader/lnpath.rb
 - lib/cocoapods-packager-ext/ext/downloader_ext.rb
+- lib/cocoapods-packager-ext/ext/pod_utils.rb
 - lib/cocoapods-packager-ext/gem_version.rb
 - lib/cocoapods_plugin.rb
 - spec/command/ext_spec.rb