cocoapods-imy-bin 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52e4a6a4fb317bc8d4401fe5e14d842e062a26c44fe211c19fc8492d93e3ef68
-  data.tar.gz: e7ce061e032588ddc28ea6d9348426464eaf8a2bef89f449b92f59fe25a1bad4
+  metadata.gz: a03eee369ef1acbf03c386b400c2f55dcfb02cabd60a02f21ac5ba8392489a9e
+  data.tar.gz: f42893c6d370ed5bbe06b438ae52295ddf3a1dc7d4370246e0e11c3e78e3254a
 SHA512:
-  metadata.gz: 5b875bfa26b32c532f4b25559c4e4320ecab97edf2263bb889dd60576a2463b566af00b9448ee38d8e8240ebab82c640159c0ef1dfb2fb043819e5f396216d0e
-  data.tar.gz: c8c6e6d2a46c4168b6e655326d625b0257ace4649cc2702564cca90ff4e8aa43c15f9cfeee3f40fac699eb47245a0e383a626ca18b92a0bfaeffc7138b7e3a24
+  metadata.gz: 665d22d827cef79270ad243b26515338fea285a80ddb3cb462ca88aae5e12ef734ef0cfce7c69301b4843bd3a85eba7c065b1616bc03a326c7c91ac13fbf12b5
+  data.tar.gz: 32c4315f9884e64a7f8afb3283eae3d042aa5844354a098002d659b12aa3c07226a1a03064c850d0cfe4994400a5d0183733a85ce3b184dc640d17b1f50530c8

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

@@ -19,7 +19,7 @@ module Pod
               ['--framework-output', '输出framework文件'],
               ['--no-zip', '不压缩静态 framework 为 zip'],
               ['--all-make', '对该组件的依赖库，全部制作为二进制组件'],
-              ['--configuration', 'Build the specified configuration (e.g. Debug). Defaults to Release'],
+              ['--configuration', 'Build the specified configuration (e.g. Release ). Defaults to Debug'],
               ['--env', "该组件上传的环境 %w[dev debug_iphoneos release_iphoneos]"]
           ]
         end
@@ -40,7 +40,7 @@ module Pod
           @all_make = argv.flag?('all-make', false )
           @verbose = argv.flag?('verbose',true)
 
-          @config = argv.option('configuration', 'Release')
+          @config = argv.option('configuration', 'Debug')
 
           super
         end

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.2.8'
+  VERSION = '0.2.9'
 end
 
 module Pod

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

@@ -10,7 +10,7 @@ module CBin
     class Builder
       include Pod
 #Debug下还待完成
-      def initialize(spec, file_accessor, platform, source_dir, isRootSpec = true, build_model="Release")
+      def initialize(spec, file_accessor, platform, source_dir, isRootSpec = true, build_model="Debug")
         @spec = spec
         @source_dir = source_dir
         @file_accessor = file_accessor
@@ -72,14 +72,10 @@ module CBin
       def build_sim_libraries(defines)
         UI.message 'Building simulator libraries'
 
-        if is_debug_model
-          # archs = %w[i386 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', "Release")
+        # archs = %w[i386 x86_64]
+        archs = ios_architectures_sim
+        archs.map do |arch|
+          xcodebuild(defines, "-sdk iphonesimulator ARCHS=\'#{arch}\' ", "build-#{arch}",@build_model)
         end
 
       end
@@ -96,33 +92,33 @@ 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
+        # 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
+        # end
 
         build_path = Pathname("build")
         build_path.mkpath unless build_path.exist?
 
-        if is_debug_model
+        # 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
+        # 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(' ')}`
@@ -166,15 +162,15 @@ module CBin
         defines += @spec.consumer(@platform).compiler_flags.join(' ')
 
         options = ios_build_options
-        if is_debug_model
+        # if is_debug_model
           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)
           end
-        else
-          xcodebuild(defines,options)
-        end
+        # else
+          # xcodebuild(defines,options)
+        # end
 
         defines
       end
@@ -193,7 +189,7 @@ module CBin
         # end
       end
 
-      def xcodebuild(defines = '', args = '', build_dir = 'build',build_model = 'Debug')
+      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"

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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-imy-bin
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - 苏良锦
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel