Merge pull request #28 from sqreen/single-darwin-version

Build a single darwin gem for all versions

Author: lloeki

.github/workflows/build.yml

@@ -115,9 +115,9 @@ jobs:
       - name: Inject V8
         run: |
             ./libexec/inject-libv8 ${{ steps.set-metadata.outputs.NODE_VERSION }}
-      - name: Build binary gems
+      - name: Build binary gem
         run: |
-            bundle exec rake binary:all
+            bundle exec rake binary
       - name: Upload V8
         uses: actions/upload-artifact@v1
         with:
@@ -299,7 +299,7 @@ jobs:
       - name: Set metadata
         id: set-metadata
         run: |
-            ruby -e 'puts Gem.platforms.last.to_s' | tee gem_platform
+            ruby -e 'puts Gem.platforms.last.to_s.gsub(/-darwin-?\d+/, "-darwin")' | tee gem_platform
             echo "::set-output name=GEM_PLATFORM::$(cat gem_platform)"
       - name: Download a single artifact
         uses: actions/download-artifact@v2

Rakefile

@@ -20,13 +20,17 @@ module Helpers
 end
 
 task :compile, [:platform] => [] do |_, args|
-  local_platform = Gem::Platform.local.to_s
-  target_platform = ENV['RUBY_TARGET_PLATFORM'] || args.to_h[:platform] || Gem::Platform.local.to_s
+  local_platform = Gem::Platform.local
+  target_platform = Gem::Platform.new(ENV['RUBY_TARGET_PLATFORM'] || args.to_h[:platform] || Gem::Platform.local)
+
+  if target_platform.os == 'darwin'
+    target_platform.instance_eval { @version = nil }
+  end
 
   puts "local platform: #{local_platform}"
   puts "target platform: #{target_platform}"
 
-  ENV['RUBY_TARGET_PLATFORM'] = target_platform
+  ENV['RUBY_TARGET_PLATFORM'] = target_platform.to_s
 
   if (libs = Dir["vendor/v8/#{target_platform}/**/*.a"]).any?
     puts "found: #{libs.inspect}"
@@ -39,8 +43,12 @@ task :compile, [:platform] => [] do |_, args|
 end
 
 task :binary, [:platform] => [:compile] do |_, args|
-  local_platform = Gem::Platform.local
-  target_platform = Gem::Platform.new(ENV['RUBY_TARGET_PLATFORM']) || Gem::Platform.new(args.to_h[:platform]) || Gem::Platform.local
+  local_platform = Gem::Platform.local.dup
+  target_platform = Gem::Platform.new(ENV['RUBY_TARGET_PLATFORM'] || args.to_h[:platform] || Gem::Platform.local)
+
+  if target_platform.os == 'darwin'
+    target_platform.instance_eval { @version = nil }
+  end
 
   puts "local platform: #{local_platform}"
   puts "target platform: #{target_platform}"
@@ -69,33 +77,3 @@ task :binary, [:platform] => [:compile] do |_, args|
 
   FileUtils.mv(package, 'pkg')
 end
-
-namespace :binary do
-  task all: :binary do
-    next unless RUBY_PLATFORM =~ /darwin-?(\d+)/
-
-    current = Integer($1)
-
-    Helpers.binary_gemspec # loads NODE_VERSION
-    major, minor = File.read(Dir["src/node-v#{Libv8::Node::NODE_VERSION}/common.gypi"].last).lines.find { |l| l =~ /-mmacosx-version-min=(\d+).(\d+)/ } && [Integer($1), Integer($2)]
-
-    first = if RUBY_PLATFORM =~ /\barm64e?-/
-              20 # arm64 darwin is only available since darwin20
-            elsif major == 10
-              minor + 4 # macos 10.X => darwinY offset, 10.15 is darwin19
-            else
-              minor + 20 # maxos 11.X => darwinY offset, 11.0 is darwin20
-            end
-    max = 20 # current known max to build for
-
-    (first..max).each do |version|
-      next if version == current
-
-      platform = Gem::Platform.local.dup
-      platform.instance_eval { @version = version }
-      puts "> building #{platform}"
-
-      Rake::Task['binary'].execute(Rake::TaskArguments.new([:platform], [platform]))
-    end
-  end
-end

ext/libv8-node/paths.rb

@@ -13,12 +13,16 @@ def include_paths
 
     def object_paths
       [Shellwords.escape(File.join(vendored_source_path,
-                                   Gem::Platform.local.to_s,
+                                   platform,
                                    'libv8',
                                    'obj',
                                    "libv8_monolith.#{config['LIBEXT']}"))]
     end
 
+    def platform
+      Gem::Platform.local.to_s.gsub(/-darwin-?\d+/, '-darwin')
+    end
+
     def config
       RbConfig::MAKEFILE_CONFIG
     end

libexec/inject-libv8

@@ -26,6 +26,12 @@ done
 
 cd "${BASEDIR}/out/${BUILDTYPE}"
 
+case "${RUBY_TARGET_PLATFORM}" in
+    *-darwin*)
+        RUBY_TARGET_PLATFORM="$(echo "${RUBY_TARGET_PLATFORM}" | sed -e 's/-darwin[0-9]*/-darwin/')"
+        ;;
+esac
+
 rm -rf "${top}/vendor/v8/${RUBY_TARGET_PLATFORM}"
 # shellcheck disable=SC2043
 for lib in libv8_monolith.a; do

libexec/metadata

@@ -5,7 +5,7 @@ case "$1" in
         ruby -e 'puts RUBY_PLATFORM'
         ;;
     gem_platform)
-        ruby -e 'puts Gem::Platform.local.tap { |p| RUBY_PLATFORM =~ /musl/ && p.version.nil? and p.instance_eval { @version = "musl" } }'
+        ruby -e 'puts Gem::Platform.local.tap { |p| RUBY_PLATFORM =~ /musl/ && p.version.nil? and p.instance_eval { @version = "musl" } }.to_s.gsub(/-darwin-?\d+/, "-darwin")'
         ;;
     gem_version|version)
         ruby -I'lib' -r'libv8/node/version' -e 'puts Libv8::Node::VERSION'

libexec/platform

@@ -42,11 +42,11 @@ case "${target_platform}" in
         ;;
     x86_64*-darwin*)
         # not for cross compilation
-        RUBY_TARGET_PLATFORM="$(ruby -e 'puts Gem::Platform.local.to_s')"
+        RUBY_TARGET_PLATFORM="$(ruby -e 'puts Gem::Platform.local.to_s.gsub(/-darwin-?\d+/, "-darwin")')"
         ;;
     arm64*-darwin*)
         # not for cross compilation
-        RUBY_TARGET_PLATFORM="$(ruby -e 'puts Gem::Platform.local.to_s')"
+        RUBY_TARGET_PLATFORM="$(ruby -e 'puts Gem::Platform.local.to_s.gsub(/-darwin-?\d+/, "-darwin")')"
         ;;
     *)
         # not for cross compilation