tebako 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04ff17b2a527c5b6cf6f1630f097d828a10fa3f0fa32eaa86e3c2a063a579e19
-  data.tar.gz: 740f889112a57820ce703917e4654403e13dd7960ccab22d02ceb6b9050f51d4
+  metadata.gz: 78803d4ebbfe58cdf860a80c9ec60fe44a80e2d12bd695678a37c914f069948b
+  data.tar.gz: f13f3e254a4058044a7c84c03f07ebc3c5a07c3fc00eda1e4ced0e336326fa55
 SHA512:
-  metadata.gz: 4e48b494352c230d533f914ef9553c8a48f8f0de56f291e1738a391d2991469c873be5397ebb58b480f91be0bd2c9510316d4e93922994dd625ffe6045b3f1a8
-  data.tar.gz: 7c4418d8bba50f67956db52b149001f407d8e1e4f64d44a41bdb63dfdec57d2a9fcebbdf681ed49d97fc3fc841c9515399b67002873aa1821f746e244d8033b0
+  metadata.gz: f76bd6166857ebf239218e3871136142a6c158a5d568f019eb374ea694b9af07d342378ee23e3e760063049b3e84048a42a92ed5b0dc420957898aef7679dd64
+  data.tar.gz: 15c95e6dcb0f746f4708548b5ceda202552fd2c9ed6461d4f814707ddb9c80d6d58fddf00791437a26142eb9db703f4d3017bb47f74f55afeb1a78fc6e78c585

data/README.adoc

@@ -104,8 +104,9 @@ higher.
 | 2.7.8 | Linux, macOS
 | 3.0.7 | Linux, macOS
 | 3.1.6 | Linux, macOS, Windows
-| 3.2.{4,5} | Linux, macOS, Windows
-| 3.3.{3,4,5} | Linux, macOS, Windows
+| 3.2.{4,5,6} | Linux, macOS, Windows
+| 3.3.{3,4,5,6} | Linux, macOS, Windows
+| 3.4.1 | Linux, macOS, Windows
 
 |===
 
@@ -780,7 +781,7 @@ the Tebako root folder (see details: <<root-folder-selection>>)
 
 `Ruby`::
 this parameter defines Ruby version that will be packaged (optional, defaults to
-`3.1.6`)
+`3.2.6`)
 
 `project-root`::
 a folder at the host source file system where project files are located.
@@ -904,7 +905,7 @@ Where:
 
 `<tebako-root-folder>`:: the Tebako root folder (see details: <<root-folder-selection>>)
 
-`Ruby`:: parameter defines Ruby version that will be packaged (optional, defaults to `3.1.6`)
+`Ruby`:: parameter defines Ruby version that will be packaged (optional, defaults to `3.2.6`)
 
 `tebafile`::
 the tebako configuration file (optional, defaults to `$PWD/.tebako.yml`).

data/common.env

@@ -2,4 +2,4 @@ BUILD_TYPE=Release
 DEPS=deps
 INCBIN_TAG=348e36b
 DWARFS_WR_TAG=v0.9.2
-RUBY_VER=3.2.5
+RUBY_VER=3.2.6

data/include/tebako/tebako-prism.h

@@ -0,0 +1,51 @@
+#include <fcntl.h>
+
+static pm_string_init_result_t
+tebako_string_file_init(pm_string_t *string, const char *filepath) {
+
+    // Open the file for reading
+    int fd = open(filepath, O_RDONLY);
+    if (fd == -1) {
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    // Stat the file to get the file size
+    struct stat sb;
+    if (fstat(fd, &sb) == -1) {
+        close(fd);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    // Ensure it is a file and not a directory
+    if (S_ISDIR(sb.st_mode)) {
+        close(fd);
+        return PM_STRING_INIT_ERROR_DIRECTORY;
+    }
+
+    // Check the size to see if it's empty
+    size_t size = (size_t) sb.st_size;
+    if (size == 0) {
+        close(fd);
+        const uint8_t source[] = "";
+        *string = (pm_string_t) { .type = PM_STRING_CONSTANT, .source = source, .length = 0 };
+        return PM_STRING_INIT_SUCCESS;
+    }
+
+    size_t length = (size_t) size;
+    uint8_t *source = xmalloc(length);
+    if (source == NULL) {
+        close(fd);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    long bytes_read = (long) read(fd, source, length);
+    close(fd);
+
+    if (bytes_read == -1) {
+        xfree(source);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    *string = (pm_string_t) { .type = PM_STRING_OWNED, .source = source, .length = length };
+    return PM_STRING_INIT_SUCCESS;
+}

data/lib/tebako/cli.rb

@@ -84,7 +84,7 @@ module Tebako
 
     REF_DESCRIPTION = <<~DESC
       "Referenced tebako run-time package; 'tebako-runtime' by default".
-      This option specifies the tebako runtime to be used by the application on Windows and if mode is 'application' only .
+      #{" " * 65}# This option specifies the tebako runtime to be used by the application on Windows and if mode is 'application' only .
     DESC
 
     RGP_DESCRIPTION = <<~DESC

data/lib/tebako/packager/pass1_patch.rb

@@ -0,0 +1,301 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2021-2025 [Ribose Inc](https://www.ribose.com).
+# All rights reserved.
+# This file is a part of tebako
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+require_relative "patch_helpers"
+require_relative "patch_buildsystem"
+
+require_relative "patch"
+# Tebako - an executable packager
+module Tebako
+  # Packager module
+  module Packager
+    class << self
+      def crt_pass1_patch(os_type, mount_point, ruby_ver)
+        case os_type
+        when /darwin/
+          Pass1DarwinPatch.new(mount_point, ruby_ver)
+        when /msys/
+          Pass1MSysPatch.new(mount_point, ruby_ver)
+        else
+          Pass1Patch.new(mount_point, ruby_ver)
+        end
+      end
+    end
+    # Ruby patching definitions (pass1 - common)
+    class Pass1Patch < Patch
+      # [TODO] looks like it does not exist in 3.1.4
+      # May be obsolete
+      TOOL_RBINSTALL_RB_PATCH = {
+        "    next if files.empty?" => "# tebako patched    next if files.empty?"
+      }.freeze
+
+      RUBYGEM_OPENSSL_RB_SUBST = <<~SUBST
+        # Start of tebako patch
+        require "openssl"
+        # End of tebako patch
+        autoload :OpenSSL, "openssl"
+      SUBST
+
+      RUBYGEM_OPENSSL_RB_PATCH = {
+        'autoload :OpenSSL, "openssl"' => RUBYGEM_OPENSSL_RB_SUBST
+      }.freeze
+
+      EXT_SETUP_PATCH = {
+        "#option nodynamic" => "option nodynamic"
+      }.freeze
+
+      # ....................................................
+      # This is something that I cannnot explain
+      # (this patch does not seem related to static compilation)
+
+      EXT_BIGDECIMAL_BIGDECIMAL_H_PATCH = {
+        "#include \"ruby/ruby.h\"" => <<~SUBST
+          #include "ruby/ruby.h"
+
+          /* -- Start of tebako patch -- */
+          #ifndef HAVE_RB_SYM2STR
+          #define HAVE_RB_SYM2STR  1
+          #endif
+
+          #ifndef HAVE_RB_ARRAY_CONST_PTR
+          #define HAVE_RB_ARRAY_CONST_PTR 1
+          #endif
+
+          #ifndef HAVE_RB_RATIONAL_NUM
+          #define HAVE_RB_RATIONAL_NUM 1
+          #endif
+
+          #ifndef HAVE_RB_RATIONAL_DEN
+          #define HAVE_RB_RATIONAL_DEN 1
+          #endif
+
+          #ifndef HAVE_RB_COMPLEX_REAL
+          #define HAVE_RB_COMPLEX_REAL
+          #endif
+
+          #ifndef HAVE_RB_COMPLEX_IMAG
+          #define HAVE_RB_COMPLEX_IMAG
+          #endif
+          /* -- End of tebako patch -- */
+
+        SUBST
+      }.freeze
+
+      # The logic for statically linked extensions is broken entirely in the latest Ruby versions.
+      # The code below looks reasonble - we do not set -bundle_loader when building with -with-static-ext option
+      # However Gems bundled with Ruby just ignore with-static-ext option and build extensions as shared libraries
+      # So  the -bundler_loader option is required for them to link.
+      # It is strange that it is disabled in any case because this option does not create any issues for static
+      # libraries.
+      # ---------------------------------------------------
+      # elif test "x$EXTSTATIC" = x
+      # then :
+      #
+      #                            # When building exts as bundles, a mach-o bundle needs to know its loader
+      #                            # program to bind symbols from the ruby executable
+      #                            EXTDLDFLAGS="-bundle_loader '\$(BUILTRUBY)'"
+
+      OPENSSL_EXTCONF_RB_SUBST = <<~SUBST
+        # Start of tebako patch
+        $defs.push("-DRUBY_EXPORT=1")
+        # End of tebako patch
+
+        Logging::message "=== Checking done. ===\\n"
+      SUBST
+
+      OPENSSL_EXTCONF_RB_PATCH = {
+        "Logging::message \"=== Checking done. ===\\n\"" => OPENSSL_EXTCONF_RB_SUBST
+      }.freeze
+
+      def initialize(mountpoint, ruby_ver)
+        super()
+        @mountpoint = mountpoint
+        @ruby_ver = ruby_ver
+      end
+
+      def base_patch_map
+        {
+          # ....................................................
+          # It won't install gems with no files defined in spec
+          # However if
+          #   -- we are installing a default gem from extension
+          #   -- extension is build statically
+          #  there may be no files install in addition to spec
+          # Example: io/wait extension (and others)
+          # [TODO]  Check if it is still required
+          # No match and patching on Ruby 3.1.4 but works wo issues
+          "tool/rbinstall.rb" => TOOL_RBINSTALL_RB_PATCH,
+
+          # ....................................................
+          # Allow only packaged gems (from within memfs)
+          "lib/rubygems/path_support.rb" => rubygems_path_support_patch,
+
+          # ....................................................
+          # Disable dynamic extensions
+          "ext/Setup" => EXT_SETUP_PATCH
+        }
+      end
+
+      def patch_map
+        pm = base_patch_map
+        pm.merge!(super)
+
+        # ....................................................
+        pm.store("ext/bigdecimal/bigdecimal.h", EXT_BIGDECIMAL_BIGDECIMAL_H_PATCH) unless @ruby_ver.ruby34?
+
+        # ....................................................
+        # autoload :OpenSSL, "openssl"
+        # fails to deal with a default gem from statically linked extension
+        pm.store("lib/rubygems/openssl.rb", RUBYGEM_OPENSSL_RB_PATCH) if @ruby_ver.ruby3x?
+
+        pm.freeze
+      end
+
+      private
+
+      def rubygems_path_support_patch_one
+        <<~SUBST
+            @home = env["GEM_HOME"] || Gem.default_dir
+          # -- Start of tebako patch --
+              unless env["TEBAKO_PASS_THROUGH"]
+                @home = Gem.default_dir unless @home.index("#{@mount_point}") == 0
+              end
+          # -- End of tebako patch --
+
+        SUBST
+      end
+
+      def rubygems_path_support_patch_two
+        <<~SUBST
+
+            @path = split_gem_path env["GEM_PATH"], @home
+          # -- Start of tebako patch --
+              unless env["TEBAKO_PASS_THROUGH"]
+                @path.keep_if do |xpath|
+                  xpath.index("#{@mount_point}") == 0
+                end
+              end
+          # -- End of tebako patch --
+
+        SUBST
+      end
+
+      def rubygems_path_support_patch
+        {
+          '  @home = env["GEM_HOME"] || Gem.default_dir' => rubygems_path_support_patch_one,
+          '  @path = split_gem_path env["GEM_PATH"], @home' => rubygems_path_support_patch_two
+        }
+      end
+    end
+
+    # Ruby patching definitions (pass1 - darwin)
+    class Pass1DarwinPatch < Pass1Patch
+      DARWIN_CONFIGURE_PATCH = {
+        "elif test \"x$EXTSTATIC\" = x" => "elif true"
+      }.freeze
+
+      def patch_map
+        pm = { "configure" => DARWIN_CONFIGURE_PATCH }
+        pm.merge!(super)
+        pm.freeze
+      end
+    end
+
+    # Ruby patching definitions (pass1 - Windows)
+    class Pass1MSysPatch < Pass1Patch
+      INCLUDE_RUBY_ONIGMO_H_PATCH = {
+        "#  define ONIG_EXTERN   RUBY_EXTERN" => "#  define ONIG_EXTERN  extern"
+      }.freeze
+
+      WIN32_WINMAIN_C_PATCH = {
+        "WinMain(HINSTANCE current, HINSTANCE prev, LPSTR cmdline, int showcmd)" =>
+          "wWinMain(HINSTANCE current, HINSTANCE prev, LPWSTR cmdline, int showcmd)"
+      }.freeze
+
+      def patch_map
+        pm = msys_patches
+        pm.merge!(super)
+        pm.freeze
+      end
+
+      private
+
+      include Tebako::Packager::PatchBuildsystem
+
+      def gnumakefile_in_patch_p1 # rubocop:disable Metrics/MethodLength
+        objext = @ruby_ver.ruby32? ? "$(OBJEXT)" : "@OBJEXT@"
+        {
+          "  DLLWRAP += -mno-cygwin" =>
+            "# tebako patched  DLLWRAP += -mno-cygwin",
+
+          "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext}" =>
+            "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext} $(WINMAINOBJ)  # tebako patched",
+
+          "$(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@" =>
+            "$(WINMAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@  # tebako patched",
+
+          "--output-exp=$(RUBY_EXP) \\" =>
+           "--output-exp=$(RUBY_EXP) --output-lib=$(LIBRUBY) --output-def=tebako.def \\",
+
+          "--export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)" =>
+            "--export-all $(LIBRUBY_A) $(LIBS) -o program-stub.exe   # tebako patched",
+
+          "@rm -f $(PROGRAM)" =>
+            "@rm -f program-stub.exe   # tebako patched",
+
+          "	$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)" =>
+           "# tebako patched  $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)",
+
+          "RUBYDEF = $(DLL_BASE_NAME).def" => GNUMAKEFILE_IN_WINMAIN_SUBST
+        }
+      end
+
+      def msys_base_patches
+        {
+          # ....................................................
+          # Generate export definitions; use WinMain to build rubyw.exe
+          "cygwin/GNUmakefile.in" => gnumakefile_in_patch_p1,
+          # ....................................................
+          # RUBY_EXPORT=1 (shall be set for static builds but is missing in openssl extension)
+          "ext/openssl/extconf.rb" => OPENSSL_EXTCONF_RB_PATCH
+        }
+      end
+
+      def msys_patches
+        pm = msys_base_patches
+
+        if @ruby_ver.ruby34?
+          # ....................................................
+          # RUBY_EXTERN shall be extern for static build but is set to __declspec(dllimport) for encodin libarary
+          pm.store("include/ruby/onigmo.h", INCLUDE_RUBY_ONIGMO_H_PATCH)
+          pm.store("win32/winmain.c", WIN32_WINMAIN_C_PATCH)
+        end
+        pm
+      end
+    end
+  end
+end

data/lib/tebako/packager/pass1a_patch.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024-2025 [Ribose Inc](https://www.ribose.com).
+# All rights reserved.
+# This file is a part of tebako
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+require_relative "patch"
+# Tebako - an executable packager
+module Tebako
+  module Packager
+    # Ruby patching definitions (pass1a)
+    class Pass1APatch < Patch
+      GEM_PRELUDE_RB_PATCH = {
+        "if defined?(DidYouMean)" => <<~SUBST
+          if defined?(DidYouMean)
+
+          # -- Start of tebako patch --
+          begin
+            require 'tebako-runtime'
+          rescue LoadError
+            warn "'tebako-runtime' was not loaded."
+          end
+          # -- End of tebako patch --
+        SUBST
+      }.freeze
+
+      def patch_map
+        {
+          "gem_prelude.rb" => GEM_PRELUDE_RB_PATCH
+        }.freeze
+      end
+    end
+  end
+end

data/lib/tebako/packager/pass2.rb

@@ -46,6 +46,8 @@ module Tebako
             patch_map.store("common.mk", COMMON_MK_PATCH)
           end
           extend_patch_map_r33(patch_map, ostype, deps_lib_dir, ruby_ver)
+          patch_map.store("prism_compile.c", PRISM_PATCHES) if ruby_ver.ruby34?
+          patch_map
         end
 
         private
@@ -68,11 +70,10 @@ module Tebako
         end
 
         def get_dln_c_patch(ostype, ruby_ver)
+          pattern = "#ifndef dln_loaderror"
           # Not using substitutions of dlxxx functions on Windows
           dln_c_patch = {
-            "static const char funcname_prefix[sizeof(FUNCNAME_PREFIX) - 1] = FUNCNAME_PREFIX;" =>
-              "#{PatchHelpers.msys?(ostype) ? C_FILE_SUBST_LESS : C_FILE_SUBST}\n" \
-              "static const char funcname_prefix[sizeof(FUNCNAME_PREFIX) - 1] = FUNCNAME_PREFIX;\n"
+            pattern => "#{PatchHelpers.msys?(ostype) ? C_FILE_SUBST_LESS : C_FILE_SUBST}\n#{pattern}\n"
           }
 
           if PatchHelpers.msys?(ostype)

data/lib/tebako/packager/{pass1a.rb → patch.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -25,21 +25,13 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require_relative "patch_literals"
-
 # Tebako - an executable packager
 module Tebako
   module Packager
-    # Ruby patching definitions (pass1a)
-    module Pass1A
-      class << self
-        def get_patch_map # rubocop:disable Naming/AccessorMethodName
-          {
-            "gem_prelude.rb" => GEM_PRELUDE_RB_PATCH
-          }
-        end
-
-        include Tebako::Packager::PatchLiterals
+    # Ruby patching definitions (common base)
+    class Patch
+      def patch_map
+        {}.freeze
       end
     end
   end

data/lib/tebako/packager/patch_literals.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2023-2024 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2023-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -150,6 +150,10 @@ module Tebako
           "else if (e == EIO /* tebako patch */ && !within_tebako_memfs(path)) {"
       }.freeze
 
+      DLN_C_PRE34_PATCH_PATTERN = "static const char funcname_prefix[sizeof(FUNCNAME_PREFIX) - 1] = FUNCNAME_PREFIX;"
+
+      DLN_C_PATCH_PATTERN = "#define init_funcname(buf, file) build_funcname(FUNCNAME_PREFIX, buf, file)"
+
       DLN_C_MSYS_PATCH_PRE32 = {
         "    winfile = rb_w32_mbstr_to_wstr(CP_UTF8, file, -1, NULL);" => <<~SUBST
           /* -- Start of tebako patch -- */
@@ -209,20 +213,6 @@ module Tebako
         /* -- End of tebako patch -- */
       SUBST
 
-      GEM_PRELUDE_RB_PATCH = {
-        "if defined?(DidYouMean)" => <<~SUBST
-          if defined?(DidYouMean)
-
-          # -- Start of tebako patch --
-          begin
-            require 'tebako-runtime'
-          rescue LoadError
-            warn "'tebako-runtime' was not loaded."
-          end
-          # -- End of tebako patch --
-        SUBST
-      }.freeze
-
       IO_C_SUBST = <<~SUBST
         /* -- Start of tebako patch -- */
             if (is_tebako_file_descriptor(fd)) return;
@@ -328,6 +318,40 @@ module Tebako
           "mf.macro \"EXTLIBS\", $extlibs" => "#  mf.macro \"EXTLIBS\", $extlibs   tebako patched"
         }
       }.freeze
+
+      PRISM_PATTERN_1 = "pm_string_init_result_t init_result = pm_read_file(&result->input, RSTRING_PTR(filepath));"
+
+      PRISM_SUBST_1 = <<~SUBST
+        /* -- Start of tebako patch -- */
+            pm_string_init_result_t init_result;
+            if (within_tebako_memfs(RSTRING_PTR(filepath)))
+            {
+              init_result = tebako_string_file_init(&result->input, RSTRING_PTR(filepath));
+            }
+            else
+            {
+              init_result = pm_read_file(&result->input, RSTRING_PTR(filepath));
+            }
+            /* -- End of tebako patch -- */
+      SUBST
+
+      PRISM_PATTERN_2 = "#include \"prism.h\""
+      PRISM_SUBST_2 = <<~SUBST
+        #{PRISM_PATTERN_2}
+
+        /* -- Start of tebako patch -- */
+        #include <tebako/tebako-config.h>
+        #include <tebako/tebako-defines.h>
+        #include <tebako/tebako-io.h>
+        #include <tebako/tebako-prism.h>
+        /* -- End of tebako patch -- */
+
+      SUBST
+
+      PRISM_PATCHES = {
+        PRISM_PATTERN_1 => PRISM_SUBST_1,
+        PRISM_PATTERN_2 => PRISM_SUBST_2
+      }.freeze
     end
   end
 end

data/lib/tebako/packager.rb

@@ -33,8 +33,8 @@ require_relative "error"
 require_relative "deploy_helper"
 require_relative "ruby_builder"
 require_relative "stripper"
-require_relative "packager/pass1"
-require_relative "packager/pass1a"
+require_relative "packager/pass1_patch"
+require_relative "packager/pass1a_patch"
 require_relative "packager/pass2"
 require_relative "packager/patch_helpers"
 
@@ -119,7 +119,8 @@ module Tebako
         puts "-- Running pass1 script"
 
         PatchHelpers.recreate(src_dir)
-        do_patch(Pass1.get_patch_map(ostype, mount_point, ruby_ver), ruby_source_dir)
+        patch = crt_pass1_patch(ostype, mount_point, ruby_ver)
+        do_patch(patch.patch_map, ruby_source_dir)
 
         # Roll back pass1a, pass2 patches
         # Just in case we are recovering after some error
@@ -132,8 +133,8 @@ module Tebako
       # Patch gem_prelude.rb
       def pass1a(ruby_source_dir)
         puts "-- Running pass1a script"
-
-        do_patch(Pass1A.get_patch_map, ruby_source_dir)
+        patch = Pass1APatch.new.patch_map
+        do_patch(patch, ruby_source_dir)
       end
 
       # Pass2

data/lib/tebako/ruby_version.rb

@@ -37,15 +37,17 @@ module Tebako
       "3.1.6" => "0d0dafb859e76763432571a3109d1537d976266be3083445651dc68deed25c22",
       "3.2.4" => "c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692",
       "3.2.5" => "ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16",
+      "3.2.6" => "d9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370",
       "3.3.3" => "83c05b2177ee9c335b631b29b8c077b4770166d02fa527f3a9f6a40d13f3cce2",
       "3.3.4" => "fe6a30f97d54e029768f2ddf4923699c416cdbc3a6e96db3e2d5716c7db96a34",
-      "3.3.5" => "3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196"
+      "3.3.5" => "3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196",
+      "3.3.6" => "8dc48fffaf270f86f1019053f28e51e4da4cce32a36760a0603a9aee67d7fd8d",
+      "3.4.1" => "3d385e5d22d368b064c817a13ed8e3cc3f71a7705d7ed1bae78013c33aa7c87f"
     }.freeze
 
     MIN_RUBY_VERSION_WINDOWS = "3.1.6"
-    DEFAULT_RUBY_VERSION = "3.2.5"
+    DEFAULT_RUBY_VERSION = "3.2.6"
 
-    # rub_ver version = options["Ruby"].nil? ? DEFAULT_RUBY_VERSION : options["Ruby"]
     def initialize(ruby_version)
       @ruby_version = ruby_version.nil? ? DEFAULT_RUBY_VERSION : ruby_version
 
@@ -76,6 +78,10 @@ module Tebako
       @ruby33 ||= ruby3x? && @ruby_version[2].to_i >= 3
     end
 
+    def ruby34?
+      @ruby34 ||= ruby3x? && @ruby_version[2].to_i >= 4
+    end
+
     def api_version
       @api_version ||= "#{@ruby_version.split(".")[0..1].join(".")}.0"
     end

data/lib/tebako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-25 00:00:00.000000000 Z
+date: 2025-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -162,6 +162,7 @@ files:
 - exe/tebako-packager
 - include/tebako/tebako-fs.h
 - include/tebako/tebako-main.h
+- include/tebako/tebako-prism.h
 - lib/tebako.rb
 - lib/tebako/build_helpers.rb
 - lib/tebako/cache_manager.rb
@@ -173,9 +174,10 @@ files:
 - lib/tebako/options_manager.rb
 - lib/tebako/package_descriptor.rb
 - lib/tebako/packager.rb
-- lib/tebako/packager/pass1.rb
-- lib/tebako/packager/pass1a.rb
+- lib/tebako/packager/pass1_patch.rb
+- lib/tebako/packager/pass1a_patch.rb
 - lib/tebako/packager/pass2.rb
+- lib/tebako/packager/patch.rb
 - lib/tebako/packager/patch_buildsystem.rb
 - lib/tebako/packager/patch_helpers.rb
 - lib/tebako/packager/patch_libraries.rb

data/lib/tebako/packager/pass1.rb

@@ -1,242 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2021-2024 [Ribose Inc](https://www.ribose.com).
-# All rights reserved.
-# This file is a part of tebako
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-require_relative "patch_literals"
-require_relative "patch_helpers"
-require_relative "patch_buildsystem"
-
-# Tebako - an executable packager
-module Tebako
-  module Packager
-    # Ruby patching definitions (pass1)
-    module Pass1
-      # [TODO] looks like it does not exist in 3.1.4
-      # May be obsolete
-      TOOL_RBINSTALL_RB_PATCH = {
-        "    next if files.empty?" => "# tebako patched    next if files.empty?"
-      }.freeze
-
-      RUBYGEM_OPENSSL_RB_SUBST = <<~SUBST
-        # Start of tebako patch
-        require "openssl"
-        # End of tebako patch
-        autoload :OpenSSL, "openssl"
-      SUBST
-
-      RUBYGEM_OPENSSL_RB_PATCH = {
-        'autoload :OpenSSL, "openssl"' => RUBYGEM_OPENSSL_RB_SUBST
-      }.freeze
-
-      EXT_SETUP_PATCH = {
-        "#option nodynamic" => "option nodynamic"
-      }.freeze
-
-      EXT_BIGDECIMAL_BIGDECIMAL_H_PATCH = {
-        "#include \"ruby/ruby.h\"" => <<~SUBST
-          #include "ruby/ruby.h"
-
-          /* -- Start of tebako patch -- */
-          #ifndef HAVE_RB_SYM2STR
-          #define HAVE_RB_SYM2STR  1
-          #endif
-
-          #ifndef HAVE_RB_ARRAY_CONST_PTR
-          #define HAVE_RB_ARRAY_CONST_PTR 1
-          #endif
-
-          #ifndef HAVE_RB_RATIONAL_NUM
-          #define HAVE_RB_RATIONAL_NUM 1
-          #endif
-
-          #ifndef HAVE_RB_RATIONAL_DEN
-          #define HAVE_RB_RATIONAL_DEN 1
-          #endif
-
-          #ifndef HAVE_RB_COMPLEX_REAL
-          #define HAVE_RB_COMPLEX_REAL
-          #endif
-
-          #ifndef HAVE_RB_COMPLEX_IMAG
-          #define HAVE_RB_COMPLEX_IMAG
-          #endif
-          /* -- End of tebako patch -- */
-
-        SUBST
-      }.freeze
-
-      # The logic for statically linked extensions is broken entirely in the latest Ruby versions.
-      # The code below looks reasonble - we do not set -bundle_loader when building with -with-static-ext option
-      # However Gems bundled with Ruby just ignore with-static-ext option and build extensions as shared libraries
-      # So  the -bundler_loader option is required for them to link.
-      # It is strange that it is disabled in any case because this option does not create any issues for static
-      # libraries.
-      # ---------------------------------------------------
-      # elif test "x$EXTSTATIC" = x
-      # then :
-      #
-      #                            # When building exts as bundles, a mach-o bundle needs to know its loader
-      #                            # program to bind symbols from the ruby executable
-      #                            EXTDLDFLAGS="-bundle_loader '\$(BUILTRUBY)'"
-
-      DARWIN_CONFIGURE_PATCH = {
-        "elif test \"x$EXTSTATIC\" = x" => "elif true"
-      }.freeze
-
-      OPENSSL_EXTCONF_RB_SUBST = <<~SUBST
-        # Start of tebako patch
-        $defs.push("-DRUBY_EXPORT=1")
-        # End of tebako patch
-
-        Logging::message "=== Checking done. ===\\n"
-      SUBST
-
-      OPENSSL_EXTCONF_RB_PATCH = {
-        "Logging::message \"=== Checking done. ===\\n\"" => OPENSSL_EXTCONF_RB_SUBST
-      }.freeze
-
-      class << self
-        def get_base_patch_map(mount_point)
-          {
-            # ....................................................
-            # It won't install gems with no files defined in spec
-            # However if
-            #   -- we are installing a default gem from extension
-            #   -- extension is build statically
-            #  there may be no files install in addition to spec
-            # Example: io/wait extension (and others)
-            # [TODO]  Check if it is still required
-            # No match and patching on Ruby 3.1.4 but works wo issues
-            "tool/rbinstall.rb" => TOOL_RBINSTALL_RB_PATCH,
-
-            # ....................................................
-            # This is something that I cannnot explain
-            # (this patch does not seem related to static compilation)
-            "ext/bigdecimal/bigdecimal.h" => EXT_BIGDECIMAL_BIGDECIMAL_H_PATCH,
-
-            # ....................................................
-            # Allow only packaged gems (from within memfs)
-            "lib/rubygems/path_support.rb" => rubygems_path_support_patch(mount_point),
-
-            # ....................................................
-            # Disable dynamic extensions
-            "ext/Setup" => EXT_SETUP_PATCH
-          }
-        end
-
-        def get_patch_map(ostype, mount_point, ruby_ver)
-          patch_map = get_base_patch_map(mount_point)
-
-          # ....................................................
-          patch_map.store("configure", DARWIN_CONFIGURE_PATCH) if ostype =~ /darwin/
-
-          # ....................................................
-          # autoload :OpenSSL, "openssl"
-          # fails to deal with a default gem from statically linked extension
-          patch_map.store("lib/rubygems/openssl.rb", RUBYGEM_OPENSSL_RB_PATCH) if ruby_ver.ruby3x?
-
-          if ostype =~ /msys/
-            # ....................................................
-            # Generate export definitions; use WinMain to build rubyw.exe
-            patch_map.store("cygwin/GNUmakefile.in", get_gnumakefile_in_patch_p1(ruby_ver))
-            # ....................................................
-            # RUBY_EXPORT=1 (shall be set for static builds but is missing in openssl extension)
-            patch_map.store("ext/openssl/extconf.rb", OPENSSL_EXTCONF_RB_PATCH)
-          end
-
-          patch_map
-        end
-
-        private
-
-        include Tebako::Packager::PatchLiterals
-        include Tebako::Packager::PatchBuildsystem
-
-        def get_gnumakefile_in_patch_p1(ruby_ver) # rubocop:disable Metrics/MethodLength
-          objext = ruby_ver.ruby32? ? "$(OBJEXT)" : "@OBJEXT@"
-          {
-            "  DLLWRAP += -mno-cygwin" =>
-              "# tebako patched  DLLWRAP += -mno-cygwin",
-
-            "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext}" =>
-              "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext} $(WINMAINOBJ)  # tebako patched",
-
-            "$(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@" =>
-              "$(WINMAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@  # tebako patched",
-
-            "--output-exp=$(RUBY_EXP) \\" =>
-             "--output-exp=$(RUBY_EXP) --output-lib=$(LIBRUBY) --output-def=tebako.def \\",
-
-            "--export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)" =>
-              "--export-all $(LIBRUBY_A) $(LIBS) -o program-stub.exe   # tebako patched",
-
-            "@rm -f $(PROGRAM)" =>
-              "@rm -f program-stub.exe   # tebako patched",
-
-            "	$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)" =>
-             "# tebako patched  $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)",
-
-            "RUBYDEF = $(DLL_BASE_NAME).def" => GNUMAKEFILE_IN_WINMAIN_SUBST
-          }
-        end
-
-        def rubygems_path_support_patch_one(mount_point)
-          <<~SUBST
-              @home = env["GEM_HOME"] || Gem.default_dir
-            # -- Start of tebako patch --
-                unless env["TEBAKO_PASS_THROUGH"]
-                  @home = Gem.default_dir unless @home.index("#{mount_point}") == 0
-                end
-            # -- End of tebako patch --
-
-          SUBST
-        end
-
-        def rubygems_path_support_patch_two(mount_point)
-          <<~SUBST
-
-              @path = split_gem_path env["GEM_PATH"], @home
-            # -- Start of tebako patch --
-                unless env["TEBAKO_PASS_THROUGH"]
-                  @path.keep_if do |xpath|
-                    xpath.index("#{mount_point}") == 0
-                  end
-                end
-            # -- End of tebako patch --
-
-          SUBST
-        end
-
-        def rubygems_path_support_patch(mount_point)
-          {
-            '  @home = env["GEM_HOME"] || Gem.default_dir' => rubygems_path_support_patch_one(mount_point),
-            '  @path = split_gem_path env["GEM_PATH"], @home' => rubygems_path_support_patch_two(mount_point)
-          }
-        end
-      end
-    end
-  end
-end