cocoapods-imy-bin 0.2.9.1 → 0.3.0.11

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

@@ -4,6 +4,7 @@ require 'cocoapods-imy-bin/helpers/framework.rb'
 require 'English'
 require 'cocoapods-imy-bin/config/config_builder'
 require 'shellwords'
+require 'cocoapods-imy-bin/helpers/build_utils'
 
 module CBin
   class Framework
@@ -38,26 +39,54 @@ module CBin
       end
 
       def lipo_build(defines)
-        UI.section("Building static Library #{@spec}") do
-          # defines = compile
 
-          # build_sim_libraries(defines)
-          output = framework.versions_path + Pathname.new(@spec.name)
+        if CBin::Build::Utils.is_swift_module(@spec) || !CBin::Build::Utils.uses_frameworks?
+          UI.section("Building static Library #{@spec}") do
+            # defines = compile
 
-          build_static_library_for_ios(output)
+            # build_sim_libraries(defines)
+            output = framework.versions_path + Pathname.new(@spec.name)
 
-          copy_headers
-          copy_license
-          copy_resources
+            build_static_library_for_ios(output)
 
-          cp_to_source_dir
+            copy_headers
+            copy_license
+            copy_resources
+
+            cp_to_source_dir
+          end
+        else
+          # begin
+            UI.section("Building framework  #{@spec}") do
+              # defines = compile
+
+              # build_sim_libraries(defines)
+              output = framework.fwk_path + Pathname.new(@spec.name)
+
+              copy_static_framework_dir_for_ios
+
+              build_static_framework_machO_for_ios(output)
+
+              # copy_license
+              copy_framework_resources
+
+              #cp_to_source_dir#
+
+            # rescue Object => exception
+            #   UI.puts exception
+            # end
+          end
         end
+
         framework
       end
 
       private
 
       def cp_to_source_dir
+        # 删除Versions 软链接
+        framework.remove_current_version if CBin::Build::Utils.is_swift_module(@spec)
+
         framework_name = "#{@spec.name}.framework"
         target_dir = File.join(CBin::Config::Builder.instance.zip_dir,framework_name)
         FileUtils.rm_rf(target_dir) if File.exist?(target_dir)
@@ -92,33 +121,21 @@ module CBin
       def build_static_library_for_ios(output)
         UI.message "Building ios libraries with archs #{ios_architectures}"
         static_libs = static_libs_in_sandbox('build') + static_libs_in_sandbox('build-simulator') + @vendored_libraries
-        # if is_debug_model
-          ios_architectures.map do |arch|
-            static_libs += static_libs_in_sandbox("build-#{arch}") + @vendored_libraries
-          end
-          ios_architectures_sim do |arch|
-            static_libs += static_libs_in_sandbox("build-#{arch}") + @vendored_libraries
-          end
-        # end
+
+        ios_architectures.map do |arch|
+          static_libs += static_libs_in_sandbox("build-#{arch}") + @vendored_libraries
+        end
+        ios_architectures_sim do |arch|
+          static_libs += static_libs_in_sandbox("build-#{arch}") + @vendored_libraries
+        end
 
         build_path = Pathname("build")
         build_path.mkpath unless build_path.exist?
 
-        # if is_debug_model
-          libs = (ios_architectures + ios_architectures_sim) .map do |arch|
-            library = "build-#{arch}/lib#{@spec.name}.a"
-            library
-          end
-        # else
-        #   libs = ios_architectures.map do |arch|
-        #     library = "build/package-#{@spec.name}-#{arch}.a"
-        #     # libtool -arch_only arm64 -static -o build/package-armv64.a build/libIMYFoundation.a build-simulator/libIMYFoundation.a
-        #     # 从liBFoundation.a 文件中，提取出 arm64 架构的文件，命名为build/package-armv64.a
-        #     UI.message "libtool -arch_only #{arch} -static -o #{library} #{static_libs.join(' ')}"
-        #     `libtool -arch_only #{arch} -static -o #{library} #{static_libs.join(' ')}`
-        #     library
-        #   end
-        # end
+        libs = (ios_architectures + ios_architectures_sim) .map do |arch|
+          library = "build-#{arch}/lib#{@spec.name}.a"
+          library
+        end
 
         UI.message "lipo -create -output #{output} #{libs.join(' ')}"
         `lipo -create -output #{output} #{libs.join(' ')}`
@@ -182,11 +199,11 @@ module CBin
       def target_name
         #区分多平台，如配置了多平台，会带上平台的名字
         # 如libwebp-iOS
-        # if @spec.available_platforms.count > 1
-        #   "#{@spec.name}-#{Platform.string_name(@spec.consumer(@platform).platform_name)}"
-        # else
-          @spec.name
-        # end
+         if @spec.available_platforms.count > 1
+           "#{@spec.name}-#{Platform.string_name(@spec.consumer(@platform).platform_name)}"
+         else
+            @spec.name
+         end
       end
 
       def xcodebuild(defines = '', args = '', build_dir = 'build', build_model = 'Debug')
@@ -244,10 +261,10 @@ module CBin
           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}.h")
+        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 * }
@@ -261,9 +278,29 @@ module CBin
             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
+          # todo 所有架构的swiftModule拷贝到 framework.swift_module_path
+          archs = ios_architectures + ios_architectures_sim
+          archs.map do |arch|
+            swift_module = "build-#{arch}/#{@spec.name}.swiftmodule"
+            if File.directory?(swift_module)
+              FileUtils.cp_r("#{swift_module}/.", framework.swift_module_path)
+            end
+          end
+          swift_Compatibility_Header = "build-#{archs.first}/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__),"info.plist")
+          FileUtils.cp(info_plist_file,framework.fwk_path)
         end
       end
 
+      def copy_swift_header
+
+      end
+
       def copy_license
         UI.message 'Copying license'
         license_file = @spec.license[:file] || 'LICENSE'
@@ -296,13 +333,18 @@ module CBin
           `cp -rp #{bundle_files} #{framework.resources_path} 2>&1`
         end
 
-        spec_source_dir = File.join(Dir.pwd,"#{@spec.name}")
-        unless File.exist?(spec_source_dir)
-          spec_source_dir = File.join(Dir.pwd,"Pods/#{@spec.name}")
+        real_source_dir = @source_dir
+        unless @isRootSpec
+          spec_source_dir = File.join(Dir.pwd,"#{@spec.name}")
+          unless File.exist?(spec_source_dir)
+            spec_source_dir = File.join(Dir.pwd,"Pods/#{@spec.name}")
+          end
+          raise "copy_resources #{spec_source_dir} no exist " unless File.exist?(spec_source_dir)
+
+          spec_source_dir = File.join(Dir.pwd,"#{@spec.name}")
+          real_source_dir = spec_source_dir
         end
-        raise "copy_resources #{spec_source_dir} no exist " unless File.exist?(spec_source_dir)
 
-        real_source_dir = @isRootSpec ? @source_dir : spec_source_dir
         resources = [@spec, *@spec.recursive_subspecs].flat_map do |spec|
           expand_paths(real_source_dir, spec.consumer(@platform).resources)
         end.compact.uniq
@@ -329,6 +371,65 @@ module CBin
         end
       end
 
+      #---------------------------------swift--------------------------------------#
+      #   lipo -create .a
+      def build_static_framework_machO_for_ios(output)
+        UI.message "Building ios framework with archs #{ios_architectures}"
+
+        static_libs = static_libs_in_sandbox('build') + @vendored_libraries
+        ios_architectures.map do |arch|
+          static_libs += static_libs_in_sandbox("build-#{arch}") + @vendored_libraries
+        end
+
+        ios_architectures_sim do |arch|
+          static_libs += static_libs_in_sandbox("build-#{arch}") + @vendored_libraries
+        end
+
+        build_path = Pathname("build")
+        build_path.mkpath unless build_path.exist?
+
+        libs = (ios_architectures + ios_architectures_sim) .map do |arch|
+          library = "build-#{arch}/#{@spec.name}.framework/#{@spec.name}"
+          library
+        end
+
+        UI.message "lipo -create -output #{output} #{libs.join(' ')}"
+        `lipo -create -output #{output} #{libs.join(' ')}`
+      end
+
+      def copy_static_framework_dir_for_ios
+
+        archs = ios_architectures + ios_architectures_sim
+        framework_dir = "build-#{ios_architectures_sim.first}/#{@spec.name}.framework"
+        framework_dir = "build-#{ios_architectures.first}/#{@spec.name}.framework" unless File.exist?(framework_dir)
+        unless File.exist?(framework_dir)
+          raise "#{framework_dir} path no exist"
+        end
+        File.join(Dir.pwd, "build-#{ios_architectures_sim.first}/#{@spec.name}.framework")
+        FileUtils.cp_r(framework_dir, framework.root_path)
+
+        # todo 所有架构的swiftModule拷贝到 framework.swift_module_path
+        archs.map do |arch|
+          swift_module = "build-#{arch}/#{@spec.name}.framework/Modules/#{@spec.name}.swiftmodule"
+          if File.directory?(swift_module)
+            FileUtils.cp_r("#{swift_module}/.", framework.swift_module_path)
+          end
+        end
+
+        # 删除Versions 软链接
+        framework.remove_current_version
+      end
+
+      def copy_framework_resources
+        resources = Dir.glob("#{framework.fwk_path + Pathname.new('Resources')}/*")
+        if resources.count == 0
+          framework.delete_resources
+        end
+      end
+
+
+      #---------------------------------getter and setter--------------------------------------#
+
       def framework
         @framework ||= begin
           framework = Framework.new(@spec.name, @platform.name.to_s)

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

@@ -34,15 +34,20 @@ module CBin
         @local_build_dir = local_build_dir
         @clean = clean
         @framework_path
+        @is_library = !is_framework
       end
 
       def build
         UI.section("Building static framework #{@spec}") do
 
           build_static_framework
-          build_static_library
-          zip_static_framework if @zip &&= @framework_output
-          zip_static_library
+          if @is_library
+            build_static_library
+            zip_static_framework if @zip &&= @framework_output
+            zip_static_library
+          else
+            zip_static_framework
+          end
 
           clean_workspace if @clean
         end
@@ -52,7 +57,7 @@ module CBin
       def build_static_framework
         file_accessor = Sandbox::FileAccessor.new(Pathname.new('.').expand_path, @spec.consumer(@platform))
         Dir.chdir(workspace_directory) do
-          builder = CBin::LocalFramework::Builder.new(@spec, file_accessor, @platform, @local_build_dir_name,@local_build_dir)
+          builder = CBin::LocalFramework::Builder.new(@spec, file_accessor, @platform, @local_build_dir_name,@local_build_dir, @is_library, frameWork_dir)
           @framework_path = builder.create
         end
       end
@@ -68,9 +73,10 @@ module CBin
 
       def zip_static_framework
         Dir.chdir(zip_dir) do
-          output_name = "#{framework_name}.zip"
+          # output_name = "#{framework_name}.zip"
+          output_name =  File.join(zip_dir, framework_name_zip)
           unless File.exist?(framework_name)
-            raise Informative, "没有需要压缩的 framework 文件：#{framework_name}"
+            UI.warn "没有需要压缩的 framework 文件：#{framework_name}"
           end
 
           UI.puts "Compressing #{framework_name} into #{output_name}"
@@ -110,6 +116,10 @@ module CBin
         CBin::Config::Builder.instance.framework_name(@spec)
       end
 
+      def framework_name_zip
+        CBin::Config::Builder.instance.framework_name_version(@spec) + ".zip"
+      end
+
       def library_name
         CBin::Config::Builder.instance.library_name(@spec)
       end
@@ -126,6 +136,28 @@ module CBin
         CBin::Config::Builder.instance.gen_name
       end
 
+      def is_library
+        File.exist?(File.join(@local_build_dir, "lib#{@spec.name}.a"))
+      end
+
+      # 使用了user_framework 会有#{@spec.name}.framework
+      # 未使用的 需要判断文件
+      def is_framework
+        res = File.exist?(File.join(@local_build_dir, "#{@spec.name}.framework"))
+        unless res
+          res = File.exist?(File.join(CBin::Config::Builder.instance.xcode_BuildProductsPath_dir, "#{@spec.name}","Swift Compatibility Header"))
+        end
+        res
+      end
+
+      def frameWork_dir
+        dir = File.join(@local_build_dir, "#{@spec.name}.framework")
+        unless File.exist?(dir)
+          dir = File.join(CBin::Config::Builder.instance.xcode_BuildProductsPath_dir, "#{@spec.name}")
+        end
+        dir
+      end
+
       def spec_file
         @spec_file ||= begin
                          if @podspec

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

@@ -9,6 +9,8 @@ module CBin
     attr_reader :resources_path
     attr_reader :root_path
     attr_reader :versions_path
+    attr_reader :swift_module_path
+    attr_reader :fwk_path
 
     def initialize(name, platform, local_build_dir)
       @name = name
@@ -29,6 +31,21 @@ module CBin
       (Pathname.new(@fwk_path) + Pathname.new('Resources')).delete
     end
 
+    def remove_current_version
+      FileUtils.rm_f(File.join(@fwk_path,@name))
+      FileUtils.rm_f(File.join(@fwk_path,"Headers"))
+      FileUtils.rm_f(File.join(@fwk_path,"Resources"))
+
+      FileUtils.cp_r("#{@versions_path}/.", @fwk_path)
+      # FileUtils.remove_dir(@versions_path)
+      FileUtils.remove_dir("#{@fwk_path}/Versions")
+
+      # current_version_path = @versions_path + Pathname.new('../Current')
+      # `ln -sf A #{current_version_path}`
+      # `ln -sf Versions/Current/Headers #{@fwk_path}/`
+      # `ln -sf Versions/Current/Resources #{@fwk_path}/`
+      # `ln -sf Versions/Current/#{@name} #{@fwk_path}/`
+    end
     private
 
     def make_current_version
@@ -41,10 +58,13 @@ module CBin
 
     def make_framework
       @fwk_path = @root_path + Pathname.new(@name + '.framework')
+      FileUtils.remove_dir(@fwk_path) if @fwk_path.exist?
       @fwk_path.mkdir unless @fwk_path.exist?
 
       @module_map_path = @fwk_path + Pathname.new('Modules')
       @versions_path = @fwk_path + Pathname.new('Versions/A')
+      @fwk_path.exist?
+      @swift_module_path = @module_map_path + Pathname.new(@name + '.swiftmodule')
     end
 
     def make_headers

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|