tebako 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3b1bac324a40524fe22b2c7026dcad437f62802fcaf57f37b4ae64eda383eb3
-  data.tar.gz: 1eec9bed248d7fc6d3f4c6d8c11e1ca7d7f9f1a10077b87cde00f61c2978cd33
+  metadata.gz: d208b7629dd786cecb0861c1958099047988c471122286028d7b1ca047df3c33
+  data.tar.gz: 7246a876406c06abd60d05808d5686844f8bd3fda1c4a69384b3d4aaaab513d7
 SHA512:
-  metadata.gz: da56a60c53abc22be03dbd4be569f547c0bb5f698883e3f3960c2ba8a43a2ef06c66df739c9dfd7bda55c129fb8f6e166c02372baad4cee1ce1af142709c0ad0
-  data.tar.gz: 902a593412bb255369c7dd69b98c178066cfe5209d7a3836bfe3d2b45382bcd9c29ba4119e0f8128b3b960d545af0f9881de9786e374e4a231e46d0c42971543
+  metadata.gz: fa0eef41e50f5aa1fc52010c221004d7e5b038ae0b98a293e3731ce4a742e7e4ea8dcc7c166bb937dd8d74ec78573a88d63ee46e2028d5c71e41c05e1aa5f350
+  data.tar.gz: 78a564e010d2892bf0243de1b2b90c86bbe2c727f75196629132ee867b8f7116bb874044ec705cd6fc154ed85059a450773a38975c5d1f5d4c90d494055fa26a

data/CMakeLists.txt

@@ -560,9 +560,9 @@ else (${SETUP_MODE})
     COMMAND ${GNU_BASH} -c "rm -f ${DATA_SRC_DIR}/**/*.a"
     COMMAND ${GNU_BASH} -c "rm -f ${DATA_SRC_DIR}/**/*.o"
     COMMAND ${GNU_BASH} -c "chmod +x ${DEPS_BIN_DIR}/mkdwarfs${EXE_SUFFIX}"
-    # No progress below is crtitical since in reporting mode mkdwarfs tries to work directly with terminal
-    # and it creates critical issues for stderr redirects (&2 > 1) used by Ninja and our test srcipts
-    # It may be fixable bit is very difficult to reproduce in testi environment
+    # No progress below is critical since in reporting mode mkdwarfs tries to work directly with terminal
+    # and it creates issues for stderr redirects (&2 > 1) used by Ninja and our test srcipts
+    # It may be fixable bit is very difficult to reproduce in test environment
     COMMAND ${DEPS_BIN_DIR}/mkdwarfs -o ${DATA_BIN_FILE} -i ${DATA_SRC_DIR} --no-progress
     COMMAND ${CMAKE_COMMAND} -E touch ${DEPS_SRC_DIR}/tebako/tebako-fs.cpp
     DEPENDS setup source_filesystem

data/README.adoc

@@ -48,7 +48,7 @@ The Tebako packager supports the following versions of Ruby for packaging:
 * 2.7.8 (Linux, MacOS)
 * 3.0.6 (Linux, MacOS)
 * 3.1.4 (Linux, MacOS, Windows)
-* 3.2.3 (Linux, MacOS)
+* 3.2.3 (Linux, MacOS, Windows)
 
 Support of specific version including minor release requires some effort, sometimes extensive
 but our goal is to be able to package all maintained Ruby releases.
@@ -129,31 +129,31 @@ brew install gnu-sed bash pkg-config bison flex binutils libffi gdbm zlib ncurse
   double-conversion boost jemalloc fmt glog libevent libsodium lz4 xz libyaml openssl@3
 ----
 
-== Installation
+=== Windows (2019, 2022)
 
-=== General
+The simplest approach is to use Ruby development environment provided by RubyInstaller, for example Ruby+Devkit 3.1.4-1.
 
-Tebako is distributed as a Ruby gem
+Once it is installed use the following commands:
 
 [source,sh]
 ----
-gem install tebako
+  ridk enable ucrt64
+  pacman -S git tar bison flex toolchain make cmake
+            boost diffutils libevent double-conversion
+            fmt glog dlfcn gtest autotools ncurses libyaml
 ----
 
-=== Windows (2019, 2022)
+== Installation
 
-The simplest approach is to use Ruby development environment provided by RubyInstaller, for example Ruby+Devkit 3.1.4-1
-Once it is is installed use the follwoing commands
+=== General
+
+Tebako is distributed as a Ruby gem
 
 [source,sh]
 ----
-  ridk enable ucrt64
-  pacman -S git tar bison flex toolchain make cmake
-            boost diffutils libevent double-conversion
-            fmt glog dlfcn gtest autotools ncurses libyaml
+gem install tebako
 ----
 
-
 === Quick setup on Ubuntu 20.04 on Docker
 
 Launch a container on the target platform:

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_rubies.rb

@@ -57,12 +57,12 @@ module Tebako
     end
 
     def version_check_msys(version)
-      return unless version != DEFAULT_RUBY_VERSION && RbConfig::CONFIG["host_os"] =~ /msys|mingw|cygwin/
-
-      raise Tebako::Error.new(
-        "Windows packaging is compatible with Ruby #{DEFAULT_RUBY_VERSION} only, version #{version} is not supported",
-        252
-      )
+      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

data/lib/tebako/packager/pass1.rb

@@ -27,6 +27,7 @@
 
 require_relative "patch_literals"
 require_relative "patch_helpers"
+require_relative "patch_buildsystem"
 
 # Tebako - an executable packager
 module Tebako
@@ -159,6 +160,7 @@ module Tebako
         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@"

data/lib/tebako/packager/pass2.rb

@@ -28,6 +28,7 @@
 require_relative "patch_literals"
 require_relative "patch_libraries"
 require_relative "patch_helpers"
+require_relative "patch_buildsystem"
 
 # Tebako - an executable packager
 module Tebako
@@ -40,7 +41,7 @@ module Tebako
 
           patch_map.store("thread_pthread.c", LINUX_MUSL_THREAD_PTHREAD_PATCH) if ostype =~ /linux-musl/
 
-          if ostype =~ /msys/
+          if PatchHelpers.msys?(ostype)
             patch_map.merge!(get_msys_patches(ruby_ver))
           elsif PatchHelpers.ruby3x?(ruby_ver)
             # [TODO] Do we really need it for platforms other then Windows ??
@@ -52,47 +53,51 @@ module Tebako
 
         private
 
+        include Tebako::Packager::PatchBuildsystem
         include Tebako::Packager::PatchLiterals
 
         def get_dir_c_patch(ostype)
-          dir_c_patch = patch_c_file(ostype =~ /msys/ ? "/* define system APIs */" : "#ifdef HAVE_GETATTRLIST")
+          pattern = PatchHelpers.msys?(ostype) ? "/* define system APIs */" : "#ifdef HAVE_GETATTRLIST"
+          dir_c_patch = PatchHelpers.patch_c_file(pattern)
           dir_c_patch.merge!(DIR_C_BASE_PATCH)
+          dir_c_patch
         end
 
-        def get_dln_c_patch(ostype)
+        def get_dln_c_patch(ostype, ruby_ver)
           # Not using substitutions of dlxxx functions on Windows
           dln_c_patch = {
             "static const char funcname_prefix[sizeof(FUNCNAME_PREFIX) - 1] = FUNCNAME_PREFIX;" =>
-              "#{ostype =~ /msys/ ? C_FILE_SUBST_LESS : C_FILE_SUBST}\n" \
+              "#{PatchHelpers.msys?(ostype) ? C_FILE_SUBST_LESS : C_FILE_SUBST}\n" \
               "static const char funcname_prefix[sizeof(FUNCNAME_PREFIX) - 1] = FUNCNAME_PREFIX;\n"
           }
-          dln_c_patch.merge!(DLN_C_MSYS_PATCH) if ostype =~ /msys/
+
+          if PatchHelpers.msys?(ostype)
+            patch = PatchHelpers.ruby32?(ruby_ver) ? DLN_C_MSYS_PATCH : DLN_C_MSYS_PATCH_PRE32
+            dln_c_patch.merge!(patch)
+          end
+
           dln_c_patch
         end
 
-        def get_io_c_patch(ostype)
-          io_c_patch = patch_c_file("/* define system APIs */")
-          io_c_patch.merge!(IO_C_MSYS_PATCH) if ostype =~ /msys/
+        def get_io_c_msys_patch(ruby_ver)
+          io_c_msys_patch = PatchHelpers.ruby32?(ruby_ver) ? IO_C_MSYS_PATCH : IO_C_MSYS_PATCH_PRE_32
+          io_c_msys_patch.merge(IO_C_MSYS_BASE_PATCH)
+        end
+
+        def get_io_c_patch(ostype, ruby_ver)
+          io_c_patch = PatchHelpers.patch_c_file("/* define system APIs */")
+          io_c_patch.merge!(get_io_c_msys_patch(ruby_ver)) if PatchHelpers.msys?(ostype)
           io_c_patch
         end
 
-        def get_gnumakefile_in_patch_p2(ruby_ver) # rubocop:disable Metrics/MethodLength
-          # For pass 2 we 'kill ruby.exp' regeneration
-          objext = PatchHelpers.ruby32?(ruby_ver) ? "$(OBJEXT)" : "@OBJEXT@"
+        def get_msys_mkconfig_rb_patches(ruby_ver)
           {
-            "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext}" =>
-              "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext} $(WINMAINOBJ)  # tebako patched",
-
-            "$(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@" =>
-              "$(WINMAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) -o $@  # tebako patched",
-
-            "RUBYDEF = $(DLL_BASE_NAME).def" => GNUMAKEFILE_IN_WINMAIN_SUBST,
-
-            "$(RUBY_EXP): $(LIBRUBY_A)" => "dummy.exp: $(LIBRUBY_A) # tebako patched",
-
-            "$(PROGRAM): $(RUBY_INSTALL_NAME).res.#{objext}" =>
-              "$(PROGRAM): $(RUBY_INSTALL_NAME).res.#{objext} $(LIBRUBY_A) # tebako patched\n" \
-              "$(LIBRUBY_A): $(LIBRUBY_A_OBJS) $(INITOBJS) # tebako patched\n"
+            "    if fast[name]" => TOOLS_MKCONFIG_RB_SUBST,
+            "when /RUBYGEMS/; next" =>
+              "when /RUBYGEMS/; next\n\n" \
+              "# Start of tebako patch\n" \
+              "when /MAINLIBS/; val = #{PatchLibraries.msys_base_libs(ruby_ver)}\n" \
+              "# End of tebako patch"
           }
         end
 
@@ -106,13 +111,15 @@ module Tebako
         end
 
         def get_patch_map_base(ostype, deps_lib_dir, ruby_ver)
+          mcrb_subst = PatchHelpers.msys?(ostype) ? get_msys_mkconfig_rb_patches(ruby_ver) : TOOL_MKCONFIG_RB_PATCH
           {
             "template/Makefile.in" => template_makefile_in_patch(ostype, deps_lib_dir, ruby_ver),
-            "tool/mkconfig.rb" => ostype =~ /msys/ ? TOOL_MKCONFIG_RB_PATCH_MSYS : TOOL_MKCONFIG_RB_PATCH,
+            "tool/mkconfig.rb" => mcrb_subst,
             "gem_prelude.rb" => GEM_PRELUDE_RB_PATCH,
-            "dir.c" => get_dir_c_patch(ostype),            "dln.c" => get_dln_c_patch(ostype),
-            "io.c" => get_io_c_patch(ostype),              "file.c" => patch_c_file("/* define system APIs */"),
-            "main.c" => MAIN_C_PATCH,                      "util.c" => patch_c_file("#ifndef S_ISDIR")
+            "dir.c" => get_dir_c_patch(ostype),            "dln.c" => get_dln_c_patch(ostype, ruby_ver),
+            "io.c" => get_io_c_patch(ostype, ruby_ver),    "main.c" => MAIN_C_PATCH,
+            "file.c" => PatchHelpers.patch_c_file("/* define system APIs */"),
+            "util.c" => PatchHelpers.patch_c_file("#ifndef S_ISDIR")
           }
         end
 
@@ -126,25 +133,9 @@ module Tebako
           }
         end
 
-        def patch_c_file(pattern)
-          {
-            pattern => "#{C_FILE_SUBST}\n#{pattern}"
-          }
-        end
-
         def template_makefile_in_patch(ostype, deps_lib_dir, ruby_ver)
           template_makefile_in_patch_two(ostype, ruby_ver).merge(mlibs_subst(ostype, deps_lib_dir, ruby_ver))
         end
-
-        def template_makefile_in_patch_two(ostype, ruby_ver)
-          if ostype =~ /msys/
-            { TEMPLATE_MAKEFILE_IN_BASE_PATTERN => TEMPLATE_MAKEFILE_IN_BASE_PATCH_MSYS }
-          elsif PatchHelpers.ruby31?(ruby_ver)
-            { TEMPLATE_MAKEFILE_IN_BASE_PATTERN => TEMPLATE_MAKEFILE_IN_BASE_PATCH }
-          else
-            { TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_1 => TEMPLATE_MAKEFILE_IN_BASE_PATCH_PRE_3_1 }
-          end
-        end
       end
     end
   end

data/lib/tebako/packager/patch_buildsystem.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2023-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_helpers"
+
+# Tebako - an executable packager
+module Tebako
+  module Packager
+    # Ruby buildsystem patches (pass2)
+    module PatchBuildsystem
+      # This patch forces rebuild of extinit.c when exts.mk changes
+      # exts.mk changes when we rebuild extensions to make them statically linked
+      # [TODO] it is possible that we can build extensions statically on pass1 and it will
+      #        eliminate the need for this patch
+      COMMON_MK_PATCH = {
+        "ext/extinit.c: $(srcdir)/template/extinit.c.tmpl $(PREP)" =>
+          "ext/extinit.c: $(srcdir)/template/extinit.c.tmpl $(PREP) $(EXTS_MK)"
+      }.freeze
+
+      # This patch changes libraries that are used for Ruby linking
+      # MAINLIBS is patched elsewhere (not with literal but dynamically)
+      #          to haold the list of sattic libraries and related options
+      # Also we have to put LIBRUBYARG_STATIC instead of LIBRUBYARG to link with static libruby,
+      # configure's --disable-shared option does not do it
+      # Several variants depending on os and version
+      TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_1 =
+        "\t\t$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
+        "$(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@"
+
+      TEMPLATE_MAKEFILE_IN_BASE_PATCH_PRE_3_1 =
+        "# -- Start of tebako patch --\n" \
+        "\t\t$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
+        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
+        "# -- End of tebako patch --"
+
+      TEMPLATE_MAKEFILE_IN_BASE_PATTERN =
+        "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) " \
+        "$(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@"
+
+      TEMPLATE_MAKEFILE_IN_BASE_PATCH =
+        "# -- Start of tebako patch --\n" \
+        "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
+        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
+        "# -- End of tebako patch --"
+
+      TEMPLATE_MAKEFILE_IN_BASE_PATCH_MSYS =
+        "# -- Start of tebako patch --\n" \
+        "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(RUBY_EXP) $(MAINOBJ) " \
+        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
+        "# -- End of tebako patch --"
+
+      def template_makefile_in_patch_two(ostype, ruby_ver)
+        if PatchHelpers.msys?(ostype)
+          { TEMPLATE_MAKEFILE_IN_BASE_PATTERN => TEMPLATE_MAKEFILE_IN_BASE_PATCH_MSYS }
+        elsif PatchHelpers.ruby31?(ruby_ver)
+          { TEMPLATE_MAKEFILE_IN_BASE_PATTERN => TEMPLATE_MAKEFILE_IN_BASE_PATCH }
+        else
+          { TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_1 => TEMPLATE_MAKEFILE_IN_BASE_PATCH_PRE_3_1 }
+        end
+      end
+
+      # This MSYS specific thing ensure compilation of winmain.c
+      # Did try to understand why it did not work out of the box
+      GNUMAKEFILE_IN_WINMAIN_SUBST = <<~SUBST
+        RUBYDEF = $(DLL_BASE_NAME).def
+
+        # Start of tebako patch
+        WINMAINOBJ    = win32/winmain.$(OBJEXT)
+        $(WINMAINOBJ): win32/winmain.c
+        # End of tebako patch
+      SUBST
+
+      # Other MSYS (GNUMakefile) specific patches
+      #  - The same issue with libraries as for Makefile above
+      #  - 'Kill' ruby.exp regeneration on pass2
+      #     since we want to use outpu from pass1 for implib generation
+      #     [VERY UGLY HACK]
+      #  - Introduce LIBRUBY dependency on static extensions
+      #    This is an addition to COMMON_MK_PATCH specified above
+      def get_gnumakefile_in_patch_p2(ruby_ver) # rubocop:disable Metrics/MethodLength
+        objext = PatchHelpers.ruby32?(ruby_ver) ? "$(OBJEXT)" : "@OBJEXT@"
+
+        {
+          "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext}" =>
+            "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext} $(WINMAINOBJ)  # tebako patched",
+
+          "RUBYDEF = $(DLL_BASE_NAME).def" => GNUMAKEFILE_IN_WINMAIN_SUBST,
+
+          "$(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@" =>
+            "$(WINMAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) -o $@  # tebako patched",
+
+          "$(RUBY_EXP): $(LIBRUBY_A)" => "dummy.exp: $(LIBRUBY_A) # tebako patched",
+
+          "$(PROGRAM): $(RUBY_INSTALL_NAME).res.#{objext}" =>
+            "$(PROGRAM): $(RUBY_INSTALL_NAME).res.#{objext} $(LIBRUBY_A) # tebako patched\n" \
+            "$(LIBRUBY_A): $(LIBRUBY_A_OBJS) $(INITOBJS) # tebako patched\n"
+        }
+      end
+    end
+  end
+end

data/lib/tebako/packager/patch_helpers.rb

@@ -61,6 +61,16 @@ module Tebako
           out
         end
 
+        def msys?(ostype)
+          ostype =~ /msys|cygwin|mingw/
+        end
+
+        def patch_c_file(pattern)
+          {
+            pattern => "#{PatchLiterals::C_FILE_SUBST}\n#{pattern}"
+          }
+        end
+
         def recreate(dirname)
           FileUtils.rm_rf(dirname, noop: nil, verbose: nil, secure: true)
           FileUtils.mkdir(dirname)

data/lib/tebako/packager/patch_libraries.rb

@@ -109,6 +109,18 @@ module Tebako
           SUBST
         end
 
+        # Used for mkconfig.rb
+        def msys_base_libs(ruby_ver)
+          <<~SUBST
+            "-l:libtebako-fs.a -l:libdwarfs-wr.a -l:libdwarfs.a -l:libdwarfs_compression.a -l:libfolly.a -l:libfsst.a "          \\
+            "-l:libmetadata_thrift.a -l:libthrift_light.a -l:libxxhash.a -l:libfmt.a -l:libdouble-conversion.a -l:libglog.a -l:libgflags.a -l:libevent.a " \\
+            "-l:liblz4.a -l:libz.a -l:libzstd.a -l:liblzma.a -l:libncurses.a -l:libunwind.a -l:liblzma.a -l:libiberty.a #{PatchHelpers.yaml_reference(ruby_ver)} " \\
+            "-l:libffi.a -l:libboost_system-mt.a -l:libboost_chrono-mt.a -l:libstdc++.a -l:libdl.a -static-libgcc -static-libstdc++ -l:libssl.a -l:libcrypto.a " \\
+            "-l:libz.a -l:libwinpthread.a -lcrypt32 -lshlwapi -lwsock32 -liphlpapi -limagehlp -lbcrypt -lole32 -loleaut32 -luuid"
+          SUBST
+        end
+
+        # Used in Makefile
         def msys_libs(ruby_ver)
           <<~SUBST
             -Wl,-Bstatic #{linux_common_libs} \

data/lib/tebako/packager/patch_literals.rb

@@ -29,7 +29,7 @@
 module Tebako
   module Packager
     # Ruby patching literals (pass2)
-    module PatchLiterals # rubocop:disable Metrics/ModuleLength
+    module PatchLiterals
       TOOL_MKCONFIG_RB_PATCH = {
         "    if fast[name]" => <<~SUBST
           # -- Start of tebako patch --
@@ -48,23 +48,21 @@ module Tebako
         SUBST
       }.freeze
 
-      TOOL_MKCONFIG_RB_PATCH_MSYS = {
-        "    if fast[name]" => <<~SUBST
-          # -- Start of tebako patch --
-              v_head_comp = "  CONFIG[\\"prefix\\"] \#{eq} "
-              if v_head_comp == v[0...(v_head_comp.length)]
-                v = "\#{v[0...(v_head_comp.length)]}CONFIG[\\"RUBY_EXEC_PREFIX\\"] = 'A:/__tebako_memfs__'
-          "
-              end
-              v_head_comp = "  CONFIG[\\"RUBY_EXEC_PREFIX\\"] \#{eq} "
-              if v_head_comp == v[0...(v_head_comp.length)]
-                v = "\#{v[0...(v_head_comp.length)]}'A:/__tebako_memfs__'
-          "
-              end
-          # -- End of tebako patch --
-              if fast[name]
-        SUBST
-      }.freeze
+      TOOLS_MKCONFIG_RB_SUBST = <<~SUBST
+        # -- Start of tebako patch --
+            v_head_comp = "  CONFIG[\\"prefix\\"] \#{eq} "
+            if v_head_comp == v[0...(v_head_comp.length)]
+              v = "\#{v[0...(v_head_comp.length)]}CONFIG[\\"RUBY_EXEC_PREFIX\\"] = 'A:/__tebako_memfs__'
+        "
+            end
+            v_head_comp = "  CONFIG[\\"RUBY_EXEC_PREFIX\\"] \#{eq} "
+            if v_head_comp == v[0...(v_head_comp.length)]
+              v = "\#{v[0...(v_head_comp.length)]}'A:/__tebako_memfs__'
+        "
+            end
+        # -- End of tebako patch --
+            if fast[name]
+      SUBST
 
       # Alpine-specific patches https://github.com/docker-library/ruby/blob/master/3.1/alpine3.15/Dockerfile
       # -- Patch no. 1 --
@@ -169,7 +167,7 @@ module Tebako
           "else if (e == EIO /* tebako patch */ && !within_tebako_memfs(path)) {"
       }.freeze
 
-      DLN_C_MSYS_PATCH = {
+      DLN_C_MSYS_PATCH_PRE32 = {
         "    winfile = rb_w32_mbstr_to_wstr(CP_UTF8, file, -1, NULL);" => <<~SUBST
           /* -- Start of tebako patch -- */
             char *f = NULL;
@@ -191,37 +189,28 @@ module Tebako
         SUBST
       }.freeze
 
-      COMMON_MK_PATCH = {
-        "ext/extinit.c: $(srcdir)/template/extinit.c.tmpl $(PREP)" =>
-          "ext/extinit.c: $(srcdir)/template/extinit.c.tmpl $(PREP) $(EXTS_MK)"
+      DLN_C_MSYS_PATCH = {
+        "    WCHAR *winfile = rb_w32_mbstr_to_wstr(CP_UTF8, file, -1, NULL);" => <<~SUBST
+          /* -- Start of tebako patch -- */
+            char *f = NULL;
+            WCHAR *winfile = NULL;
+            if (file && within_tebako_memfs(file)) {
+              f = tebako_dlmap2file(file);
+              if (f) {
+                winfile = rb_w32_mbstr_to_wstr(CP_UTF8, f, -1, NULL);
+                free(f);
+              }
+              else {
+                goto failed;
+              }
+            }
+            else {
+              winfile = rb_w32_mbstr_to_wstr(CP_UTF8, file, -1, NULL);
+            }
+          /* -- End of tebako patch -- */
+        SUBST
       }.freeze
 
-      TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_1 =
-        "\t\t$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
-        "$(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@"
-
-      TEMPLATE_MAKEFILE_IN_BASE_PATCH_PRE_3_1 =
-        "# -- Start of tebako patch --\n" \
-        "\t\t$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
-        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
-        "# -- End of tebako patch --"
-
-      TEMPLATE_MAKEFILE_IN_BASE_PATTERN =
-        "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) " \
-        "$(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@"
-
-      TEMPLATE_MAKEFILE_IN_BASE_PATCH =
-        "# -- Start of tebako patch --\n" \
-        "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
-        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
-        "# -- End of tebako patch --"
-
-      TEMPLATE_MAKEFILE_IN_BASE_PATCH_MSYS =
-        "# -- Start of tebako patch --\n" \
-        "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(RUBY_EXP) $(MAINOBJ) " \
-        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
-        "# -- End of tebako patch --"
-
       C_FILE_SUBST = <<~SUBST
         /* -- Start of tebako patch -- */
         #include <tebako/tebako-config.h>
@@ -251,15 +240,6 @@ module Tebako
         SUBST
       }.freeze
 
-      GNUMAKEFILE_IN_WINMAIN_SUBST = <<~SUBST
-        RUBYDEF = $(DLL_BASE_NAME).def
-
-        # Start of tebako patch
-        WINMAINOBJ    = win32/winmain.$(OBJEXT)
-        $(WINMAINOBJ): win32/winmain.c
-        # End of tebako patch
-      SUBST
-
       IO_C_SUBST = <<~SUBST
         /* -- Start of tebako patch -- */
             if (is_tebako_file_descriptor(fd)) return;
@@ -267,13 +247,23 @@ module Tebako
             flags = fcntl(fd, F_GETFD); /* should not fail except EBADF. */
       SUBST
 
-      IO_C_MSYS_PATCH = {
-        "#define open	rb_w32_uopen" => "#define open(p, f, m) tebako_open(3, (p), (f), (m))",
+      IO_C_MSYS_BASE_PATCH = {
+        "#define open	rb_w32_uopen" => "#define open(p, f, m) tebako_open(3, (p), (f), (m))"
+      }.freeze
+
+      IO_C_MSYS_PATCH_PRE_32 = {
         "(rb_w32_io_cancelable_p((fptr)->fd) ? Qnil : rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_READABLE), Qnil))" =>
             "((is_tebako_file_descriptor((fptr)->fd) || rb_w32_io_cancelable_p((fptr)->fd)) ? \\\n" \
             "Qnil : rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_READABLE), Qnil))"
       }.freeze
 
+      IO_C_MSYS_PATCH = {
+        "(rb_w32_io_cancelable_p((fptr)->fd) ? Qnil : rb_io_wait(fptr->self, " \
+        "RB_INT2NUM(RUBY_IO_READABLE), RUBY_IO_TIMEOUT_DEFAULT))" =>
+            "((is_tebako_file_descriptor((fptr)->fd) || rb_w32_io_cancelable_p((fptr)->fd)) ? \\\n" \
+            "Qnil : rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_READABLE), RUBY_IO_TIMEOUT_DEFAULT))"
+      }.freeze
+
       FILE_C_MSYS_SUBST = <<~SUBST
         /* -- Start of tebako patch -- */
                if (is_tebako_file_descriptor((fptr)->fd)) return ENOTSUP;

data/lib/tebako/version.rb

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

data/src/tebako-main.cpp

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (c) 2021-2022 [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
  *
@@ -50,6 +50,8 @@
 #include <tebako/tebako-main.h>
 #include <tebako/tebako-fs.h>
 
+static int running_miniruby = 0;
+
 extern "C" int tebako_main(int* argc, char*** argv) {
 	int ret = -1, fsret = -1;
 	char** new_argv = NULL;
@@ -59,6 +61,7 @@ extern "C" int tebako_main(int* argc, char*** argv) {
 // Ruby build script is designed in such a way that this patch is also applied towards miniruby
 // Just pass through in such case
 		ret = 0;
+		running_miniruby = -1;
 	}
 	else {
 		try {
@@ -149,3 +152,7 @@ extern "C" int tebako_main(int* argc, char*** argv) {
 extern "C" const char* tebako_mount_point(void) {
 	return tebako::fs_mount_point;
 }
+
+extern "C" int tebako_is_running_miniruby(void) {
+	return running_miniruby;
+}

data/tools/ci-scripts/patch-fbthrift.sh

@@ -1,5 +1,5 @@
 #! /bin/bash
-# Copyright (c) 2022, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2022,2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -43,70 +43,17 @@ do_patch_multiline() {
   "$gSed" -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1"
 }
 
-# ....................................................
-# Surprise, surprise ... Upstream project shall found boost libraries for fbthrift
-# https://github.com/facebook/fbthrift/commit/c23af9dee42374d43d2f10e0e07edf1c1c97c328
-
-
 if [[ "$OSTYPE" == "linux-gnu"* || "$OSTYPE" == "linux-musl"* || "$OSTYPE" == "msys" ]]; then
   gSed="sed"
-# shellcheck disable=SC2251
-! IFS= read -r -d '' sbst << EOM
-find_package(OpenSSL REQUIRED)
-# -- Start of tebako patch --
-find_package(Boost 1.65 REQUIRED COMPONENTS filesystem)
-include_directories(\${Boost_INCLUDE_DIRS})
-# -- End of tebako patch --
-EOM
-
 elif [[ "$OSTYPE" == "darwin"* ]]; then
   gSed="gsed"
-
-# shellcheck disable=SC2251
-! IFS= read -r -d '' sbst << EOM
-find_package(OpenSSL REQUIRED)
-# -- Start of tebako patch --
-find_package(Boost 1.65 REQUIRED COMPONENTS filesystem)
-include_directories(\${Boost_INCLUDE_DIRS})
-# Suppress superfluous randlib warnings about \"*.a\" having no symbols on MacOSX.
-set(CMAKE_C_ARCHIVE_CREATE   \"<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>\")
-set(CMAKE_CXX_ARCHIVE_CREATE \"<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>\")
-set(CMAKE_C_ARCHIVE_FINISH   \"<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>\")
-set(CMAKE_CXX_ARCHIVE_FINISH \"<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>\")
-# -- End of tebako patch --
-EOM
-
 else
   echo "Unknown OSTYPE=$OSTYPE"
   exit 1
 fi
 
-restore_and_save "$1/CMakeLists.txt"
-re="find_package(OpenSSL REQUIRED)"
-"$gSed" -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1/CMakeLists.txt"
-
-# GCC 13 compatibility
-# --- thrift/compiler/lib/cpp2/util.cc ---
-re="#include <stdexcept>"
-# shellcheck disable=SC2251
-! IFS= read -r -d '' sbst << EOM
-#include <stdexcept>
-
-\/* -- Start of tebako patch -- *\/
-#include <cstdint>
-\/* -- End of tebako patch -- *\/
-EOM
-
-do_patch_multiline "$1/thrift/compiler/lib/cpp2/util.cc"
-
-
 if [[ "$OSTYPE" == "msys" ]]; then
-  re="if(WIN32)"
-  sbst="if(MSVC) # tebako patched"
-  do_patch "$1/thrift/compiler/CMakeLists.txt" "$re" "$sbst"
-
-  re="ftruncate(file\.fd(), finalBufferSize);"
-  sbst="folly::portability::unistd::ftruncate(file.fd(), finalBufferSize); \/* tebako patched *\/"
+  re="ftruncate(file\.fd(), finalBufferSize),"
+  sbst="folly::portability::unistd::ftruncate(file.fd(), finalBufferSize), \/* tebako patched *\/"
   do_patch "$1/thrift/lib/cpp2/frozen/FrozenUtil.h" "$re" "$sbst"
-
 fi

data/tools/ci-scripts/patch-folly.sh

@@ -1,5 +1,5 @@
 #! /bin/bash
-# Copyright (c) 2022-2023, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2022-2024, [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -41,6 +41,7 @@ restore_and_save() {
 
 do_patch() {
   restore_and_save "$1"
+#  echo "$GNU_SED" -i "s/$2/$3/g" "$1"
   "$GNU_SED" -i "s/$2/$3/g" "$1"
 }
 
@@ -316,15 +317,6 @@ EOM
   sbst=" \/* tebako patched *\/ folly::portability::unistd::lseek(fd,"
   do_patch  "$1/folly/portability/SysUio.cpp" "$re" "$sbst"
 
-# --- folly/portability/Unistd.cpp ---
-  re="(lseek(fd,"
-  sbst="( \/* tebako patched *\/ folly::portability::unistd::lseek(fd,"
-  do_patch  "$1/folly/portability/Unistd.cpp" "$re" "$sbst"
-
-  re="lseek(fd, 0,"
-  sbst=" \/* tebako patched *\/ folly::portability::unistd::lseek(fd, 0,"
-  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/portability/Unistd.cpp"
-
 # --- folly/logging/ImmediateFileWriter.h ---
   re="isatty(file"
   sbst=" \/* tebako patched *\/ folly::portability::unistd::isatty(file"
@@ -402,6 +394,7 @@ EOM
 #ifdef __MINGW32__
   #include <mswsock.h>
   using cmsghdr = WSACMSGHDR;
+  #define CMSG_SPACE WSA_CMSG_SPACE
 #endif
 \/* -- End of tebako patch -- *\/
 
@@ -448,7 +441,55 @@ EOM
   sbst="#if defined(__XROS__) || defined(__MINGW32__) \/* tebako patched *\/"
   "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/system/ThreadName.cpp"
 
+# --- folly/net/NetOps.h ---
+
+  re="#include <WS2tcpip\.h> \/\/ @manual"
+# shellcheck disable=SC2251
+! IFS= read -r -d '' sbst << EOM
+#include <WS2tcpip.h> \/\/ @manual
+
+\/* -- Start of tebako patch -- *\/
+#ifdef __MINGW32__
+  #include <memory>
+  #include <mswsock.h>
+#endif
+\/* -- End of tebako patch -- *\/
+EOM
+  do_patch_multiline  "$1/folly/net/NetOps.h" "$re" "$sbst"
+
+# --- folly/Random.cpp ---
+
+  re="#include <folly\/synchronization\/RelaxedAtomic\.h>"
+# shellcheck disable=SC2251
+! IFS= read -r -d '' sbst << EOM
+#include <folly\/synchronization\/RelaxedAtomic.h>
+
+\/* -- Start of tebako patch -- *\/
+#include <folly\/portability\/Fcntl.h>
+\/* -- End of tebako patch -- *\/
+EOM
+  do_patch_multiline  "$1/folly/Random.cpp" "$re" "$sbst"
+
+# --- folly/Utility.h ---
+  re="T uninit;"
+  sbst="T uninit = 0;  \/* tebako patched *\/"
+  do_patch  "$1/folly/Utility.h" "$re" "$sbst"
+
+# --- folly/experimental/io/AsyncBase.cpp ---
+  re="CHECK_ERR(close(pollFd_));"
+  sbst="CHECK_ERR(folly::portability::unistd::close(pollFd_));  \/* tebako patched *\/"
+  do_patch  "$1/folly/experimental/io/AsyncBase.cpp" "$re" "$sbst"
+
+# --- folly/portability/Unistd.cpp ---
+  re="res = lseek64(fd, offset, whence);"
+  sbst="res = folly::portability::unistd::lseek64(fd, offset, whence); \/* tebako patched *\/ "
+  do_patch  "$1/folly/portability/Unistd.cpp" "$re" "$sbst"
+
+  re="res = lseek(fd, offset, whence);"
+  sbst="res = folly::portability::unistd::lseek(fd, offset, whence); \/* tebako patched *\/ "
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/portability/Unistd.cpp"
 # ---
+
   defined_msc_ver_to_win32 "$1/folly/external/farmhash/farmhash.cpp"
   defined_msc_ver_to_win32 "$1/folly/detail/IPAddressSource.h"
   defined_msc_ver_to_win32 "$1/folly/portability/Sockets.cpp"
@@ -471,5 +512,6 @@ EOM
 # while gettimeofday is provided by MSys, the other two functions are lost
   defined_n_win32_to_msc_ver "$1/folly/portability/SysTime.h"
   defined_win32_to_msc_ver "$1/folly/portability/SysTime.cpp"
+  defined_win32_to_msc_ver "$1/folly/lang/Exception.cpp"
 
 fi

data/version.txt

@@ -1 +1 @@
-0.6.0
+0.6.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-01 00:00:00.000000000 Z
+date: 2024-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -70,6 +70,7 @@ files:
 - lib/tebako/packager.rb
 - lib/tebako/packager/pass1.rb
 - lib/tebako/packager/pass2.rb
+- lib/tebako/packager/patch_buildsystem.rb
 - lib/tebako/packager/patch_helpers.rb
 - lib/tebako/packager/patch_libraries.rb
 - lib/tebako/packager/patch_literals.rb