cocoapods-imy-bin 0.2.1 → 0.2.7

data/lib/cocoapods-imy-bin/command/bin/archive.rb

@@ -29,6 +29,7 @@ module Pod
               ['--sources', '私有源地址，多个用分号区分'],
               ['--framework-output', '输出framework文件'],
               ['--no-zip', '不压缩静态库 为 zip'],
+              ['--configuration', 'Build the specified configuration (e.g. Debug). Defaults to Release'],
               ['--env', "该组件上传的环境 %w[dev debug_iphoneos release_iphoneos]"]
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
@@ -51,6 +52,8 @@ module Pod
           @sources = argv.option('sources') || []
           @platform = Platform.new(:ios)
 
+          @config = argv.option('configuration', 'Release')
+
           @framework_path
           super
 
@@ -81,7 +84,8 @@ module Pod
                                             @framework_output,
                                             @zip,
                                             @spec,
-                                            CBin::Config::Builder.instance.white_pod_list.include?(@spec.name))
+                                            CBin::Config::Builder.instance.white_pod_list.include?(@spec.name),
+                                            @config)
           builder.build
           builder.clean_workspace if @clean && !@all_make
         end
@@ -119,7 +123,9 @@ module Pod
                                                 @platform,
                                                 @framework_output,
                                                 @zip,
-                                                @spec)
+                                                @spec,
+                                                false ,
+                                                @config)
               builder.build
             rescue
               fail_build_specs << spec
@@ -148,6 +154,7 @@ module Pod
                   "--sources=#{sources_option(@code_dependencies, @sources)}",
                   "--gen-directory=#{CBin::Config::Builder.instance.gen_dir}",
                   '--clean',
+                  '--use-podfile',
                   *@additional_args
                 ]
 

data/lib/cocoapods-imy-bin/command/bin/auto.rb

@@ -19,6 +19,7 @@ module Pod
               ['--framework-output', '输出framework文件'],
               ['--no-zip', '不压缩静态 framework 为 zip'],
               ['--all-make', '对该组件的依赖库，全部制作为二进制组件'],
+              ['--configuration', 'Build the specified configuration (e.g. Debug). Defaults to Release'],
               ['--env', "该组件上传的环境 %w[dev debug_iphoneos release_iphoneos]"]
           ]
         end
@@ -38,6 +39,9 @@ module Pod
           @zip = argv.flag?('zip', true)
           @all_make = argv.flag?('all-make', false )
           @verbose = argv.flag?('verbose',true)
+
+          @config = argv.option('configuration', 'Release')
+
           super
         end
 
@@ -113,7 +117,7 @@ module Pod
           if @env
             argvs += ["--env=#{@env}"]
           end
-
+          argvs += ["--configuration=#{@config}"]
           
           archive = Pod::Command::Bin::Archive.new(CLAide::ARGV.new(argvs))
           archive.validate!

data/lib/cocoapods-imy-bin/command/bin/code.rb

@@ -83,11 +83,6 @@ module Pod
           FileUtils.rm_rf(target_path)
 
           find_dependency = find_dependency(name)
-          # 意义不大，需要可以使用--source参数 对 github-ios 仓库对做特殊处理
-          # if find_dependency && find_dependency.external_source[:podspec].include?(http_gitlib_GitHub_iOS_path)
-          #   github_ios = find_dependency.external_source[:podspec]
-            # find_dependency.external_source[:podspec] = github_ios.gsub(http_gitlib_GitHub_iOS_path,http_gitlib_iOS_path)
-          # end
 
           spec = fetch_external_source(find_dependency, @config.podfile,@config.lockfile, @config.sandbox,true )
 
@@ -106,7 +101,6 @@ module Pod
               break
             end
           end
-
           find_dependency
         end
 
@@ -150,6 +144,7 @@ module Pod
             FileUtils.rm_rf(File.join(dir,basename))
             `ln -s #{target_path} #{dir}/#{basename}`
           end
+
           check(lib_file,dir,basename)
         end
 

data/lib/cocoapods-imy-bin/command/bin/update.rb

@@ -73,26 +73,31 @@ module Pod
 
             podfile.instance_eval do
               begin
+
+                # podfile HASH_KEYS才有plugins字段，否则会被限制
+                if local_podfile.plugins.any?
+                  hash_plugins = podfile.plugins || {}
+                  hash_plugins = hash_plugins.merge(local_podfile.plugins)
+                  set_hash_value(%w[plugins].first, hash_plugins)
+
+                  # 加入源码白名单，避免本地库被二进制了
+                  podfile.set_use_source_pods(local_podfile.use_source_pods) if local_podfile.use_source_pods
+                  podfile.use_binaries!(local_podfile.use_binaries?)
+                end
+
                 # 在target把local-target中到dependencies值删除了，再设置
                 # 把本地和原始到dependencies 合并，设置dependencies
                 local_podfile&.target_definition_list&.each do |local_target|
                   next if local_target.name == 'Pods'
 
                   target_definition_list.each do |target|
+
                     unless target.name == local_target.name &&
                         (local_target.to_hash['dependencies'] &&local_target.to_hash['dependencies'].any?)
                       next
                     end
 
-                    # podfile HASH_KEYS才有plugins字段，否则会被限制
-                    if local_podfile.plugins.any?
-                      hash_plugins = podfile.plugins || {}
-                      hash_plugins = hash_plugins.merge(local_podfile.plugins)
-                      set_hash_value(%w[plugins].first, hash_plugins)
-                    end
-                    # 加入源码白名单，避免本地库被二进制了
-                    podfile.set_use_source_pods(local_podfile.use_source_pods) if local_podfile.use_source_pods
-                    podfile.use_binaries!(local_podfile.use_binaries?)
+
 
                     target.instance_exec do
                       # 在target把local-target中到dependencies值删除了，再设置
@@ -126,6 +131,7 @@ module Pod
 
                     end
                   end
+
                 end
 
                 if local_pre_install_callback

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.2.1'
+  VERSION = '0.2.7'
 end
 
 module Pod

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

@@ -51,7 +51,7 @@ module CBin
         source_dir = Dir.pwd
         file_accessor = Sandbox::FileAccessor.new(Pathname.new('.').expand_path, @spec.consumer(@platform))
         Dir.chdir(workspace_directory) do
-          builder = CBin::Framework::Builder.new(@spec, file_accessor, @platform, source_dir,@isRootSpec)
+          builder = CBin::Framework::Builder.new(@spec, file_accessor, @platform, source_dir, @isRootSpec, @build_model )
           @@build_defines = builder.build if @isRootSpec
           begin
             @framework_path = builder.lipo_build(@@build_defines) unless @skip_archive

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

@@ -38,7 +38,7 @@ module CBin
       end
 
       def lipo_build(defines)
-        UI.section("Building static framework #{@spec}") do
+        UI.section("Building static Library #{@spec}") do
           # defines = compile
 
           # build_sim_libraries(defines)
@@ -68,118 +68,22 @@ module CBin
         `cp -fa #{@platform}/#{framework_name} #{target_dir}`
       end
 
+      #模拟器，目前只支持 debug x86-64
       def build_sim_libraries(defines)
         UI.message 'Building simulator libraries'
 
         if is_debug_model
           # archs = %w[i386 x86_64]
-          archs = %w[x86_64]
+          archs = ios_architectures_sim
           archs.map do |arch|
             xcodebuild(defines, "-sdk iphonesimulator ARCHS=\'#{arch}\' ", "build-#{arch}","Debug")
           end
         else
-          xcodebuild(defines, "-sdk iphonesimulator ", 'build-simulator')
+          xcodebuild(defines, "-sdk iphonesimulator ", 'build-simulator', "Release")
         end
 
       end
 
-      def copy_headers
-        #走 podsepc中的public_headers
-        public_headers = Array.new
-
-        #by slj 如果没有头文件，去 "Headers/Public"拿
-        # if public_headers.empty?
-          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
-        # end
-
-        # UI.message "Copying public headers #{public_headers.map(&:basename).map(&:to_s)}"
-
-        public_headers.each do |h|
-          `ditto #{h} #{framework.headers_path}/#{h.basename}`
-        end
-
-        # 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}.h")
-          module_map = <<-MAP
-          framework module #{@spec.name} {
-            umbrella header "#{@spec.name}.h"
-
-            export *
-            module * { export * }
-          }
-          MAP
-        end
-
-        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)
-        end
-      end
-
-      def copy_license
-        UI.message 'Copying license'
-        license_file = @spec.license[:file] || 'LICENSE'
-        `cp "#{license_file}" .` if Pathname(license_file).exist?
-      end
-
-      def copy_resources
-
-        bundles = Dir.glob('./build/*.bundle')
-
-        bundle_names = [@spec, *@spec.recursive_subspecs].flat_map do |spec|
-          consumer = spec.consumer(@platform)
-          consumer.resource_bundles.keys +
-              consumer.resources.map do |r|
-                File.basename(r, '.bundle') if File.extname(r) == 'bundle'
-              end
-        end.compact.uniq
-
-        bundles.select! do |bundle|
-          bundle_name = File.basename(bundle, '.bundle')
-          bundle_names.include?(bundle_name)
-        end
-
-        if bundles.count > 0
-          UI.message "Copying bundle files #{bundles}"
-          bundle_files = bundles.join(' ')
-          `cp -rp #{bundle_files} #{framework.resources_path} 2>&1`
-        end
-
-        real_source_dir = @isRootSpec ? @source_dir : Pathname.new(File.join(Dir.pwd,"#{@spec.name}"))
-        resources = [@spec, *@spec.recursive_subspecs].flat_map do |spec|
-          expand_paths(real_source_dir, spec.consumer(@platform).resources)
-        end.compact.uniq
-
-        if resources.count == 0 && bundles.count == 0
-          framework.delete_resources
-          return
-        end
-
-        if resources.count > 0
-          #把 路径转义。 避免空格情况下拷贝失败
-          escape_resource = []
-           resources.each do |source|
-             escape_resource << Shellwords.join(source)
-          end
-          UI.message "Copying resources #{escape_resource}"
-          `cp -rp #{escape_resource.join(' ')} #{framework.resources_path}`
-        end
-      end
 
       def static_libs_in_sandbox(build_dir = 'build')
         file = Dir.glob("#{build_dir}/lib#{target_name}.a")
@@ -194,21 +98,32 @@ module CBin
         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}") + static_libs_in_sandbox('build-simulator') + @vendored_libraries
+            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
 
         build_path = Pathname("build")
         build_path.mkpath unless build_path.exist?
 
-        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
+        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
+
         UI.message "lipo -create -output #{output} #{libs.join(' ')}"
         `lipo -create -output #{output} #{libs.join(' ')}`
       end
@@ -230,11 +145,18 @@ module CBin
         #   iphone5,iphone5s以下的模拟器
         # >x86_64
         #   iphone6以上的模拟器
-        archs = %w[x86_64 arm64 armv7]
+        archs = %w[arm64 armv7]
         # archs = %w[x86_64 arm64 armv7s i386]
-        @vendored_libraries.each do |library|
-          archs = `lipo -info #{library}`.split & archs
-        end
+        # @vendored_libraries.each do |library|
+        #   archs = `lipo -info #{library}`.split & archs
+        # end
+        archs
+      end
+
+      def ios_architectures_sim
+
+        archs = %w[x86_64]
+        # TODO 处理是否需要 i386
         archs
       end
 
@@ -245,7 +167,7 @@ module CBin
 
         options = ios_build_options
         if is_debug_model
-          archs = %w[arm64 armv7]
+          archs = ios_architectures
           # archs = %w[arm64 armv7 armv7s]
           archs.map do |arch|
             xcodebuild(defines, "ARCHS=\'#{arch}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'","build-#{arch}",@build_model)
@@ -271,10 +193,14 @@ module CBin
         # end
       end
 
-      def xcodebuild(defines = '', args = '', build_dir = 'build',build_model = 'Release')
-        #xcodebuild GCC_PREPROCESSOR_DEFINITIONS='$(inherited)'  ARCHS='x86_64 arm64 armv7 armv7s i386' OTHER_CFLAGS='-fembed-bitcode -Qunused-arguments' CONFIGURATION_BUILD_DIR=build clean build -configuration Debug -target IMYTCP -project ./Pods.xcodeproj 2>&1
-        # xcodebuild GCC_PREPROCESSOR_DEFINITIONS='$(inherited)'  -sdk iphoneos CONFIGURATION_BUILD_DIR=build-simulator clean build -configuration Release -target IMYFoundation -project ./Pods/Pods.xcodeproj 2>&1
-        command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
+      def xcodebuild(defines = '', args = '', build_dir = 'build',build_model = 'Debug')
+
+        unless File.exist?("Pods.xcodeproj") #cocoapods-generate v2.0.0
+          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{File.join(File.expand_path("..", build_dir), File.basename(build_dir))} clean build -configuration #{build_model} -target #{target_name} -project ./Pods/Pods.xcodeproj 2>&1"
+        else
+          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
+        end
+
         UI.message "command = #{command}"
         output = `#{command}`.lines.to_a
 
@@ -289,6 +215,104 @@ module CBin
         end
       end
 
+      def copy_headers
+        #走 podsepc中的public_headers
+        public_headers = Array.new
+
+        #by slj 如果没有头文件，去 "Headers/Public"拿
+        # if public_headers.empty?
+        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
+        # end
+
+        # UI.message "Copying public headers #{public_headers.map(&:basename).map(&:to_s)}"
+
+        public_headers.each do |h|
+          `ditto #{h} #{framework.headers_path}/#{h.basename}`
+        end
+
+        # 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}.h")
+          module_map = <<-MAP
+          framework module #{@spec.name} {
+            umbrella header "#{@spec.name}.h"
+
+            export *
+            module * { export * }
+          }
+          MAP
+        end
+
+        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)
+        end
+      end
+
+      def copy_license
+        UI.message 'Copying license'
+        license_file = @spec.license[:file] || 'LICENSE'
+        `cp "#{license_file}" .` if Pathname(license_file).exist?
+      end
+
+      def copy_resources
+
+        bundles = Dir.glob('./build/*.bundle')
+
+        bundle_names = [@spec, *@spec.recursive_subspecs].flat_map do |spec|
+          consumer = spec.consumer(@platform)
+          consumer.resource_bundles.keys +
+              consumer.resources.map do |r|
+                File.basename(r, '.bundle') if File.extname(r) == 'bundle'
+              end
+        end.compact.uniq
+
+        bundles.select! do |bundle|
+          bundle_name = File.basename(bundle, '.bundle')
+          bundle_names.include?(bundle_name)
+        end
+
+        if bundles.count > 0
+          UI.message "Copying bundle files #{bundles}"
+          bundle_files = bundles.join(' ')
+          `cp -rp #{bundle_files} #{framework.resources_path} 2>&1`
+        end
+
+        real_source_dir = @isRootSpec ? @source_dir : Pathname.new(File.join(Dir.pwd,"#{@spec.name}"))
+        resources = [@spec, *@spec.recursive_subspecs].flat_map do |spec|
+          expand_paths(real_source_dir, spec.consumer(@platform).resources)
+        end.compact.uniq
+
+        if resources.count == 0 && bundles.count == 0
+          framework.delete_resources
+          return
+        end
+
+        if resources.count > 0
+          #把 路径转义。 避免空格情况下拷贝失败
+          escape_resource = []
+          resources.each do |source|
+            escape_resource << Shellwords.join(source)
+          end
+          UI.message "Copying resources #{escape_resource}"
+          `cp -rp #{escape_resource.join(' ')} #{framework.resources_path}`
+        end
+      end
+
       def expand_paths(source_dir, path_specs)
         path_specs.map do |path_spec|
           Dir.glob(File.join(source_dir, path_spec))
@@ -302,6 +326,8 @@ module CBin
           framework
         end
       end
+
+
     end
   end
 end