tebako 0.5.12 → 0.6.2

data/exe/tebako-packager

@@ -74,19 +74,25 @@ begin
     Tebako::Packager.pass2(ARGV[1], ARGV[2], ARGV[3], ARGV[6])
   when "deploy"
     #       ARGV[0] -- command
-    #       ARGV[1] -- FS_STASH_DIR
-    #       ARGV[2] -- DATA_SRC_DIR
-    #       ARGV[3] -- DATA_PRE_DIR
-    #       ARGV[4] -- DATA_BIN_DIR
-    #       ARGV[5] -- GFLENGTH
-    unless ARGV.length == 6
+    #       ARGV[1] -- OSTYPE
+    #       ARGV[2] -- RUBY_SOURCE_DIR
+    #       ARGV[3] -- FS_STASH_DIR
+    #       ARGV[4] -- DATA_SRC_DIR
+    #       ARGV[5] -- DATA_PRE_DIR
+    #       ARGV[6] -- DATA_BIN_DIR
+    #       ARGV[7] -- GFLENGTH
+    #       ARGV[8] -- APP_NAME
+    #       ARGV[9] -- RUBY_VER
+    unless ARGV.length == 10
       raise Tebako::Error,
-            "tebako-packager deploy command expects 6 arguments, #{ARGV.length} has been provided."
+            "tebako-packager deploy command expects 10 arguments, #{ARGV.length} has been provided."
     end
-    Tebako::Packager.init(ARGV[1], ARGV[2], ARGV[3], ARGV[4])
+    Tebako::Packager.init(ARGV[3], ARGV[4], ARGV[5], ARGV[6])
+    Tebako::Packager.create_implib(ARGV[2], ARGV[4], File.basename(ARGV[8]), ARGV[9]) if ARGV[1] =~ /msys/
     # Assume that "<TARGET_BIN_DIR (TBD)>" is <DATA_SRC_DIR>/bin"
     # That shall match CMakeLists.txt settings
-    Tebako::Packager.deploy(ARGV[2], "#{ARGV[2]}/bin", ARGV[5])
+    Tebako::Packager.deploy(ARGV[4], "#{ARGV[4]}/bin", ARGV[7])
+
   else
     raise Tebako::Error, "tebako-packager cannot process #{ARGV[0]} command"
   end

data/include/tebako/tebako-main.h

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (c) 2021, [Ribose Inc](https://www.ribose.com).
+ * Copyright (c) 2021-2024, [Ribose Inc](https://www.ribose.com).
  * All rights reserved.
  * This file is a part of tebako
  *
@@ -32,6 +32,7 @@ extern "C" {
 #endif
 	int tebako_main(int* argc, char*** argv);
 	const char* tebako_mount_point(void);
+	int tebako_is_running_miniruby(void);
 #ifdef RB_W32
 	int tebako_file_load_ok(const char *path);
 #endif

data/lib/tebako/cli.rb

@@ -28,10 +28,12 @@
 
 require "digest"
 require "fileutils"
+require "open3"
 require "thor"
 require "yaml"
 
 require_relative "cli_helpers"
+require_relative "cli_rubies"
 require_relative "error"
 
 # Tebako - an executable packager
@@ -47,24 +49,21 @@ module Tebako
     desc "clean", "Clean tebako packaging environment"
     def clean
       puts "Cleaning tebako packaging environment"
-      FileUtils.rm_rf([deps, output], secure: true)
+      # Using File.join(deps, "") to ensure that the slashes are appropriate
+      FileUtils.rm_rf([File.join(deps, ""), File.join(output, "")], secure: true)
     end
 
     desc "clean_ruby", "Clean Ruby source from tebako packaging environment"
     method_option :Ruby, type: :string, aliases: "-R", required: false,
-                         enum: Tebako::CliHelpers::RUBY_VERSIONS.keys,
+                         enum: Tebako::CliRubies::RUBY_VERSIONS.keys,
                          desc: "Ruby version to clean, all available versions by default"
     def clean_ruby
       puts "Cleaning Ruby sources from tebako packaging environment"
-      if options["Ruby"].nil?
-        nmr = "#{deps}/src/_ruby_*"
-        nms = "#{deps}/stash_*"
-      else
-        nmr = "#{deps}/src/_ruby_#{options["Ruby"]}*"
-        nms = "#{deps}/stash_#{options["Ruby"]}"
-      end
-      FileUtils.rm_rf(Dir.glob(nmr), secure: true)
-      FileUtils.rm_rf(Dir.glob(nms), secure: true)
+      suffix = options["Ruby"].nil? ? "" : "_#{options["Ruby"]}"
+      nmr = "src/_ruby_#{suffix}*"
+      nms = "stash_#{suffix}"
+      FileUtils.rm_rf(Dir.glob(File.join(deps, nmr)), secure: true)
+      FileUtils.rm_rf(Dir.glob(File.join(deps, nms)), secure: true)
     end
 
     desc "hash", "Print build script hash (ci cache key)"
@@ -81,8 +80,8 @@ module Tebako
                            desc: "Tebako package file name, entry point base file name in the current folder by default"
     method_option :root, type: :string, aliases: "-r", required: true, desc: "Root folder of the Ruby application"
     method_option :Ruby, type: :string, aliases: "-R", required: false,
-                         enum: Tebako::CliHelpers::RUBY_VERSIONS.keys,
-                         desc: "Tebako package Ruby version, #{Tebako::CliHelpers::DEFAULT_RUBY_VERSION} by default"
+                         enum: Tebako::CliRubies::RUBY_VERSIONS.keys,
+                         desc: "Tebako package Ruby version, #{Tebako::CliRubies::DEFAULT_RUBY_VERSION} by default"
     def press
       puts press_announce
       do_press
@@ -93,8 +92,8 @@ module Tebako
 
     desc "setup", "Set up tebako packaging environment"
     method_option :Ruby, type: :string, aliases: "-R", required: false,
-                         enum: Tebako::CliHelpers::RUBY_VERSIONS.keys,
-                         desc: "Tebako package Ruby version, #{Tebako::CliHelpers::DEFAULT_RUBY_VERSION} by default"
+                         enum: Tebako::CliRubies::RUBY_VERSIONS.keys,
+                         desc: "Tebako package Ruby version, #{Tebako::CliRubies::DEFAULT_RUBY_VERSION} by default."
     def setup
       puts "Setting up tebako packaging environment"
       do_setup
@@ -122,29 +121,23 @@ module Tebako
 
     no_commands do
       def do_press
-        packaging_error(103) unless system(b_env, "cmake -DSETUP_MODE:BOOLEAN=OFF #{cfg_options} #{press_options}")
-        packaging_error(104) unless system(b_env,
-                                           "cmake --build #{output} --target tebako --parallel #{Etc.nprocessors}")
+        cfg_cmd = "cmake -DSETUP_MODE:BOOLEAN=OFF #{cfg_options} #{press_options}"
+        build_cmd = "cmake --build #{output} --target tebako --parallel #{Etc.nprocessors}"
+        merged_env = ENV.to_h.merge(b_env)
+        Tebako.packaging_error(103) unless system(merged_env, cfg_cmd)
+        Tebako.packaging_error(104) unless system(merged_env, build_cmd)
       end
 
       def do_setup
-        packaging_error(101) unless system(b_env, "cmake -DSETUP_MODE:BOOLEAN=ON #{cfg_options}")
-        packaging_error(102) unless system(b_env,
-                                           "cmake --build #{output} --target setup --parallel #{Etc.nprocessors}")
-      end
-
-      def press_announce
-        @press_announce ||= <<~ANN
-          Running tebako press at #{prefix}
-             Ruby version:            '#{extend_ruby_version[0]}'
-             Project root:            '#{options["root"]}'
-             Application entry point: '#{options["entry-point"]}'
-             Package file name:       '#{package}'
-             Loging level:            '#{l_level}'
-        ANN
+        cfg_cmd = "cmake -DSETUP_MODE:BOOLEAN=ON #{cfg_options}"
+        build_cmd = "cmake --build \"#{output}\" --target setup --parallel #{Etc.nprocessors}"
+        merged_env = ENV.to_h.merge(b_env)
+        Tebako.packaging_error(101) unless system(merged_env, cfg_cmd)
+        Tebako.packaging_error(102) unless system(merged_env, build_cmd)
       end
     end
 
     include Tebako::CliHelpers
+    include Tebako::CliRubies
   end
 end

data/lib/tebako/cli_helpers.rb

@@ -30,13 +30,14 @@ require "fileutils"
 require "pathname"
 require "rbconfig"
 
+require_relative "cli_rubies"
 require_relative "error"
 require_relative "version"
 
 # Tebako - an executable packager
 # Command-line interface methods
 module Tebako
-  # Cli methods
+  # Cli helpers
   module CliHelpers
     def b_env
       u_flags = if RbConfig::CONFIG["host_os"] =~ /darwin/
@@ -49,35 +50,25 @@ module Tebako
 
     def cfg_options
       ruby_ver, ruby_hash = extend_ruby_version
+      # Cannot use 'xxx' as parameters because it does not work in Windows shells
+      # So we have to use \"xxx\"
       @cfg_options ||=
-        "-DCMAKE_BUILD_TYPE=Release -DRUBY_VER:STRING='#{ruby_ver}' -DRUBY_HASH:STRING='#{ruby_hash}' " \
-        "-DDEPS:STRING='#{deps}' -G '#{m_files}' -B '#{output}' -S '#{source}'"
+        "-DCMAKE_BUILD_TYPE=Release -DRUBY_VER:STRING=\"#{ruby_ver}\" -DRUBY_HASH:STRING=\"#{ruby_hash}\" " \
+        "-DDEPS:STRING=\"#{deps}\" -G \"#{m_files}\" -B \"#{output}\" -S \"#{source}\""
     end
 
     def deps
       @deps ||= File.join(prefix, "deps")
     end
 
-    RUBY_VERSIONS = {
-      "2.7.8" => "c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0",
-      "3.0.6" => "6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e",
-      "3.1.4" => "a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6",
-      "3.2.3" => "af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba",
-      "3.3.0" => "96518814d9832bece92a85415a819d4893b307db5921ae1f0f751a9a89a56b7d"
-    }.freeze
-
-    DEFAULT_RUBY_VERSION = "3.1.4"
-
-    def extend_ruby_version
-      version = options["Ruby"].nil? ? DEFAULT_RUBY_VERSION : options["Ruby"]
-      unless RUBY_VERSIONS.key?(version)
-        raise Tebako::Error.new(
-          "Ruby version #{version} is not supported yet, exiting",
-          253
-        )
+    def fs_current
+      fs_current = Dir.pwd
+      if RUBY_PLATFORM =~ /msys|mingw|cygwin/
+        fs_current, cygpath_res = Open3.capture2e("cygpath", "-w", fs_current)
+        Tebako.packaging_error(101) unless cygpath_res.success?
+        fs_current.strip!
       end
-
-      @extend_ruby_version ||= [version, RUBY_VERSIONS[version]]
+      @fs_current ||= fs_current
     end
 
     def l_level
@@ -90,14 +81,17 @@ module Tebako
 
     # rubocop:disable Metrics/MethodLength
     def m_files
-      @m_files ||= case RbConfig::CONFIG["host_os"]
+      # [TODO]
+      # Ninja generates incorrect script fot tebako press target -- gets lost in a chain custom targets
+      # Using makefiles has negative performance impact so it needs to be fixed
+      @m_files ||= case RUBY_PLATFORM
                    when /linux/, /darwin/
                      "Unix Makefiles"
-                   when /msys/
-                     "Ninja"
+                   when /msys|mingw|cygwin/
+                     "MinGW Makefiles"
                    else
                      raise Tebako::Error.new(
-                       "#{RbConfig::CONFIG["host_os"]} is not supported yet, exiting",
+                       "#{RUBY_PLATFORM} is not supported yet, exiting",
                        254
                      )
                    end
@@ -109,26 +103,18 @@ module Tebako
     end
 
     def package
-      @package ||= if options["output"].nil?
-                     File.join(Dir.pwd, File.basename(options["entry-point"], ".*"))
+      package = if options["output"].nil?
+                  File.join(Dir.pwd, File.basename(options["entry-point"], ".*"))
+                else
+                  options["output"]
+                end
+      @package ||= if relative?(package)
+                     File.join(fs_current, package)
                    else
-                     options["output"]
+                     package
                    end
     end
 
-    PACKAGING_ERRORS = {
-      101 => "'tebako setup' configure step failed",
-      102 => "'tebako setup' build step failed",
-      103 => "'tebako press' configure step failed",
-      104 => "'tebako press' build step failed"
-    }.freeze
-
-    def packaging_error(code)
-      msg = PACKAGING_ERRORS[code]
-      msg = "Unknown packaging error" if msg.nil?
-      raise Tebako::Error.new msg, code
-    end
-
     def prefix
       @prefix ||= if options["prefix"].nil?
                     puts "No prefix specified, using ~/.tebako"
@@ -140,10 +126,33 @@ module Tebako
                   end
     end
 
+    def press_announce
+      @press_announce ||= <<~ANN
+        Running tebako press at #{prefix}
+           Ruby version:            '#{extend_ruby_version[0]}'
+           Project root:            '#{root}'
+           Application entry point: '#{options["entry-point"]}'
+           Package file name:       '#{package}'
+           Loging level:            '#{l_level}'
+      ANN
+    end
+
     def press_options
       @press_options ||=
-        "-DROOT:STRING='#{options["root"]}' -DENTRANCE:STRING='#{options["entry-point"]}' " \
-        "-DPCKG:STRING='#{package}' -DLOG_LEVEL:STRING='#{options["log-level"]}'"
+        "-DROOT:STRING='#{root}' -DENTRANCE:STRING='#{options["entry-point"]}' " \
+        "-DPCKG:STRING='#{package}' -DLOG_LEVEL:STRING='#{options["log-level"]}' "
+    end
+
+    def relative?(path)
+      Pathname.new(path).relative?
+    end
+
+    def root
+      @root ||= if relative?(options["root"])
+                  File.join(fs_current, options["root"])
+                else
+                  File.join(options["root"], "")
+                end
     end
 
     def source

data/lib/tebako/cli_rubies.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+# Copyright (c) 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 "fileutils"
+require "pathname"
+require "rbconfig"
+
+require_relative "error"
+require_relative "version"
+
+# Tebako - an executable packager
+# Command-line interface methods
+module Tebako
+  # Ruby version helpers
+  module CliRubies
+    RUBY_VERSIONS = {
+      "2.7.8" => "c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0",
+      "3.0.6" => "6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e",
+      "3.1.4" => "a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6",
+      "3.2.3" => "af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba",
+      "3.3.0" => "96518814d9832bece92a85415a819d4893b307db5921ae1f0f751a9a89a56b7d"
+    }.freeze
+
+    DEFAULT_RUBY_VERSION = "3.1.4"
+
+    def version_check(version)
+      return if RUBY_VERSIONS.key?(version)
+
+      raise Tebako::Error.new(
+        "Ruby version #{version} is not supported yet, exiting",
+        253
+      )
+    end
+
+    def version_check_msys(version)
+      if Gem::Version.new(version) < Gem::Version.new(DEFAULT_RUBY_VERSION) && RUBY_PLATFORM =~ /msys|mingw|cygwin/
+        raise Tebako::Error.new(
+          "Windows packaging works for Ruby #{DEFAULT_RUBY_VERSION} or above, version #{version} is not supported",
+          252
+        )
+      end
+    end
+
+    def extend_ruby_version
+      version = options["Ruby"].nil? ? DEFAULT_RUBY_VERSION : options["Ruby"]
+      version_check(version)
+      version_check_msys(version)
+      @extend_ruby_version ||= [version, RUBY_VERSIONS[version]]
+    end
+  end
+end

data/lib/tebako/error.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2023 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2023-204 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -26,8 +26,23 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 # Tebako - an executable packager
-# Tebako error class
 module Tebako
+  PACKAGING_ERRORS = {
+    101 => "'tebako setup' configure step failed",
+    102 => "'tebako setup' build step failed",
+    103 => "'tebako press' configure step failed",
+    104 => "'tebako press' build step failed",
+    105 => "Failed to map MSys path to Windows"
+  }.freeze
+
+  class << self
+    def packaging_error(code)
+      msg = PACKAGING_ERRORS[code]
+      msg = "Unknown packaging error" if msg.nil?
+      raise Tebako::Error.new msg, code
+    end
+  end
+
   # Tebako error class
   class Error < StandardError
     def initialize(msg = "Unspecified error", code = 255)

data/lib/tebako/packager/pass1.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2021-2023 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2021-2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -25,19 +25,30 @@
 # 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"' => "require \"openssl\"\nautoload :OpenSSL, \"openssl\""
+        'autoload :OpenSSL, "openssl"' => RUBYGEM_OPENSSL_RB_SUBST
       }.freeze
 
       EXT_SETUP_PATCH = {
@@ -77,13 +88,25 @@ module Tebako
         SUBST
       }.freeze
 
-      CONFIGURE_PATCH = {
+      DARWIN_CONFIGURE_PATCH = {
         "EXTDLDFLAGS=\"-bundle_loader '\\$(BUILTRUBY)'\"" => ""
       }.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_patch_map(ostype, mount_point, ruby_ver)
-          patch_map = {
+        def get_base_patch_map(mount_point)
+          {
             # ....................................................
             # It won't install gems with no files defined in spec
             # However if
@@ -91,6 +114,8 @@ module Tebako
             #   -- 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,
 
             # ....................................................
@@ -106,20 +131,62 @@ module Tebako
             # 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)
+
           # ....................................................
           # Fixing (bypassing) configure script bug where a variable is used before initialization
-          patch_map.store("configure", CONFIGURE_PATCH) if ostype =~ /darwin/
+          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 PatchHelpers.ruby3x?(ruby_ver)
 
+          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 ve 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 = PatchHelpers.ruby32?(ruby_ver) ? "$(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 \\",
+
+            "	@rm -f $(PROGRAM)" =>
+              "# tebako patched  @rm -f $(PROGRAM)",
+
+            "	$(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