cocoapods-imy-bin 0.2.6 → 0.3.0.11

data/lib/cocoapods-imy-bin/helpers/local/local_framework_builder.rb

@@ -12,31 +12,55 @@ module CBin
     class Builder
       include Pod
 #Debug下还待完成
-      def initialize(spec, file_accessor, platform, local_build_dir_name, local_build_dir)
+      def initialize(spec, file_accessor, platform, local_build_dir_name, local_build_dir, is_library = true, framework_BuildProductsPath = "")
         @spec = spec
         @file_accessor = file_accessor
         @platform = platform
         @local_build_dir_name = local_build_dir_name
         @local_build_dir = local_build_dir
+        @is_library = is_library
+        @framework_BuildProductsPath = framework_BuildProductsPath
       end
 
       def create
-        UI.section("Building static framework #{@spec}") do
-          output = framework.versions_path + Pathname.new(@spec.name)
-
-          build_static_library_for_ios(output)
+        begin
+          #如果是.a 文件， 或者 swift下，是.a文件的
+          if @is_library || (!@is_library && @framework_BuildProductsPath != framework_name)
+
+            UI.section("Building static library #{@spec}") do
+              output = framework.versions_path + Pathname.new(@spec.name)
+              build_static_library_for_ios(output)
+              res = copy_headers
+              # maybe fails for copy_headers
+              if res
+                copy_resources
+                cp_to_source_dir
+              else
+                FileUtils.remove_dir(framework.fwk_path) if File.exist?(framework.fwk_path)
+                return nil
+              end
+            end
 
-          copy_headers
-          copy_resources
+          else
+            UI.section("Building static framework #{@spec}") do
+              output = File.join(CBin::Config::Builder.instance.zip_dir,"#{@spec.name}.framework")
+              build_static_framework_for_ios(output)
+            end
+          end
 
-          cp_to_source_dir
+        rescue StandardError
+          UI.warn "【#{spec.name} | #{spec.version}】组件二进制版本组装失败 ."
         end
+
         framework
       end
 
       private
 
       def cp_to_source_dir
+        # 删除Versions 软链接
+        framework.remove_current_version if CBin::Build::Utils.is_swift_module(@spec)
+
         target_dir = File.join(CBin::Config::Builder.instance.root_dir,CBin::Config::Builder.instance.framework_file(@spec))
         FileUtils.rm_rf(target_dir) if File.exist?(target_dir)
 
@@ -46,58 +70,80 @@ module CBin
         `cp -fa #{@platform}/#{CBin::Config::Builder.instance.framework_name(@spec)} #{target_dir}`
       end
 
+
       def copy_headers
         #by slj 如果没有头文件，去 "Headers/Public"拿
         # if public_headers.empty?
         Dir.chdir(File.join(Pod::Config.instance.installation_root,'Pods')) do
 
-          #走 podsepc中的public_headers
-          public_headers = Array.new
-          Dir.chdir("./Headers/Public/#{@spec.name}") do
-            headers = Dir.glob('*.h')
-            headers.each do |h|
-              public_headers << Pathname.new(File.join(Dir.pwd,h))
-            end
-          end
+          if File.exist?("./Headers/Public/#{@spec.name}")
+            #走 podsepc中的public_headers
+            public_headers = Array.new
 
-          UI.message "Copying public headers #{public_headers.map(&:basename).map(&:to_s)}"
+            Dir.chdir("./Headers/Public/#{@spec.name}") do
+              headers = Dir.glob('*.h')
+              headers.each do |h|
+                public_headers << Pathname.new(File.join(Dir.pwd,h))
+              end
+            end
 
-          public_headers.each do |h|
-            `ditto #{h} #{framework.headers_path}/#{h.basename}`
-          end
+            UI.message "Copying public headers #{public_headers.map(&:basename).map(&:to_s)}"
 
-          # 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_accessor.module_map
-            if Pathname(module_map_file).exist?
-              module_map = File.read(module_map_file)
+            public_headers.each do |h|
+              `ditto #{h} #{framework.headers_path}/#{h.basename}`
             end
-          elsif public_headers.map(&:basename).map(&:to_s).include?("#{@spec.name}.h")
-            module_map = <<-MAP
+
+            # 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_accessor.module_map
+              if Pathname(module_map_file).exist?
+                module_map = File.read(module_map_file)
+              end
+            elsif public_headers.map(&:basename).map(&:to_s).include?("#{@spec.name}-umbrella.h")
+              module_map = <<-MAP
           framework module #{@spec.name} {
-            umbrella header "#{@spec.name}.h"
+            umbrella header "#{@spec.name}-umbrella.h"
 
             export *
             module * { export * }
           }
-            MAP
-          end
+              MAP
+            end
 
-          unless module_map.nil?
-            UI.message "Writing module map #{module_map}"
-            unless framework.module_map_path.exist?
-              framework.module_map_path.mkpath
+            unless module_map.nil?
+              UI.message "Writing module map #{module_map}"
+              unless framework.module_map_path.exist?
+                framework.module_map_path.mkpath
+              end
+              File.write("#{framework.module_map_path}/module.modulemap", module_map)
+
+              # unless framework.swift_module_path.exist?
+              #   framework.swift_module_path.mkpath
+              # end
+              # DO BuildProductsPath  swiftModule拷贝到 framework.swift_module_path
+              swiftmodule_path = File.join(@framework_BuildProductsPath, "#{@spec.name}.swiftmodule")
+              if File.directory?(swiftmodule_path)
+                FileUtils.cp_r("#{swiftmodule_path}/.", framework.swift_module_path)
+              end
+              swift_Compatibility_Header = "#{@framework_BuildProductsPath}/Swift\ Compatibility\ Header/#{@spec.name}-Swift.h"
+              FileUtils.cp(swift_Compatibility_Header,framework.headers_path) if File.exist?(swift_Compatibility_Header)
+              info_plist_file = File.join(File.dirname(File.dirname(__FILE__)),"info.plist")
+              FileUtils.cp(info_plist_file,framework.fwk_path)
             end
-            File.write("#{framework.module_map_path}/module.modulemap", module_map)
+          else
+            UI.warn "== Headers/Public/#{@spec.name} no exist"
+            return false
           end
 
         end
+        return true
       end
 
       def copy_resources
 
+
         Dir.chdir(Pod::Config.instance.sandbox_root) do
 
           bundles = Dir.glob('./build/*.bundle')
@@ -126,7 +172,7 @@ module CBin
             expand_paths(real_source_dir, spec.consumer(@platform).resources)
           end.compact.uniq
 
-          if resources.count == 0 && bundles.count == 0
+          if (resources.count == 0 || (resources.count == 1 && resources[0].count == 0)) && bundles.count == 0
             framework.delete_resources
             return
           end
@@ -150,10 +196,17 @@ module CBin
         `cp -rp  #{library_name} #{output}`
       end
 
+      def build_static_framework_for_ios(output)
+        FileUtils.cp_r(framework_name, output)
+      end
+
       def library_name
         File.join(@local_build_dir, "lib#{@spec.name}.a")
       end
 
+      def framework_name
+        File.join(@local_build_dir, "#{@spec.name}.framework")
+      end
 
       def expand_paths(source_dir, path_specs)
         path_specs.map do |path_spec|

data/lib/cocoapods-imy-bin/helpers/sources_helper.rb

@@ -21,8 +21,11 @@ module CBin
     # 只允许二进制的 specification subspec 比源码的 specification subspec 多
     #
     def valid_sources(code_dependencies = false)
-      sources = [binary_source, code_source]
-      sources.reverse! if code_dependencies
+      sources = [code_source]
+      unless code_dependencies
+        sources << binary_source
+        sources.reverse!
+      end
       sources
     end
 

data/lib/cocoapods-imy-bin/helpers/spec_source_creator.rb

@@ -20,12 +20,12 @@ module CBin
       end
 
       def create
-        spec = create_from_code_spec
-
-        # Pod::UI.message '生成二进制 podspec 内容: '
-        # spec.to_pretty_json.split("\n").each do |text|
-          # Pod::UI.message text
-        # end
+        # spec = nil
+        if CBin::Build::Utils.is_framework(@code_spec)
+          spec = create_framework_from_code_spec
+        else
+          spec = create_from_code_spec
+        end
 
         spec
       end
@@ -121,12 +121,69 @@ module CBin
         @spec.vendored_libraries = binary_vendored_libraries
         @spec.resources = binary_resources if @spec.attributes_hash.keys.include?("resources")
         @spec.description = <<-EOF
-         「   converted automatically by plugin cocoapods-imy-bin @slj    」
+         「   converted automatically by plugin cocoapods-imy-bin @厦门美柚 - slj    」
+          #{@spec.description}
+        EOF
+        @spec
+      end
+
+      def create_framework_from_code_spec
+        @spec = code_spec.dup
+        # vendored_frameworks | resources | source | source_files | public_header_files
+        # license | resource_bundles | vendored_libraries
+
+        # Project Linkin
+        @spec.vendored_frameworks = "#{code_spec.root.name}.framework"
+
+        # Resources
+        extnames = []
+        extnames << '*.bundle' if code_spec_consumer.resource_bundles.any?
+        if code_spec_consumer.resources.any?
+          extnames += code_spec_consumer.resources.map { |r| File.basename(r) }
+        end
+        if extnames.any?
+          @spec.resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } }
+        end
+
+        # Source Location
+        @spec.source = binary_source
+
+        # Source Code
+        # @spec.source_files = framework_contents('Headers/*')
+        # @spec.public_header_files = framework_contents('Headers/*')
+
+        # Unused for binary
+        spec_hash = @spec.to_hash
+        # spec_hash.delete('license')
+        spec_hash.delete('resource_bundles')
+        spec_hash.delete('exclude_files')
+        spec_hash.delete('preserve_paths')
+        # 这里不确定 vendored_libraries 指定的时动态/静态库
+        # 如果是静态库的话，需要移除，否则就不移除
+        # 最好是静态库都独立成 Pod ，cocoapods-package 打静态库去 collect 目标文件时好做过滤
+        # 这里统一只对命名后缀 .a 文件做处理
+        # spec_hash.delete('vendored_libraries')
+        # libraries 只能假设为动态库不做处理了，如果有例外，需要开发者自行处理
+        vendored_libraries = spec_hash.delete('vendored_libraries')
+        vendored_libraries = Array(vendored_libraries).reject { |l| l.end_with?('.a') }
+        if vendored_libraries.any?
+          spec_hash['vendored_libraries'] = vendored_libraries
+        end
+
+        # Filter platforms
+        platforms = spec_hash['platforms']
+        selected_platforms = platforms.select { |k, _v| @platforms.include?(k) }
+        spec_hash['platforms'] = selected_platforms.empty? ? platforms : selected_platforms
+
+        @spec = Pod::Specification.from_hash(spec_hash)
+        @spec.description = <<-EOF
+         「   converted automatically by plugin cocoapods-imy-bin @厦门美柚 - slj    」
           #{@spec.description}
-EOF
+        EOF
         @spec
       end
 
+
       def binary_source
         { http: format(CBin.config.binary_download_url, code_spec.root.name, code_spec.version), type: CBin.config.download_file_type }
       end

data/lib/cocoapods-imy-bin/helpers/upload_helper.rb

@@ -47,14 +47,19 @@ module CBin
       def curl_zip
         zip_file = "#{CBin::Config::Builder.instance.library_file(@spec)}.zip"
         res = File.exist?(zip_file)
-        print <<EOF
+        unless res
+          zip_file = CBin::Config::Builder.instance.framework_zip_file(@spec) + ".zip"
+          res = File.exist?(zip_file)
+        end
+        if res
+          print <<EOF
           上传二进制文件
          curl #{CBin.config.binary_upload_url} -F "name=#{@spec.name}" -F "version=#{@spec.version}" -F "annotate=#{@spec.name}_#{@spec.version}_log" -F "file=@#{zip_file}"
 EOF
-        `curl #{CBin.config.binary_upload_url} -F "name=#{@spec.name}" -F "version=#{@spec.version}" -F "annotate=#{@spec.name}_#{@spec.version}_log" -F "file=@#{zip_file}"` if res
+          `curl #{CBin.config.binary_upload_url} -F "name=#{@spec.name}" -F "version=#{@spec.version}" -F "annotate=#{@spec.name}_#{@spec.version}_log" -F "file=@#{zip_file}"` if res
+        end
 
         res
-
       end
 
 

data/lib/cocoapods-imy-bin/native.rb

@@ -16,4 +16,8 @@ if Pod.match_version?('~> 1.4')
   require 'cocoapods-imy-bin/native/acknowledgements'
   require 'cocoapods-imy-bin/native/sandbox_analyzer'
   require 'cocoapods-imy-bin/native/podspec_finder'
+  require 'cocoapods-imy-bin/native/file_accessor'
+  require 'cocoapods-imy-bin/native/pod_target_installer'
+  require 'cocoapods-imy-bin/native/target_validator'
+
 end

data/lib/cocoapods-imy-bin/native/analyzer.rb

@@ -48,6 +48,8 @@ module Pod
           old_update_repositories
         end
       end
+
+
     end
   end
 end

data/lib/cocoapods-imy-bin/native/file_accessor.rb

@@ -0,0 +1,28 @@
+require 'macho'
+require 'cocoapods'
+
+module Pod
+  class Sandbox
+    class FileAccessor
+
+      # swift动态库 需要设置为true
+     def dynamic_binary?(binary)
+       @cached_dynamic_binary_results ||= {}
+       return @cached_dynamic_binary_results[binary] unless @cached_dynamic_binary_results[binary].nil?
+       return false unless binary.file?
+
+       @cached_dynamic_binary_results[binary] = MachO.open(binary).dylib?
+     rescue MachO::MachOError
+       @cached_dynamic_binary_results[binary] = true
+
+     end
+
+     # def expanded_paths(patterns, options = {})
+     #   return [] if patterns.empty?
+     #    path_list.glob(patterns, options).flatten.compact.uniq
+     # end
+
+      #-----------------------------------------------------------------------#
+    end
+  end
+end

data/lib/cocoapods-imy-bin/native/pod_target_installer.rb

@@ -0,0 +1,94 @@
+module Pod
+  class Installer
+    class Xcode
+      class PodsProjectGenerator
+        # Creates the target for the Pods libraries in the Pods project and the
+        # relative support files.
+        #
+        class PodTargetInstaller < TargetInstaller
+          require 'cocoapods/installer/xcode/pods_project_generator/app_host_installer'
+
+          # Adds a shell script phase, intended only for library targets that contain swift,
+          # to copy the ObjC compatibility header (the -Swift.h file that the swift compiler generates)
+          # to the built products directory. Additionally, the script phase copies the module map, appending a `.Swift`
+          # submodule that references the (moved) compatibility header. Since the module map has been moved, the umbrella header
+          # is _also_ copied, so that it is sitting next to the module map. This is necessary for a successful archive build.
+          #
+          # @param  [PBXNativeTarget] native_target
+          #         the native target to add the Swift static library script phase into.
+          #
+          # @return [Void]
+          #
+          alias old_add_swift_library_compatibility_header_phase add_swift_library_compatibility_header_phase
+
+          def add_swift_library_compatibility_header_phase(native_target)
+            UI.warn("========= swift add_swift_library_compatibility_header_phase")
+            if $ARGV[1] == "auto"
+              UI.warn("========= auto swift add_swift_library_compatibility_header_phase")
+
+              if custom_module_map
+                raise Informative, 'Using Swift static libraries with custom module maps is currently not supported. ' \
+                                 "Please build `#{target.label}` as a framework or remove the custom module map."
+              end
+
+              build_phase = native_target.new_shell_script_build_phase('Copy generated compatibility header')
+
+              relative_module_map_path = target.module_map_path.relative_path_from(target.sandbox.root)
+              relative_umbrella_header_path = target.umbrella_header_path.relative_path_from(target.sandbox.root)
+
+              build_phase.shell_script = <<-SH.strip_heredoc
+              COMPATIBILITY_HEADER_PATH="${BUILT_PRODUCTS_DIR}/Swift Compatibility Header/${PRODUCT_MODULE_NAME}-Swift.h"
+              MODULE_MAP_PATH="${BUILT_PRODUCTS_DIR}/${PRODUCT_MODULE_NAME}.modulemap"
+
+              ditto "${DERIVED_SOURCES_DIR}/${PRODUCT_MODULE_NAME}-Swift.h" "${COMPATIBILITY_HEADER_PATH}"
+              ditto "${PODS_ROOT}/#{relative_module_map_path}" "${MODULE_MAP_PATH}"
+              ditto "${PODS_ROOT}/#{relative_umbrella_header_path}" "${BUILT_PRODUCTS_DIR}"
+              
+              COPY_PATH="${PODS_CONFIGURATION_BUILD_DIR}/${PRODUCT_MODULE_NAME}"
+              UMBRELLA_PATH="${BUILT_PRODUCTS_DIR}/${PRODUCT_MODULE_NAME}-umbrella.h"
+              SWIFTMODULE_PATH="${BUILT_PRODUCTS_DIR}/${PRODUCT_MODULE_NAME}.swiftmodule" 
+
+              ditto "${MODULE_MAP_PATH}" "${PODS_CONFIGURATION_BUILD_DIR}/${PRODUCT_MODULE_NAME}/${PRODUCT_MODULE_NAME}.modulemap"
+              ditto "${COMPATIBILITY_HEADER_PATH}" "${COPY_PATH}/Swift Compatibility Header/${PRODUCT_MODULE_NAME}-Swift.h"
+              ditto "${COMPATIBILITY_HEADER_PATH}" "${COPY_PATH}"
+              ditto "${UMBRELLA_PATH}" "${COPY_PATH}"
+              ditto "${SWIFTMODULE_PATH}" "${COPY_PATH}/${PRODUCT_MODULE_NAME}.swiftmodule"
+              ditto "${SWIFTMODULE_PATH}" "${COPY_PATH}/${PRODUCT_MODULE_NAME}.swiftmodule"
+              
+              if [ ${PRODUCT_MODULE_NAME} != ${PRODUCT_NAME} ] ; then
+                   ditto "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}-umbrella.h" "${COPY_PATH}"
+                   ditto "${COPY_PATH}" "${PODS_CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}"
+              fi
+    
+              MODULE_MAP_SEARCH_PATH = "${PODS_CONFIGURATION_BUILD_DIR}/${PRODUCT_MODULE_NAME}/${PRODUCT_MODULE_NAME}.modulemap"
+              
+              if [${MODULE_MAP_PATH} != ${MODULE_MAP_SEARCH_PATH}] ; then
+                  printf "\\n\\nmodule ${PRODUCT_MODULE_NAME}.Swift {\\n  header \\"${COPY_PATH}/Swift Compatibility Header/${PRODUCT_MODULE_NAME}-Swift.h\\"\\n  requires objc\\n}\\n" >> "${MODULE_MAP_SEARCH_PATH}"
+              fi
+
+              printf "\\n\\nmodule ${PRODUCT_MODULE_NAME}.Swift {\\n  header \\"${COMPATIBILITY_HEADER_PATH}\\"\\n  requires objc\\n}\\n" >> "${MODULE_MAP_PATH}"
+
+              SH
+              build_phase.input_paths = %W(
+              ${DERIVED_SOURCES_DIR}/${PRODUCT_MODULE_NAME}-Swift.h
+              ${PODS_ROOT}/#{relative_module_map_path}
+              ${PODS_ROOT}/#{relative_umbrella_header_path}
+              )
+              build_phase.output_paths = %W(
+              ${BUILT_PRODUCTS_DIR}/${PRODUCT_MODULE_NAME}.modulemap
+              ${BUILT_PRODUCTS_DIR}/#{relative_umbrella_header_path.basename}
+              ${BUILT_PRODUCTS_DIR}/Swift\ Compatibility\ Header/${PRODUCT_MODULE_NAME}-Swift.h
+            )
+            else
+              UI.warn("========= null swift add_swift_library_compatibility_header_phase")
+              old_add_swift_library_compatibility_header_phase(native_target)
+            end
+
+          end
+
+          #-----------------------------------------------------------------------#
+        end
+      end
+    end
+  end
+end