tebako 0.6.6 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 484389b525402e736d81e83df4bc8613128bf5d830d9b2756b033feaaee09fce
-  data.tar.gz: bc863fa069c014e02f887ebeac297a4036157afdab0ea0a480a406864e6c3769
+  metadata.gz: edab24288967cc4085b927ef069adab649b24282a6cc320a595bc2b20cb636e9
+  data.tar.gz: 7964a2bcf62cf28d4cd34ee1f1744afe21980e934a4fa1a649f0b854b15b1ca3
 SHA512:
-  metadata.gz: 84d6926fecec65501e49d2e045b64431dcdef9aa8afa395ce498f0c08bffc7625900d7f2119193849d0a972400e109bab507b62dfef5abab536d32a8c2b51370
-  data.tar.gz: 7ad876c67e9963eae634f7436f1db236c712bd1652cd7fa69318d160cf7a5254b39d9a6ba4822c5ac2f5783fc8d913dfb9251413d81721a9c251de6072652e02
+  metadata.gz: 1a77dc3a2c810aad7597cab4a3d5a8f3c6378d2f9313e129edf17097700a0210eb9008b73bb5402921af53e5cccf450602865b4cc1518e5f8a2fd0e34e15163c
+  data.tar.gz: 40b417b5bb8e13e40618015d04f5f3c085bc08325d798bba5fb1cf6c43c0e44daef392755473f2110cb21c95134dcee24c6559933226eee0f41a5f9fc074d602

data/CMakeLists.txt

@@ -117,6 +117,7 @@ set(IS_MSYS OFF)
 set(IS_DARWIN OFF)
 set(RB_W32 OFF)
 set(FORCE_RUBY_PLATFORM "false")
+set(NOKOGIRI_OPTION "--no-use-system-libraries")
 set(RUBY_WITHOUT_EXT "dbm,win32,win32ole")
 set(RUBY_NAME "ruby")
 set(RUBY_SUFFIX "")
@@ -132,6 +133,7 @@ if("${OSTYPE_TXT}" MATCHES "^linux-musl.*")
 elseif("${OSTYPE_TXT}" MATCHES "^msys*")
   set(IS_MSYS ON)
   set(FORCE_RUBY_PLATFORM "true")
+  set(NOKOGIRI_OPTION "--use-system-libraries")
   # set(DWARFS_PRELOAD ON)
   set(RB_W32 ON)
   set(RUBY_WITHOUT_EXT "dbm,syslog,pty,gdbm,readline")
@@ -235,11 +237,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
@@ -368,6 +370,7 @@ message(STATUS "Ruby build ${C_FLAGS_DEST}='${RUBY_C_FLAGS}'")
 message(STATUS "Ruby build LDFLAGS='${RUBY_L_FLAGS}'")
 message(STATUS "openssl Ruby option='${OPENSSL_RUBY_OPTION}'")
 message(STATUS "libyaml Ruby option='${LIBYAML_RUBY_OPTION}'")
+message(STATUS "nokogiri build option='${NOKOGIRI_OPTION}'")
 
 ExternalProject_Add(${RUBY_PRJ}
   PREFIX ${DEPS}
@@ -433,27 +436,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 ${NOKOGIRI_OPTION}
+          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
@@ -476,14 +483,16 @@ else (${SETUP_MODE})
        COMMAND test -f ${FS_ROOT}/${FS_ENTRANCE} ||
                   (${CMAKE_COMMAND} -E echo "Entry point ${FS_ROOT}/${FS_ENTRANCE} does not exist or is not accessible" &&
                    ${CMAKE_COMMAND} -E false )
-       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
-       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
-                                           ${TBD}/bundle${BAT_SUFFIX} install --jobs=${NCORES}
+        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 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 ${NOKOGIRI_OPTION}
+        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
+                                          ${TBD}/bundle${BAT_SUFFIX} install --jobs=${NCORES}
 #       COMMAND_EXPAND_LISTS
 # [TODO] Open question - how to deploy a project to source filesystem
 #        ruby packer does bundle install --deployment --binstubs
@@ -544,22 +553,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
@@ -119,7 +119,7 @@ apk --no-cache --upgrade add build-base cmake git bash autoconf boost-static   \
    brotli-static jemalloc-dev fmt-dev xz-static
 ----
 
-=== macOS 12 (Monterey)
+=== macOS 12 (Monterey) through macOS 14 (Sonoma)
 
 [source,sh]
 ----
@@ -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
@@ -207,6 +211,23 @@ gem install tebako
 gem install tebako
 ----
 
+=== Tebako Root Folder (aka Prefix) Selection
+
+The prefix in Tebako determines the base directory for the Tebako setup. It is an essential part of configuring how Tebako operates within your system.
+The selection of the prefix follows a specific order of precedence to ensure flexibility and ease of use:
+
+. *User-Specified Prefix*: The most direct way to set the root folder is by specifying it through an option. This can be done via command-line argument.
+
+. *Current Working Directory (PWD)*: If the prefix option is explicitly set to "PWD", Tebako uses the current working directory as Tebako root folder.
+
+. *Environment Variable (TEBAKO_PREFIX)*: In the absence of a user-specified option, Tebako looks for an environment variable named `TEBAKO_PREFIX`. If found, its value is used as the root folder.
+
+. *Default Value*: If no prefix is specified and the `TEBAKO_DIR` environment variable is not set, Tebako defaults to using a directory named `.tebako` in the user's home directory.
+
+
+Path Expansion: Regardless of the method used to set the prefix, Tebako expands the provided path to an absolute path. This expansion includes resolving relative paths based on the current working
+directory and expanding user directory shortcuts like `~`.
+
 ==== Press
 
 This command "presses" a Ruby project using the Tebako setup from the Tebako root
@@ -223,7 +244,7 @@ cmmands below.
 ----
 tebako press     \
   [-p|--prefix=<tebako-root-folder>] \
-  [-R|--Ruby=<2.7.8|3.0.6|3.1.4|3.2.3>]   \
+  [-R|--Ruby=<2.7.8|3.0.7|3.1.4|3.1.5|3.1.6|3.2.3|3.2.4>]   \
   -r|--root=<project-root-folder>     \
   -e|--entry-point=<entry-point>      \
   [-o|--output=<packaged file name>] \
@@ -232,10 +253,9 @@ tebako press     \
 
 Where:
 
-* `<tebako-root-folder>`, the Tebako setup folder (optional, defaults to current
-folder)
+* `<tebako-root-folder>`, the Tebako root folder (see details in the Tebako Root Folder Selection section)
 
-* `Ruby` parameter defines Ruby version that will be packaged (optional, defaults to 3.1.4)
+* `Ruby` parameter defines Ruby version that will be packaged (optional, defaults to 3.1.6)
 
 * `<project-root>`, a folder at the host source file system where project files
 are located
@@ -275,15 +295,14 @@ 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:
 
-* `<tebako-root-folder>`, the Tebako setup folder (optional, defaults to current
-folder)
+* `<tebako-root-folder>`, the Tebako root folder (see details in the Tebako Root Folder Selection section)
 
-* `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
 
@@ -298,8 +317,7 @@ tebako clean \
 
 Where:
 
-* `<tebako-root-folder>`, the Tebako setup folder (optional, defaults to current
-folder)
+* `<tebako-root-folder>`, the Tebako root folder (see details in the Tebako Root Folder Selection section)
 
 [example]
 ====
@@ -318,7 +336,7 @@ Normally you do not need to do it since tebako packager optimizes artifacts life
 ----
 tebako clean_ruby
   [-p|--prefix=<tebako-root-folder>]
-  [-R|--Ruby=<2.7.8|3.0.6|3.1.4|3.2.3>]
+  [-R|--Ruby=<2.7.8|3.0.7|3.1.4|3.1.5|3.1.6|3.2.3|3.2.4>]
 ----
 
 Where:

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,16 @@ 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

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
@@ -115,10 +115,20 @@ module Tebako
                    end
     end
 
+    def handle_nil_prefix
+      env_prefix = ENV.fetch("TEBAKO_PREFIX", nil)
+      if env_prefix.nil?
+        puts "No prefix specified, using ~/.tebako"
+        File.expand_path("~/.tebako")
+      else
+        puts "Using TEBAKO_PREFIX environment variable as prefix"
+        File.expand_path(env_prefix)
+      end
+    end
+
     def prefix
       @prefix ||= if options["prefix"].nil?
-                    puts "No prefix specified, using ~/.tebako"
-                    File.expand_path("~/.tebako")
+                    handle_nil_prefix
                   elsif options["prefix"] == "PWD"
                     Dir.pwd
                   else

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/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,
@@ -117,8 +125,8 @@ module Tebako
             "tool/mkconfig.rb" => mcrb_subst,
             "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

@@ -66,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)
@@ -102,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

@@ -74,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)
@@ -155,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.6"
+  VERSION = "0.7.1"
 end

data/version.txt

@@ -1 +1 @@
-0.6.6
+0.7.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-03 00:00:00.000000000 Z
+date: 2024-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -75,6 +75,7 @@ files:
 - 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
@@ -136,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