tebako 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d02ef72aa920ed26d95b18dce3f2b0dc60aa66633d83876fd03e0da9161d5cf
-  data.tar.gz: c1524406708fe09d25a800537af70f0df315ece0e41e9a6146739d201680fe2e
+  metadata.gz: a0c260fa919b77603c20cc5db12e51595c0a0fd0da649dd6f64d2022bebc50dc
+  data.tar.gz: 1bd24a7fa0d74fb44b95f0b5f41f736323553725741327b130cfadc36cb45cb6
 SHA512:
-  metadata.gz: 751def113919ecca7b08900b246042b76942af841d40fb3db41da7bb7926ac30ce6c107b43864a3c2fca4ac1abdb0a700d99977e1562fa0405022cb6e6f09caf
-  data.tar.gz: 9a3c9d1d09f4e7c7704e093926f63b629ad62bc34e9f5ed505af03dc6697072a4b26decb77bdc46c9f5723ec9fd831c73dadb1afcabd5449cae13cc37636e33e
+  metadata.gz: 145fe0a5fe1cb275c21db9e9d4b9092e7c7b342ee43e232d1a6e61a5bc606c62329c9a6a0082843a8b7c017667fda09317c1faa2f3371687e5e64c4a49a176b2
+  data.tar.gz: 4708ff850fc763b41d7e1d8e84bee81d4c6a17f1653ac6f697f39e7146fe8acb60ca7922ac1ff7693086fae3f5216d82d83bd1cb97b596c9607769ce022c00f0

data/CMakeLists.txt

@@ -235,11 +235,11 @@ endif(DWARFS_PRELOAD)
 # Filesystem locations
 
 # DATA_SRC_DIR folder is used to collect all files that need to be packaged
-set(DATA_SRC_DIR  ${CMAKE_CURRENT_BINARY_DIR}/source_filesystem)
+set(DATA_SRC_DIR  ${CMAKE_CURRENT_BINARY_DIR}/s)
 # DATA_PRE_DIR folder is used to build gems  that need to be packaged
-set(DATA_PRE_DIR  ${CMAKE_CURRENT_BINARY_DIR}/prepare_filesystem)
+set(DATA_PRE_DIR  ${CMAKE_CURRENT_BINARY_DIR}/r)
 # DATA_BIN_DIR folder is used to create packaged filesystem
-set(DATA_BIN_DIR  ${CMAKE_CURRENT_BINARY_DIR}/packaged_filesystem)
+set(DATA_BIN_DIR  ${CMAKE_CURRENT_BINARY_DIR}/p)
 # DATA_BIN_FILE is packaged filesystem itself
 set(DATA_BIN_FILE ${DATA_BIN_DIR}/fs.bin)
 # Target binary directory
@@ -360,7 +360,7 @@ else(IS_DARWIN)
 
   if(RB_W32)
     string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -DRB_W32=1")
-    string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -L${TLIBD}")
+    string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -l:libstdc++.a -L${TLIBD}")
   endif(RB_W32)
 endif(IS_DARWIN)
 
@@ -388,6 +388,7 @@ ExternalProject_Add(${RUBY_PRJ}
                                                         --prefix=${DATA_SRC_DIR}              \
                                                         ${C_FLAGS_DEST}=\"${RUBY_C_FLAGS}\"   \
                                                         LDFLAGS=\"${RUBY_L_FLAGS}\""
+  COMMAND          ruby ${EXE}/tebako-packager pass1a ${RUBY_SOURCE_DIR}
   BUILD_COMMAND    make ${RUBY_MAKEFILE} -j${NCORES}
   INSTALL_COMMAND  make ${RUBY_MAKEFILE} install
   COMMAND          ${GNU_BASH} -c "ruby ${EXE}/tebako-packager pass2 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${DEPS_LIB_DIR} ${DATA_SRC_DIR} ${RUBY_STASH_DIR} ${RUBY_VER}"
@@ -432,27 +433,31 @@ else (${SETUP_MODE})
         message("Collecting gem from gemspec ${GEMSPEC} and Gemfile")
         set(FS_ENTRY_POINT "/bin/${FS_ENTRANCE}")
         add_custom_target(source_filesystem
-           COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${FS_ROOT} -DTARGET_DIR=${DATA_PRE_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/copy_dir.cmake
-           COMMAND ${CMAKE_COMMAND} -E make_directory ${TGD}
-           COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                       ${TBD}/bundle${BAT_SUFFIX} config set --local force_ruby_platform ${FORCE_RUBY_PLATFORM}
-           COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E  env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                       ${TBD}/bundle${BAT_SUFFIX} install
-           COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                       ${TBD}/bundle${BAT_SUFFIX} exec ${TBD}/gem${CMD_SUFFIX} build ${GEMSPEC}
-           COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                       ${TBD}/gem${CMD_SUFFIX} install *.gem --verbose --no-document --install-dir ${TGD}
-           COMMAND test -f  ${DATA_SRC_DIR}${FS_ENTRY_POINT} ||
+          COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${FS_ROOT} -DTARGET_DIR=${DATA_PRE_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/copy_dir.cmake
+          COMMAND ${CMAKE_COMMAND} -E make_directory ${TGD}
+          COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
+                                      ${TBD}/bundle${BAT_SUFFIX} config set --local build.ffi --disable-system-libffi
+          COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
+                                      ${TBD}/bundle${BAT_SUFFIX} config set --local build.nokogiri --use-system-libraries
+          COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
+                                      ${TBD}/bundle${BAT_SUFFIX} config set --local force_ruby_platform ${FORCE_RUBY_PLATFORM}
+          COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E  env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
+                                      ${TBD}/bundle${BAT_SUFFIX} install
+          COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
+                                      ${TBD}/bundle${BAT_SUFFIX} exec ${TBD}/gem${CMD_SUFFIX} build ${GEMSPEC}
+          COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
+                                      ${TBD}/gem${CMD_SUFFIX} install *.gem --verbose --no-document --install-dir ${TGD}
+          COMMAND test -f  ${DATA_SRC_DIR}${FS_ENTRY_POINT} ||
                    (${CMAKE_COMMAND} -E echo "Entry point ${DATA_SRC_DIR}${FS_ENTRY_POINT} does not exist" &&
                     ${CMAKE_COMMAND} -E false )
-           DEPENDS clean_filesystem
+          DEPENDS clean_filesystem
         )
       else(GFLENGTH GREATER 0)
 #  Found xxx.gemspec but no Gemfile
-         message("Collecting gem from gemspec ${GEMSPEC}")
-         set(FS_ENTRY_POINT "/bin/${FS_ENTRANCE}")
-         message("Target entry point will be at ${FS_MOUNT_POINT}${FS_ENTRY_POINT}")
-         add_custom_target(source_filesystem
+        message("Collecting gem from gemspec ${GEMSPEC}")
+        set(FS_ENTRY_POINT "/bin/${FS_ENTRANCE}")
+        message("Target entry point will be at ${FS_MOUNT_POINT}${FS_ENTRY_POINT}")
+        add_custom_target(source_filesystem
             COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${FS_ROOT} -DTARGET_DIR=${DATA_PRE_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/copy_dir.cmake
             COMMAND ${CMAKE_COMMAND} -E make_directory ${TGD}
             COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
@@ -478,7 +483,9 @@ else (${SETUP_MODE})
        COMMAND ${CMAKE_COMMAND} -E make_directory ${TLD}
        COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${FS_ROOT} -DTARGET_DIR=${TLD} -P ${CMAKE_SOURCE_DIR}/cmake/copy_dir.cmake
        COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                           ${TBD}/bundle${BAT_SUFFIX} config build.ffi --disable-system-libffi
+                                           ${TBD}/bundle${BAT_SUFFIX} config set --local build.ffi --disable-system-libffi
+        COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
+                                           ${TBD}/bundle${BAT_SUFFIX} config set --local build.nokogiri --use-system-libraries
        COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
                                            ${TBD}/bundle${BAT_SUFFIX} config set --local force_ruby_platform ${FORCE_RUBY_PLATFORM}
        COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
@@ -543,22 +550,7 @@ else (${SETUP_MODE})
   )
 
   add_custom_target(packaged_filesystem
-# [TODO] Open question - whether we shall delete ruby binaries from memfs or not
-#        For debugging purposes it is very handy to have it here
-#
-    COMMAND ${CMAKE_COMMAND} -E rm -rf  ${DATA_SRC_DIR}/share  ${DATA_SRC_DIR}/include   ${DATA_SRC_DIR}/lib/pkgconfig
-                                        ${DATA_SRC_DIR}/bin/bundle${CMD_SUFFIX}  ${DATA_SRC_DIR}/bin/bundle
-                                        ${DATA_SRC_DIR}/bin/bundler${CMD_SUFFIX} ${DATA_SRC_DIR}/bin/bundler
-                                        ${DATA_SRC_DIR}/bin/bundle${BAT_SUFFIX}  ${DATA_SRC_DIR}/bin/bundler${BAT_SUFFIX}
-                                        ${DATA_SRC_DIR}/bin/erb${CMD_SUFFIX}     ${DATA_SRC_DIR}/bin/gem${CMD_SUFFIX}
-                                        ${DATA_SRC_DIR}/bin/irb${CMD_SUFFIX}     ${DATA_SRC_DIR}/bin/racc${CMD_SUFFIX}
-                                        ${DATA_SRC_DIR}/bin/racc2y${CMD_SUFFIX}  ${DATA_SRC_DIR}/bin/rake${BAT_SUFFIX}
-                                        ${DATA_SRC_DIR}/bin/rake                 ${DATA_SRC_DIR}/bin/rdoc${CMD_SUFFIX}
-                                        ${DATA_SRC_DIR}/bin/ri${CMD_SUFFIX}      ${DATA_SRC_DIR}/bin/y2racc${CMD_SUFFIX}
-                                        ${DATA_SRC_DIR}/bin/ruby${EXE_SUFFIX}    ${DATA_SRC_DIR}/bin/ruby${RUBY_SUFFIX}${EXE_SUFFIX}
-
-    COMMAND ${GNU_BASH} -c "rm -f ${DATA_SRC_DIR}/**/*.a"
-    COMMAND ${GNU_BASH} -c "rm -f ${DATA_SRC_DIR}/**/*.o"
+    COMMAND ruby ${EXE}/tebako-packager strip ${OSTYPE_TXT} ${DATA_SRC_DIR}
     COMMAND ${GNU_BASH} -c "chmod +x ${DEPS_BIN_DIR}/mkdwarfs${EXE_SUFFIX}"
     # 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

data/README.adoc

@@ -46,7 +46,7 @@ The Tebako packager supports the following versions of Ruby for packaging:
 
 * 2.7.8 (Linux, MacOS)
 * 3.0.7 (Linux, MacOS)
-* 3.1.4, 3.1.5 (Linux, MacOS, Windows)
+* 3.1.4, 3.1.5, 3.1.6 (Linux, MacOS, Windows)
 * 3.2.3, 3.2.4 (Linux, MacOS, Windows)
 
 Support of specific version including minor release requires some effort, sometimes extensive
@@ -128,10 +128,9 @@ 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
 ----
 
-=== Windows (2019, 2022)
+=== Windows (workstation 10, 11; Server 2019, 2022)
 
 The simplest approach is to use Ruby development environment provided by RubyInstaller, for example Ruby+Devkit 3.1.4-1.
-
 Once it is installed use the following commands:
 
 [source,sh]
@@ -142,6 +141,11 @@ Once it is installed use the following commands:
             fmt glog dlfcn gtest autotools ncurses libyaml
 ----
 
+Please note that on Windows tebako may face issues related by CMake path length limitations.
+(https://gitlab.kitware.com/cmake/cmake/-/issues/25936)
+This error may affect not tebako itself but the gems that need to be package and use CMake to build native extensions.
+There is no workaround for this issue as it lloks like is a limitation of the manifest used to build CMake executable.
+
 == Installation
 
 === General
@@ -275,7 +279,7 @@ based on ```tebako setup``` output. Building cache based on ```tebako press``` m
 ----
 tebako setup     \
   [-p |--prefix=<tebako-root-folder>] \
-  [-R |--Ruby=<2.7.8|3.0.7|3.1.4|3.1.5|3.2.3|3.2.4>]
+  [-R |--Ruby=<2.7.8|3.0.7|3.1.4|3.1.5|3.1.6|3.2.3|3.2.4>]
 ----
 
 Where:
@@ -283,7 +287,7 @@ Where:
 * `<tebako-root-folder>`, the Tebako setup folder (optional, defaults to current
 folder)
 
-* `Ruby` parameter defines Ruby version that will be packaged (optional, defaults to 3.1.5)
+* `Ruby` parameter defines Ruby version that will be packaged (optional, defaults to 3.1.6)
 
 ==== Clean
 

data/common.env

@@ -2,4 +2,4 @@ BUILD_TYPE=Release
 DEPS=deps
 INCBIN_TAG=348e36b
 DWARFS_WR_TAG=v0.5.2
-RUBY_VER=3.1.5
+RUBY_VER=3.1.6

data/exe/tebako-packager

@@ -27,6 +27,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 require_relative "../lib/tebako/packager"
+require_relative "../lib/tebako/stripper"
 
 begin
   unless ARGV.length.positive?
@@ -57,6 +58,24 @@ begin
     end
 
     Tebako::Packager.stash(ARGV[1], ARGV[2])
+  when "strip"
+    #       ARGV[0] -- command
+    #       ARGV[1] -- OSTYPE
+    #       ARGV[2] -- DATA_SRC_DIR
+    unless ARGV.length == 3
+      raise Tebako::Error,
+            "tebako-packager strip command expects 3 arguments, #{ARGV.length} has been provided."
+    end
+
+    Tebako::Stripper.strip(ARGV[1], ARGV[2])
+  when "pass1a"
+    #       ARGV[0] -- command
+    #       ARGV[1] -- RUBY_SOURCE_DIR
+    unless ARGV.length == 2
+      raise Tebako::Error,
+            "tebako-packager pass1a command expects 2 arguments, #{ARGV.length} has been provided."
+    end
+    Tebako::Packager.pass1a(ARGV[1])
   when "pass2"
     #       ARGV[0] -- command
     #       ARGV[1] -- OSTYPE

data/lib/tebako/cli_helpers.rb

@@ -99,7 +99,7 @@ module Tebako
     # rubocop:enable Metrics/MethodLength
 
     def output
-      @output ||= File.join(prefix, "output")
+      @output ||= File.join(prefix, "o")
     end
 
     def package

data/lib/tebako/cli_rubies.rb

@@ -42,11 +42,13 @@ module Tebako
       "3.0.7" => "2a3411977f2850431136b0fab8ad53af09fb74df2ee2f4fb7f11b378fe034388",
       "3.1.4" => "a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6",
       "3.1.5" => "3685c51eeee1352c31ea039706d71976f53d00ab6d77312de6aa1abaf5cda2c5",
+      "3.1.6" => "0d0dafb859e76763432571a3109d1537d976266be3083445651dc68deed25c22",
       "3.2.3" => "af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba",
       "3.2.4" => "c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692"
+      # "3.3.3" => "83c05b2177ee9c335b631b29b8c077b4770166d02fa527f3a9f6a40d13f3cce2"
     }.freeze
 
-    DEFAULT_RUBY_VERSION = "3.1.5"
+    DEFAULT_RUBY_VERSION = "3.1.6"
 
     def version_check(version)
       return if RUBY_VERSIONS.key?(version)

data/lib/tebako/packager/pass1.rb

@@ -150,7 +150,7 @@ module Tebako
             # 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)
+            # 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
 

data/lib/tebako/packager/pass1a.rb

@@ -0,0 +1,46 @@
+# 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_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
+      end
+    end
+  end
+end

data/lib/tebako/packager/pass2.rb

@@ -58,7 +58,7 @@ module Tebako
 
         def get_dir_c_patch(ostype)
           pattern = PatchHelpers.msys?(ostype) ? "/* define system APIs */" : "#ifdef HAVE_GETATTRLIST"
-          dir_c_patch = PatchHelpers.patch_c_file(pattern)
+          dir_c_patch = PatchHelpers.patch_c_file_pre(pattern)
           dir_c_patch.merge!(DIR_C_BASE_PATCH)
           dir_c_patch
         end
@@ -85,11 +85,19 @@ module Tebako
         end
 
         def get_io_c_patch(ostype, ruby_ver)
-          io_c_patch = PatchHelpers.patch_c_file("/* define system APIs */")
+          io_c_patch = PatchHelpers.patch_c_file_pre("/* define system APIs */")
           io_c_patch.merge!(get_io_c_msys_patch(ruby_ver)) if PatchHelpers.msys?(ostype)
           io_c_patch
         end
 
+        def get_util_c_patch(ruby_ver)
+          if PatchHelpers.ruby316?(ruby_ver)
+            PatchHelpers.patch_c_file_post("#endif /* !HAVE_GNU_QSORT_R */")
+          else
+            PatchHelpers.patch_c_file_pre("#ifndef S_ISDIR")
+          end
+        end
+
         def get_msys_mkconfig_rb_patches(ruby_ver)
           {
             "    if fast[name]" => TOOLS_MKCONFIG_RB_SUBST,
@@ -115,11 +123,10 @@ module Tebako
           {
             "template/Makefile.in" => template_makefile_in_patch(ostype, deps_lib_dir, ruby_ver),
             "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, 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")
+            "file.c" => PatchHelpers.patch_c_file_pre("/* define system APIs */"),
+            "util.c" => get_util_c_patch(ruby_ver)
           }
         end
 

data/lib/tebako/packager/patch_helpers.rb

@@ -40,6 +40,7 @@ module Tebako
           puts "   ... patching #{fname}"
           restore_and_save(fname)
           contents = File.read(fname)
+
           mapping.each { |pattern, subst| contents.sub!(pattern, subst) }
           File.open(fname, "w") { |file| file << contents }
         end
@@ -65,12 +66,18 @@ module Tebako
           ostype =~ /msys|cygwin|mingw/
         end
 
-        def patch_c_file(pattern)
+        def patch_c_file_pre(pattern)
           {
             pattern => "#{PatchLiterals::C_FILE_SUBST}\n#{pattern}"
           }
         end
 
+        def patch_c_file_post(pattern)
+          {
+            pattern => "#{pattern}\n\n#{PatchLiterals::C_FILE_SUBST}"
+          }
+        end
+
         def recreate(dirname)
           FileUtils.rm_rf(dirname, noop: nil, verbose: nil, secure: true)
           FileUtils.mkdir(dirname)
@@ -101,12 +108,16 @@ module Tebako
           ruby3x?(ruby_ver) && ruby_ver[2].to_i >= 1
         end
 
+        def ruby316?(ruby_ver)
+          ruby3x?(ruby_ver) && ruby_ver[2] == "1" && ruby_ver[4].to_i >= 6
+        end
+
         def ruby32?(ruby_ver)
           ruby3x?(ruby_ver) && ruby_ver[2].to_i >= 2
         end
 
         def ruby32only?(ruby_ver)
-          ruby3x?(ruby_ver) && ruby_ver[2].to_i == 2
+          ruby3x?(ruby_ver) && ruby_ver[2] == "2"
         end
 
         def ruby33?(ruby_ver)

data/lib/tebako/packager.rb

@@ -29,6 +29,7 @@ require "fileutils"
 
 require_relative "error"
 require_relative "packager/pass1"
+require_relative "packager/pass1a"
 require_relative "packager/pass2"
 require_relative "packager/patch_helpers"
 
@@ -73,11 +74,8 @@ module Tebako
     class << self
       # Create implib
       def create_implib(src_dir, package_src_dir, app_name, ruby_ver)
+        create_def(src_dir, app_name)
         puts "   ... creating Windows import library"
-        File.open(def_fname(src_dir, app_name), "w") do |file|
-          file.puts "LIBRARY #{out_fname(app_name)}"
-          file.puts File.read(File.join(src_dir, "tebako.def"))
-        end
         params = ["dlltool", "-d", def_fname(src_dir, app_name), "-D", out_fname(app_name),
                   "--output-lib", lib_fname(package_src_dir, ruby_ver)]
         out, st = Open3.capture2e(*params)
@@ -111,13 +109,21 @@ module Tebako
         PatchHelpers.recreate(src_dir)
         do_patch(Pass1.get_patch_map(ostype, mount_point, ruby_ver), ruby_source_dir)
 
-        # Roll back pass2 patches
+        # Roll back pass1a, pass2 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/
       end
 
+      # Pass1A
+      # Patch gem_prelude.rb
+      def pass1a(ruby_source_dir)
+        puts "-- Running pass1a script"
+
+        do_patch(Pass1A.get_patch_map, ruby_source_dir)
+      end
+
       # Pass2
       # Creates packaging environment, patching ensures that tebako package is linked statically
       def pass2(ostype, ruby_source_dir, deps_lib_dir, ruby_ver)
@@ -146,6 +152,16 @@ module Tebako
 
       private
 
+      def create_def(src_dir, app_name)
+        puts "   ... creating Windows def file"
+        File.open(def_fname(src_dir, app_name), "w") do |file|
+          file.puts "LIBRARY #{out_fname(app_name)}"
+          File.readlines(File.join(src_dir, "tebako.def")).each do |line|
+            file.puts line unless line.include?("DllMain")
+          end
+        end
+      end
+
       def def_fname(src_dir, app_name)
         File.join(src_dir, "#{app_name}.def")
       end

data/lib/tebako/stripper.rb

@@ -0,0 +1,94 @@
+# 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 "find"
+
+# Tebako - an executable packager
+module Tebako
+  # Tebako packaging support (stripper)
+  module Stripper
+    DELETE_EXTENSIONS = %w[o lo obj a lib].freeze
+    STRIP_EXTENSIONS = %w[dll so].freeze
+    BIN_FILES = %w[
+      bundle bundler rbs erb gem irb racc racc2y rake rdoc ri y2racc rdbg typeprof
+    ].freeze
+    CMD_SUFFIX = ".cmd"
+    BAT_SUFFIX = ".bat"
+
+    class << self
+      # Strip
+      # Removes build artefacts, strip shared objects
+      # [TODO] We probably need debug option/flag to say whether we shall delete ruby binaries
+      #        from memfs or not. For debugging purposes it is very handy to have it here
+      def strip(ostype, src_dir)
+        puts "   ... stripping the output"
+        strip_bs(ostype, src_dir)
+        strip_fi(ostype, src_dir)
+        strip_li(ostype, src_dir)
+      end
+
+      private
+
+      def get_files(ostype)
+        exe_suffix = ostype =~ /msys/ ? ".exe" : ""
+        files = BIN_FILES.flat_map do |f|
+          [f, "#{f}#{CMD_SUFFIX}", "#{f}#{BAT_SUFFIX}"]
+        end
+
+        files += ["ruby#{exe_suffix}", "rubyw#{exe_suffix}"]
+        files
+      end
+
+      def strip_bs(_ostype, src_dir)
+        FileUtils.rm_rf([
+                          File.join(src_dir, "share"),
+                          File.join(src_dir, "include"),
+                          File.join(src_dir, "lib", "pkgconfig")
+                        ])
+      end
+
+      def strip_fi(ostype, src_dir)
+        files = get_files(ostype).map { |f| "#{src_dir}/bin/#{f}" }
+        FileUtils.rm(files, force: true)
+      end
+
+      def strip_li(ostype, src_dir)
+        Find.find(src_dir) do |file|
+          next if File.directory?(file)
+
+          extension = File.extname(file).delete_prefix(".").downcase
+          if DELETE_EXTENSIONS.include?(extension)
+            FileUtils.rm(file)
+          elsif STRIP_EXTENSIONS.include?(extension)
+            system("strip \"#{file}\"") unless ostype =~ /darwin/
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tebako/version.rb

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

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.5
+0.7.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -69,11 +69,13 @@ files:
 - lib/tebako/error.rb
 - lib/tebako/packager.rb
 - lib/tebako/packager/pass1.rb
+- lib/tebako/packager/pass1a.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
+- lib/tebako/stripper.rb
 - lib/tebako/version.rb
 - resources/tebako-fs.cpp.in
 - resources/tebako-version.h.in
@@ -135,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Packager for Ruby executables