tebako 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e602aace5a0b42b9e7599d3bb39c32a2bc6ec01f48ec885d5147c626d79fb3f
-  data.tar.gz: 845e5e0a63277d53d64a6ff867d88016f6a002234eb01c0538d97d4ff06ceedf
+  metadata.gz: 3acd4d518e560abf4901a25e53452f910db850469375deb7e13b5ebc7c8173c4
+  data.tar.gz: 260a96de335ba92231b01543f4a19ef41a59156ae8ea8546ac7b277bb8b3d7de
 SHA512:
-  metadata.gz: eb6458e260860b68983529d397de867ead824edd5ccd9dc97a37ebd849fec2d8539e25ecfcc7fe1652b9afaef29a1dc189470d0840ec2b986da1a980e9f30f19
-  data.tar.gz: b16af1a8fa72fc86e04f64faf7a55be31b325defcbb801ee5bf02ee3551ed6a7bbea1df1920e93d0556963ac17487ed7787551d03d8147e959b9e6bfa00a4e15
+  metadata.gz: 3899ed838eb003e918e9adc91efeeb1eae7d6248bff9e664ace699c1042503b19dce0179cffacaf9c7e7d7418691f0142d9a30388059e82fdb5a07b9a6a395cc
+  data.tar.gz: 499099ca4dfc86e43f8de369b590e052a46156f2bcbce28081562687dbc42fa3de044e944163df36955f639ab82655921beba41e5e8d29e884e1e2fcb69e874f

data/lib/tebako/packager/patch_helpers.rb

@@ -91,8 +91,12 @@ module Tebako
           FileUtils.mkdir(dirname)
         end
 
-        def restore_and_save(fname)
-          raise Tebako::Error, "Could not save #{fname} because it does not exist." unless File.exist?(fname)
+        def restore_and_save(fname, strict: true)
+          unless File.exist?(fname)
+            return unless strict
+
+            raise Tebako::Error, "Could not save #{fname} because it does not exist."
+          end
 
           old_fname = "#{fname}.old"
           if File.exist?(old_fname)
@@ -102,9 +106,9 @@ module Tebako
           FileUtils.cp(fname, old_fname)
         end
 
-        def restore_and_save_files(files, ruby_source_dir)
+        def restore_and_save_files(files, ruby_source_dir, strict: true)
           files.each do |fname|
-            restore_and_save "#{ruby_source_dir}/#{fname}"
+            restore_and_save("#{ruby_source_dir}/#{fname}", strict: strict)
           end
         end
 

data/lib/tebako/packager.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2021-2024 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2021-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -43,25 +43,29 @@ module Tebako
   # Tebako packaging support (internal)
   module Packager
     FILES_TO_RESTORE = %w[
-      main.c
+      common.mk
+      configure
+      config.status
       dir.c
       dln.c
       file.c
-      io.c
-      tool/mkconfig.rb
       gem_prelude.rb
-    ].freeze
-
-    FILES_TO_RESTORE_MSYS = %w[
+      io.c
+      main.c
+      Makefile
       ruby.c
-      win32/file.c
-    ].freeze
-    # Do not need to restore cygwin/GNUmakefile.in
-    # because it is patched (differently) both on pass 1 and pass2
-    # cygwin/GNUmakefile.in
-
-    FILES_TO_RESTORE_MUSL = %w[
       thread_pthread.c
+      util.c
+      ext/bigdecimal/bigdecimal.h
+      ext/Setup
+      cygwin/GNUmakefile.in
+      include/ruby/onigmo.h
+      lib/rubygems/openssl.rb
+      lib/rubygems/path_support.rb
+      template/Makefile.in
+      tool/mkconfig.rb
+      win32/winmain.c
+      win32/file.c
     ].freeze
 
     class << self
@@ -118,16 +122,14 @@ module Tebako
       # Executed before Ruby build, patching ensures that Ruby itself is linked statically
       def pass1(ostype, ruby_source_dir, mount_point, src_dir, ruby_ver)
         puts "-- Running pass1 script"
-
         PatchHelpers.recreate(src_dir)
-        patch = crt_pass1_patch(ostype, mount_point, ruby_ver)
-        do_patch(patch.patch_map, ruby_source_dir)
 
-        # Roll back pass1a, pass2 patches
+        # Roll all known patches
         # Just in case we are recovering after some error
-        PatchHelpers.restore_and_save_files(FILES_TO_RESTORE, ruby_source_dir)
-        PatchHelpers.restore_and_save_files(FILES_TO_RESTORE_MUSL, ruby_source_dir) if ostype =~ /linux-musl/
-        PatchHelpers.restore_and_save_files(FILES_TO_RESTORE_MSYS, ruby_source_dir) if ostype =~ /msys/
+        PatchHelpers.restore_and_save_files(FILES_TO_RESTORE, ruby_source_dir, strict: false)
+
+        patch = crt_pass1_patch(ostype, mount_point, ruby_ver)
+        do_patch(patch.patch_map, ruby_source_dir)
       end
 
       # Pass1A

data/lib/tebako/version.rb

@@ -26,5 +26,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Tebako
-  VERSION = "0.12.1"
+  VERSION = "0.12.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-12 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor