cocoapods-xcframework 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21eebd4159dfb6bb5f9ce1ff183edec5ec27f03711cecc7acf5d8d709083c537
-  data.tar.gz: 36505a48d941b64cfd935fe51879abc4d463128aed8ff8452f8eb35c13a1ef81
+  metadata.gz: e8410820adae7d30066089eff5f0a79633d4ecbaf70ede3b06ebcce87f9d6e40
+  data.tar.gz: f1bf1e1adffb03e021b4f60bc7ee08e9ab7b039760968d56c43a5eede00066be
 SHA512:
-  metadata.gz: 2f5591a1b65359fbc2fbff1d2a9a2158634ef95cb7e0c999d8a489c58276a6954ed30895676f13964fec0e0f29750ce3dcee412b38121ad786266902bd419249
-  data.tar.gz: a79c9b4b557543cf890b19fe9148853f0e64b497ec513cb7bf9f9ad1232fe544e4fcc4b4f643df4f830e89098af44cf4521679a553128f6ea6d49e2185b579db
+  metadata.gz: 14f5bf93a518920efd391519e14f45c2a52b3ecd21b9f463025e7e6623e77e2c2e8a39014c21cc53e0c8ab7503aaa6fcb3f1a9ae44de7f8aaa17f1ad76dfb17f
+  data.tar.gz: da97711ac349944fe9fa51d1620ae45e34ba0e1e44f9085f4a232071d39894d0a0212c8311608e97cec4bc6b63fc8f1e0c9520cebc73d505959327d87960f02c

data/README.md

@@ -14,7 +14,8 @@
 - 支持 `subspec` 打包
 ## Installation
 
-    $ gem install cocoapods-framework
+    $ gem install cocoapods-xcframework
+    $ gem install cocoapods-xcframework-*.gem //本地安装
 
 ## Usage
     $ pod framework NAME [SOURCE]

data/lib/cocoapods-framework/command/framework.rb

@@ -30,7 +30,8 @@ module Pod
           ['--no-force',     'Overwrite existing files.'],
           ['--configuration', 'Build the specified configuration (e.g. Debug). Defaults to Release'],
           ['--spec-sources=private,https://github.com/CocoaPods/Specs.git', 'The sources to pull dependent pods from (defaults to https://github.com/CocoaPods/Specs.git)'],
-          ['--subspecs', 'Only include the given subspecs']
+          ['--subspecs', 'Only include the given subspecs'],
+          ['--use-modular-headers', 'pakcage uses modular headers during packaging']
         ].concat super
       end
 
@@ -41,6 +42,7 @@ module Pod
         subspecs = argv.option('subspecs')
         @subspecs = subspecs.split(',') unless subspecs.nil?
         @configuration = argv.option('configuration', 'Release')
+        @use_modular_headers = argv.option('use-modular-headers', true)
         @force = argv.flag?('force', true)
         super
       end
@@ -51,7 +53,7 @@ module Pod
       end
 
       def run
-        frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force)
+        frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers)
         frameworker.run
       end
     end

data/lib/cocoapods-framework/frameworker.rb

@@ -3,13 +3,14 @@ module Pod
     include PodUtil
     include DirUtil
     include Config::Mixin
-    def initialize(name, source, spec_sources, subspecs, configuration, force)
+    def initialize(name, source, spec_sources, subspecs, configuration, force, use_modular_headers)
       @name = name
       @source = source
       @spec_sources = spec_sources
       @subspecs = subspecs
       @configuration = configuration
       @force = force
+      @use_modular_headers = use_modular_headers
     end
 
     def run
@@ -35,6 +36,7 @@ module Pod
         spec,
         @subspecs,
         @spec_sources,
+        @use_modular_headers
       )
 
       perform_build(

data/lib/cocoapods-framework/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsFramework
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/lib/cocoapods-framework/util.rb

@@ -1,2 +1,3 @@
+require 'cocoapods-framework/util/error_util'
 require 'cocoapods-framework/util/pod_util'
 require 'cocoapods-framework/util/dir_util'

data/lib/cocoapods-framework/util/error_util.rb

@@ -0,0 +1,13 @@
+module Pod
+  module ErrorUtil
+    class << self
+      def error_report(command, output)
+        UI.puts "<<-EOF
+        Build command failed: #{command}
+        Output:
+        #{output.map { |line| "    #{line}" }.join}
+                  EOF"
+      end
+    end
+  end
+end

data/lib/cocoapods-framework/util/pod_util.rb

@@ -8,12 +8,12 @@ module Pod
       @path = path.expand_path
 
       if @path.directory?
-        help! @path + ': is a directory.'
+        raise @path + ': is a directory.'
         return
       end
 
       unless ['.podspec', '.json'].include? @path.extname
-        help! @path + ': is not a podspec.'
+        raise @path + ': is not a podspec.'
         return
       end
 
@@ -33,25 +33,25 @@ module Pod
       Sandbox.new(config.sandbox_root)
     end
 
-    def installation_root sandbox, spec, subspecs, sources,use_frameworks = true
+    def installation_root sandbox, spec, subspecs, sources,use_frameworks = true,use_modular_headers = true
         podfile = podfile_from_spec(
         @path,
         spec,
-        # platform,
         subspecs,
         sources,
-        use_frameworks
+        use_frameworks,
+        use_modular_headers
       )
 
       installer = Installer.new(sandbox, podfile)
-      puts podfile.to_hash.to_json
       installer.install!
 
       unless installer.nil? 
         installer.pods_project.targets.each do |target|
-          target.build_configurations.each do |configuration|
-            configuration.build_settings['CLANG_MODULES_AUTOLINK'] = 'NO'
-            configuration.build_settings['GCC_GENERATE_DEBUGGING_SYMBOLS'] = 'NO'
+          if target.name == spec.name
+            target.build_configurations.each do |configuration|
+              configuration.build_settings['CLANG_MODULES_AUTOLINK'] = 'NO'
+            end
           end
         end
         installer.pods_project.save
@@ -59,7 +59,7 @@ module Pod
       installer
     end
 
-    def podfile_from_spec path, spec, subspecs, sources, use_frameworks = true
+    def podfile_from_spec path, spec, subspecs, sources, use_frameworks = true, use_modular_headers=true
         options = Hash.new
       options[:podspec] = path.to_s
       options[:subspecs] = subspecs if subspecs
@@ -77,8 +77,9 @@ module Pod
           :integrate_targets => false,
           :deterministic_uuids => false)
 
-        use_frameworks! if use_frameworks
-      end
+          use_frameworks! if use_frameworks
+          use_modular_headers! if use_modular_headers
+        end
     end
 
     def generic_new_podspec_hash spec
@@ -106,4 +107,4 @@ module Pod
       spec_hash
     end
   end
-end
+end

data/lib/cocoapods-framework/xbuilder.rb

@@ -14,28 +14,49 @@ module Pod
       @sandbox_root = sandbox_root
       @spec = spec
       @configuration = configuration
-      @outputs = nil
+      @outputs = {}
     end
 
     def build
       UI.puts("Building framework #{@spec} with configuration #{@configuration}")
       UI.puts "Work dir is :#{@sandbox_root}"
       defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited) PodsDummy_Pods_#{@spec.name}=PodsDummy_PodPackage_#{@spec.name}'"
-      # defines << ' ' << @spec.consumer(@platform).compiler_flags.join(' ')
 
       if @configuration == 'Debug'
         defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES ONLY_ACTIVE_ARCH=NO'
+      else
+        defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=NO"
       end
 
       build_all_device defines
 
       collect_xc_frameworks
+
+      collect_bundles
     end
 
     def collect_xc_frameworks
       export_dir = "#{@sandbox_root}/export/**/#{@spec.name}.framework"
       frameworks = Pathname.glob(export_dir)
-      @outputs = create_xc_framework_by_frameworks frameworks
+      @outputs[:xcframework] = create_xc_framework_by_frameworks frameworks
+    end
+
+    def collect_bundles
+      ["iphoneos","macOS","appletvos","watchos"].each do |plat|
+        export_dir = "#{@sandbox_root}/export/*-#{plat}/**/#{@spec.name}.bundle/**"
+        Pathname.glob(export_dir).each do |bundle|
+          if bundle.to_s.include? "#{@spec.name}.bundle/Info.plist"
+            return
+          end
+          @outputs[:bundle] = "#{@sandbox_root}/bundle"
+          native_platform = to_native_platform plat
+          path = Pathname.new "#{@sandbox_root}/bundle/#{native_platform}"
+          if not path.exist?
+            path.mkpath
+          end
+          FileUtils.cp_r(Dir["#{bundle}"],"#{path}")
+        end
+      end
     end
 
     def create_xc_framework_by_frameworks frameworks
@@ -44,10 +65,10 @@ module Pod
         command << "-framework #{framework} "
       end
       command << "-output #{@sandbox_root}/#{@spec.name}.xcframework 2>&1"
-      UI.puts `#{command}`
+      output = `#{command}`.lines.to_a
       if $?.exitstatus != 0
-        UI.puts(output)
-        Process.exit
+        Pod::ErrorUtil.error_report command,output
+        Process.exit -1
       end
       "#{@sandbox_root}/#{@spec.name}.xcframework"
     end
@@ -82,8 +103,18 @@ module Pod
         Pathname.new(target_dir).mkdir
       end
       outputs_xcframework target_dir
+      outputs_bundle target_dir
       new_spec_hash = generic_new_podspec_hash @spec
       new_spec_hash[:vendored_frameworks] = "#{@spec.name}.xcframework"
+      find_bundles(target_dir).each do |plat, value| 
+        if new_spec_hash[plat]
+          new_spec_hash[plat]["resource_bundles"] = value
+        else
+          new_spec_hash[plat] = {
+            "resource_bundles" => value
+          }
+        end
+      end
       require 'json'
       spec_json = JSON.pretty_generate(new_spec_hash) << "\n"
       File.open("#{target_dir}/#{@spec.name}.podspec.json",'wb+') do |f|
@@ -92,13 +123,34 @@ module Pod
       UI.puts "result export at :#{target_dir}"
       target_dir
     end
+    
+    def find_bundles target_dir
+      bundle_root = "#{target_dir}/bundle/"
+      pattern = "#{bundle_root}*"
+      result = {}
+      Pathname.glob(pattern).each do |bundle|
+        bundle_relative_path = bundle.to_s.gsub(bundle_root, "")
+        plat = bundle_relative_path
+        result[plat] = {
+          "#{@spec.name}" => "bundle/" + bundle_relative_path + "/*"
+        }
+      end
+      result
+    end
 
     def outputs_xcframework target_dir
-      `cp -rp #{@outputs} #{target_dir} 2>&1`
+      command = "cp -rp #{@outputs[:xcframework]} #{target_dir} 2>&1"
+      output = `#{command}`.lines.to_a
       if $?.exitstatus != 0
-        UI.puts output
-        Process.exit
+        Pod::ErrorUtil.error_report command,output
+        Process.exit -1
+      end
+    end
+
+    def outputs_bundle target_dir
+      if @outputs[:bundle]
+        FileUtils.cp_r(Dir[@outputs[:bundle]],target_dir)
       end
     end
   end
-end
+end

data/lib/cocoapods-framework/xbuilder/xcode_xbuild.rb

@@ -3,18 +3,18 @@ module Pod
     module XcodeXBuilder
       def xcode_xbuild(defines, configuration, work_dir, build_dir = 'export')
         if defined?(Pod::DONT_CODESIGN)
-          args = "#{args} CODE_SIGN_IDENTITY=\"\" CODE_SIGNING_REQUIRED=NO"
+          defines = "#{defines} CODE_SIGN_IDENTITY=\"\" CODE_SIGNING_REQUIRED=NO"
         end
         pwd = Pathname.pwd
         Dir.chdir work_dir
         command = "xcodebuild #{defines} BUILD_DIR=#{build_dir} BUILD_LIBRARY_FOR_DISTRIBUTION=YES clean build -configuration #{configuration} -alltargets 2>&1"
-        outputs = `#{command}`.lines.to_s
+        output = `#{command}`.lines.to_a
         Dir.chdir pwd
         if $?.exitstatus != 0
-          UI.puts output
-          Process.exit
+          Pod::ErrorUtil.error_report command,output
+          Process.exit -1
         end
       end
     end
   end
-end
+end

data/lib/cocoapods-framework/xbuilder/xcodeproj_helper.rb

@@ -18,6 +18,17 @@ module Pod
         project.save
       end
 
+      def to_native_platform name
+        case name
+        when 'iphoneos' then 'ios'
+        when 'macOS' then 'osx'
+        when 'appletvos' then 'tvos'
+        when 'watchos' then 'watchos'
+        else
+          name
+        end
+      end
+
       private
       def xcode_sdks
         return @x_sdks if @x_sdks

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-xcframework
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - 戴易超
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -78,6 +78,7 @@ files:
 - lib/cocoapods-framework/gem_version.rb
 - lib/cocoapods-framework/util.rb
 - lib/cocoapods-framework/util/dir_util.rb
+- lib/cocoapods-framework/util/error_util.rb
 - lib/cocoapods-framework/util/pod_util.rb
 - lib/cocoapods-framework/xbuilder.rb
 - lib/cocoapods-framework/xbuilder/xcode_xbuild.rb
@@ -87,6 +88,10 @@ files:
 - pkg/cocoapods-framework-0.0.1.gem
 - pkg/cocoapods-framework-0.0.2.gem
 - pkg/cocoapods-framework-0.0.3.gem
+- pkg/cocoapods-xcframework-0.0.4.gem
+- pkg/cocoapods-xcframework-0.0.6.gem
+- pkg/cocoapods-xcframework-0.0.7.gem
+- pkg/cocoapods-xcframework-0.0.8.gem
 - spec/command/framework_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/TyrantDante/cocoapods-framework