tebako 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 573cd1ec24b37fafbebc82a0a8a11a4a1c05e22b6feeba1af89dc8670923c5e2
-  data.tar.gz: 03d3c8f200d209a6b419960f76f499c4ccad0a0b726cf8ba85a780fb6c6d3aa4
+  metadata.gz: 22aea474f49445f022530cf4cc3c16c2bce29da88bb1c3bc0c4d0a64838676a8
+  data.tar.gz: 3f3efc915bcde108bdd14b6f21946cf6c2e20edc7d48e2703db54f9ea9ed5dfb
 SHA512:
-  metadata.gz: 5a362b80444f6288964158034d58fd4e86749127f173d0f4d30445790d4a86481467b3b82e75a4d7398729633bdb537f0f146ff168d5893db57f155d0d16776c
-  data.tar.gz: 3da8e9e840d4bbf72f28c6b4e3b4c75bcdc076da51c000ef2e9a2d63121b8a694154be279d787694ee9728961e045a98e4f919740112c36579104b7d3565291e
+  metadata.gz: 78be29f984b8505a537327970820f91151411dde2fd0bbb6d760741cd373e61324d1b225ca2e1792f22f53b32a52ad0b3bcfa8c23ec7ede3df221c6435d8cb45
+  data.tar.gz: 13f0505477b14079016a48c83f44da433dcabf1858ea99ae2e8ab3892d7231493d5d46f02defdf57908ad5b652c6b8713d5ef0129b25ae979798bc549e3442f7

data/CMakeLists.txt

@@ -73,8 +73,6 @@ include(${CMAKE_SOURCE_DIR}/tools/cmake-scripts/macos-environment.cmake)
 include(${CMAKE_SOURCE_DIR}/tools/cmake-scripts/msys-environment.cmake)
 include(${CMAKE_SOURCE_DIR}/tools/cmake-scripts/def-external-project.cmake)
 
-include(${CMAKE_SOURCE_DIR}/cmake/def_tty_colours.cmake)
-
 option(SETUP_MODE "Tebako setup" OFF)
 if(NOT LOG_LEVEL)
   set(LOG_LEVEL "error")
@@ -85,7 +83,7 @@ set(START_WITH_PACKAGED_FILESYSTEM OFF CACHE BOOL "Start workflow from 'packaged
 if (NOT ${SETUP_MODE})
   message("Running tebako press script")
   if (${START_WITH_PACKAGED_FILESYSTEM})
-    message("${ColourBoldRed}*** Starting workflow from 'packaged filesystem' target ***${ColourReset}")
+    message("*** Starting workflow from 'packaged filesystem' target ***")
   endif(${START_WITH_PACKAGED_FILESYSTEM})
 
   if ("-${ROOT}" STREQUAL "-")
@@ -174,9 +172,37 @@ elseif("${OSTYPE_TXT}" MATCHES "^msys*")
   set(RUBY_MAKEFILE "--file=GNUmakefile")
 elseif("${OSTYPE_TXT}" MATCHES "^darwin.*")
   set(IS_DARWIN ON)
-  set(BUILD_OPENSSL_ROOT_DIR "${BUILD_BREW_PREFIX}/opt/openssl@1.1")
+  if(${RUBY_VER} VERSION_LESS "3.1.0")
+    set(OPENSSL_VER "1.1")
+  else(${RUBY_VER} VERSION_LESS "3.1.0")
+    set(OPENSSL_VER "3")
+  endif(${RUBY_VER} VERSION_LESS "3.1.0")
+  set(BUILD_OPENSSL_ROOT_DIR "${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")
 endif()
 
+if(IS_DARWIN)
+  execute_process(
+    COMMAND "sysctl" "-n" "hw.ncpu"
+    RESULT_VARIABLE NCORES_RES
+    OUTPUT_VARIABLE NCORES
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+else(IS_DARWIN)
+  execute_process(
+    COMMAND "nproc" "--all"
+    RESULT_VARIABLE NCORES_RES
+    OUTPUT_VARIABLE NCORES
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+endif(IS_DARWIN)
+
+if(NCORES_RES EQUAL 0)
+  message(STATUS "NCORES: ${NCORES}")
+else(NCORES_RES EQUAL 0)
+  set(NCORES 4)
+  message(WARNING "Failed to detect NCORES, resetting to ${NCORES} (default)")
+endif(NCORES_RES EQUAL 0)
+
 # Various locations for external projects
 set(DEPS ${CMAKE_CURRENT_SOURCE_DIR}/deps CACHE STRING "Dependencies' folder'")
 set(DEPS_INCLUDE_DIR ${DEPS}/include)
@@ -217,7 +243,7 @@ if(IS_MSYS)
 endif(IS_MSYS)
 
 def_ext_prj_g(INCBIN "348e36b")
-def_ext_prj_g(DWARFS_WR "v0.3.4")
+def_ext_prj_g(DWARFS_WR "v0.4.0")
 
 if (DEFINED ENV{BUNDLER_VER})
  set(BUNDLER_VER $ENV{BUNDLER_VER})
@@ -360,7 +386,7 @@ ExternalProject_Add(${DWARFS_WR_PRJ}
     SOURCE_DIR ${DWARFS_WR_SOURCE_DIR}
     BINARY_DIR ${DWARFS_WR_BINARY_DIR}
     UPDATE_COMMAND ""
-    BUILD_COMMAND ${CMAKE_COMMAND} --build ${DWARFS_WR_BINARY_DIR} --parallel 4
+    BUILD_COMMAND ${CMAKE_COMMAND} --build ${DWARFS_WR_BINARY_DIR} --parallel ${NCORES}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${DEPS}
                -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
                -DWITH_TESTS:BOOL=OFF
@@ -411,24 +437,21 @@ endif()
 set(C_FLAGS_DEST cppflags)
 
 if(IS_DARWIN)
-  if(${RUBY_VER} VERSION_LESS "3.2.2")
-    set(OPENSSL_VER "1.1")
-  else(${RUBY_VER} VERSION_LESS "3.2.2")
-    set(OPENSSL_VER "3")
-  endif(${RUBY_VER} VERSION_LESS "3.2.2")
   string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -I${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/include -I${BUILD_BREW_PREFIX}/opt/zlib/include -I${BUILD_BREW_PREFIX}/include")
   string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -L${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/lib -L${BUILD_BREW_PREFIX}/opt/zlib/lib  -L${BUILD_BREW_PREFIX}/lib")
   set(OPENSSL_RUBY_OPTION "--with-openssl-dir=${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")
   set(C_FLAGS_DEST cflags)
-endif(IS_DARWIN)
+else(IS_DARWIN)
+  string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -static-libgcc")
 
-if(IS_MUSL)
-  string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -DENABLE_PATH_CHECK=0")
-endif(IS_MUSL)
+  if(IS_MUSL)
+    string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -DENABLE_PATH_CHECK=0")
+  endif(IS_MUSL)
 
-if(RB_W32)
-  string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -DRB_W32=1")
-endif(RB_W32)
+  if(RB_W32)
+    string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -DRB_W32=1")
+  endif(RB_W32)
+endif(IS_DARWIN)
 
 message(STATUS "Ruby build ${C_FLAGS_DEST}='${RUBY_C_FLAGS}'")
 message(STATUS "Ruby build LDFLAGS='${RUBY_L_FLAGS}'")
@@ -454,7 +477,7 @@ ExternalProject_Add(${RUBY_PRJ}
                                                         --prefix=${DATA_SRC_DIR}              \
                                                         ${C_FLAGS_DEST}=\"${RUBY_C_FLAGS}\"   \
                                                         LDFLAGS=\"${RUBY_L_FLAGS}\""
-  BUILD_COMMAND    make ${RUBY_MAKEFILE}
+  BUILD_COMMAND    make ${RUBY_MAKEFILE} -j${NCORES}
   INSTALL_COMMAND  make ${RUBY_MAKEFILE} install
   COMMAND          ruby ${EXE}/tebako-packager pass2 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${DEPS_LIB_DIR} ${DATA_SRC_DIR} ${RUBY_STASH_DIR} ${RUBY_VER}
 )
@@ -488,7 +511,7 @@ else (${SETUP_MODE})
   list(LENGTH GEMS     GLENGTH)
 
   add_custom_target(clean_filesystem
-      COMMAND ruby ${EXE}/tebako-packager deploy ${RUBY_STASH_DIR} ${DATA_SRC_DIR} ${DATA_PRE_DIR} ${DATA_BIN_DIR}
+      COMMAND ruby ${EXE}/tebako-packager deploy ${RUBY_STASH_DIR} ${DATA_SRC_DIR} ${DATA_PRE_DIR} ${DATA_BIN_DIR} ${TBD} ${TGD}
       DEPENDS ${RUBY_PRJ}
   )
   if(GSLENGTH GREATER 0)
@@ -557,15 +580,14 @@ else (${SETUP_MODE})
        COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
                                            ${TBD}/bundle${CMD_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${CMD_SUFFIX} install --jobs=4
+                                           ${TBD}/bundle${CMD_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
-# [TODO] --jobs=4 probably can be more intellectual
 #       COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
 #                                    ${TBD}/bundle lock
 #       COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-#                                    ${TBD}/bundle install --deployment --jobs=4
+#                                    ${TBD}/bundle install --deployment --jobs=${NCORES}
         DEPENDS clean_filesystem
     )
   elseif(GLENGTH GREATER 0)
@@ -665,12 +687,12 @@ else (${SETUP_MODE})
 
   if (${RUBY_VER} VERSION_LESS "3.0.0")
     add_custom_target(patched_ruby
-      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make ${RUBY_MAKEFILE}
+      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make ${RUBY_MAKEFILE} -j${NCORES}
     )
   else()
     add_custom_target(patched_ruby
-      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make ruby ${RUBY_MAKEFILE}
-      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make ${RUBY_MAKEFILE}
+      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make ruby ${RUBY_MAKEFILE} -j${NCORES}
+      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make ${RUBY_MAKEFILE} -j${NCORES}
     )
   endif()
 

data/Rakefile

@@ -36,7 +36,7 @@ desc "Generate version.txt"
 task "generate_version_txt" do
   require_relative "lib/tebako/version"
   File.write(File.join(__dir__, "version.txt"), "#{Tebako::VERSION}\n")
-  puts "Generating version.txt #{Tebako::VERSION} --> #{File.join(__dir__, "version.txt")}"
+  puts "Generating #{File.join(__dir__, "version.txt")}; version = #{Tebako::VERSION}"
 end
 
 task build: :generate_version_txt

data/common.env

@@ -1,6 +1,6 @@
 BUILD_TYPE=Release
 DEPS=deps
 INCBIN_TAG=348e36b
-DWARFS_WR_TAG=v0.3.4
+DWARFS_WR_TAG=v0.4.0
 BUNDLER_VER=2.3.22
 RUBY_VER=3.1.4

data/exe/tebako-packager

@@ -78,11 +78,13 @@ begin
     #       ARGV[2] -- DATA_SRC_DIR
     #       ARGV[3] -- DATA_PRE_DIR
     #       ARGV[4] -- DATA_BIN_DIR
-    unless ARGV.length == 5
+    #       ARGV[5] -- TARGET_BIN_DIR (TBD)
+    #       ARGV[6] -- TARGET_GEM_DIR (TGD)
+    unless ARGV.length == 7
       raise Tebako::Error,
-            "tebako-packager deploy command expects 5 arguments, #{ARGV.length} has been provided."
+            "tebako-packager deploy command expects 7 arguments, #{ARGV.length} has been provided."
     end
-    Tebako::Packager.deploy(ARGV[1], ARGV[2], ARGV[3], ARGV[4])
+    Tebako::Packager.deploy(ARGV[1], ARGV[2], ARGV[3], ARGV[4], ARGV[5])
   else
     raise Tebako::Error, "tebako-packager cannot process #{ARGV[0]} command"
   end

data/lib/tebako/cli_helpers.rb

@@ -44,8 +44,6 @@ module Tebako
                 else
                   ENV.fetch("CXXFLAGS", nil)
                 end
-      #      cc = ENV.fetch("CC", "gcc")
-      #      cxx = ENV.fetch("CXX", "g++")
       @b_env ||= { "CXXFLAGS" => u_flags }
     end
 

data/lib/tebako/packager/pass2.rb

@@ -34,64 +34,82 @@ module Tebako
     # Ruby patching definitions (pass2)
     module Pass2
       class << self
-        def get_dir_c_patch(ostype)
-          dir_c_patch = patch_c_file(ostype =~ /msys/ ? "/* define system APIs */" : "#ifdef HAVE_GETATTRLIST")
-          dir_c_patch.merge!(DIR_C_BASE_PATCH)
-        end
-
         def get_patch_map(ostype, deps_lib_dir, ruby_ver)
-          patch_map = {
-            "template/Makefile.in" => template_makefile_in_patch(ostype, deps_lib_dir, ruby_ver),
-            "main.c" => MAIN_C_PATCH,
-            "tool/mkconfig.rb" => TOOL_MKCONFIG_RB_PATCH,
-            "dir.c" => get_dir_c_patch(ostype)
-          }
+          patch_map = get_patch_map_base(ostype, deps_lib_dir, ruby_ver)
 
           C_FILES_TO_PATCH.each { |patch| patch_map.store(patch[0], patch_c_file(patch[1])) }
           patch_map.store("thread_pthread.c", LINUX_MUSL_THREAD_PTHREAD_PATCH) if ostype =~ /linux-musl/
           patch_map.store("common.mk", COMMON_MK_PATCH) if PatchHelpers.ruby3x?(ruby_ver)
 
           ostype =~ /msys/ ? patch_map.merge!(MSYS_PATCHES) : patch_map
+          #          patch_map.merge!(LINUX_PATCHES)
         end
 
         private
 
         include Tebako::Packager::PatchLiterals
 
+        def get_dir_c_patch(ostype)
+          dir_c_patch = patch_c_file(ostype =~ /msys/ ? "/* define system APIs */" : "#ifdef HAVE_GETATTRLIST")
+          dir_c_patch.merge!(DIR_C_BASE_PATCH)
+        end
+
+        def get_patch_map_base(ostype, deps_lib_dir, ruby_ver)
+          {
+            "template/Makefile.in" => template_makefile_in_patch(ostype, deps_lib_dir, ruby_ver),
+            "main.c" => MAIN_C_PATCH,
+            "tool/mkconfig.rb" => TOOL_MKCONFIG_RB_PATCH,
+            "gem_prelude.rb" => GEM_PRELUDE_RB_PATCH,
+            "dir.c" => get_dir_c_patch(ostype)
+          }
+        end
+
         def process_brew_libs!(libs, brew_libs)
-          brew_libs.each { |lib| libs << "#{PatchHelpers.get_prefix(lib[0]).chop}/lib/lib#{lib[1]}.a " }
+          brew_libs.each { |lib| libs << "#{PatchHelpers.get_prefix_macos(lib[0]).chop}/lib/lib#{lib[1]}.a " }
         end
 
         def darwin_libs(deps_lib_dir, ruby_ver)
           libs = String.new
+
+          process_brew_libs!(libs, PatchHelpers.ruby31?(ruby_ver) ? DARWIN_BREW_LIBS_31 : DARWIN_BREW_LIBS_PRE_31)
           process_brew_libs!(libs, DARWIN_BREW_LIBS)
-          process_brew_libs!(libs, DARWIN_BREW_LIBS_32) if PatchHelpers.ruby32?(ruby_ver)
+
           DARWIN_DEP_LIBS.each { |lib| libs << "#{deps_lib_dir}/lib#{lib}.a " }
           <<~SUBST
-            -ltebako-fs -ldwarfs-wr -ldwarfs -lfolly -lfsst -lmetadata_thrift -lthrift_light -lxxhash \
-            -lzstd #{libs} -ljemalloc -lc++
+            -ltebako-fs -ldwarfs-wr -ldwarfs -force_load #{deps_lib_dir}/libdwarfs_compression.a -lfolly -lfsst -lmetadata_thrift -lthrift_light -lxxhash \
+            -lzstd #{libs} -ljemalloc -lc++ -lc++abi
           SUBST
         end
 
-        def yaml_reference(ruby_ver)
-          PatchHelpers.ruby32?(ruby_ver) ? "-l:libyaml.a" : ""
-        end
+        # .....................................................
+        #  Notes re linux libraries
+        #   1) This order is important: -lgcc_eh -l:libunwind.a -l:liblzma.a  lzma is used to process debug sections.
+        #      gcc_eh shall be linked before unwind to avoid duplicate symbols.
+        #   2) -lgcc_eh assumes -static-libgcc (applied in CMakeLists.ext, RUBY_C_FLAGS)
+        #   3) -static-libstdc++ did not work, not sure why  [TODO ?]
+        #   4) When clang is used linker links libraries specified in exensions in such way that they are linked shared
+        #      (libz, libffi, libreadline, libncurses, libtinfo, ... )
+        #      Using stuff like -l:libz.a  does not help; there is a reference to libz.so anyway.
+        #      This is fixed by ext/extmk.rb patch [TODO ?]
+        # .....................................................
 
         def linux_gnu_libs(ruby_ver)
           <<~SUBST
-            -l:libtebako-fs.a -l:libdwarfs-wr.a -l:libdwarfs.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:libiberty.a -l:libacl.a -l:libssl.a -l:libcrypto.a -l:liblz4.a -l:libz.a \
-            -l:libzstd.a -l:libgdbm.a -l:libreadline.a -l:libtinfo.a -l:libffi.a -l:libncurses.a -l:libjemalloc.a -l:libunwind.a -l:libcrypt.a -l:libanl.a -l:liblzma.a \
-            #{yaml_reference(ruby_ver)} -l:libboost_system.a -l:libstdc++.a -l:librt.a -ldl -lpthread
+            -l:libtebako-fs.a -l:libdwarfs-wr.a -l:libdwarfs.a -Wl,--push-state,--whole-archive -l:libdwarfs_compression.a -Wl,--pop-state -l:libfolly.a -l:libfsst.a       \
+            -l:libmetadata_thrift.a -l:libthrift_light.a -l:libxxhash.a -l:libarchive.a -l:libfmt.a -l:libdouble-conversion.a -l:libglog.a -l:libgflags.a -l:libevent.a     \
+            -l:libiberty.a -l:libacl.a -l:libssl.a -l:libcrypto.a -l:liblz4.a -l:libz.a -l:libzstd.a -l:libbrotlienc.a -l:libbrotlidec.a -l:libbrotlicommon.a -l:libgdbm.a  \
+            -l:libreadline.a -l:libtinfo.a -l:libffi.a -l:libncurses.a -l:libjemalloc.a -l:libcrypt.a -l:libanl.a #{PatchHelpers.yaml_reference(ruby_ver)}                  \
+            -l:libboost_system.a -l:libboost_chrono.a  -l:libutil.a -l:libstdc++.a -lgcc_eh -l:libunwind.a -l:liblzma.a -l:librt.a -ldl -lpthread -lm
           SUBST
         end
 
         def linux_musl_libs(ruby_ver)
           <<~SUBST
-            -l:libtebako-fs.a -l:libdwarfs-wr.a -l:libdwarfs.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:libiberty.a -l:libacl.a -l:libssl.a -l:libcrypto.a -l:liblz4.a -l:libz.a \
-            -l:libzstd.a -l:libgdbm.a -l:libreadline.a -l:libffi.a -l:libncurses.a -l:libjemalloc.a -l:libunwind.a -l:libcrypt.a -l:liblzma.a \
-            #{yaml_reference(ruby_ver)} -l:libboost_system.a -l:libstdc++.a -l:librt.a -ldl -lpthread
+            -l:libtebako-fs.a -l:libdwarfs-wr.a -l:libdwarfs.a -Wl,--push-state,--whole-archive -l:libdwarfs_compression.a -Wl,--pop-state -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:libiberty.a        \
+            -l:libacl.a -l:libssl.a -l:libcrypto.a -l:liblz4.a -l:libz.a -l:libzstd.a -l:libbrotlienc.a -l:libbrotlidec.a -l:libbrotlicommon.a -l:libgdbm.a -l:libreadline.a  \
+            -l:libffi.a -l:libncurses.a -l:libjemalloc.a -l:libcrypt.a  #{PatchHelpers.yaml_reference(ruby_ver)} -l:libboost_system.a -l:libboost_chrono.a -l:librt.a         \
+            -l:libstdc++.a -lgcc_eh -l:libunwind.a -l:liblzma.a -ldl -lpthread
           SUBST
         end
 
@@ -100,7 +118,7 @@ module Tebako
             -l:libtebako-fs.a -l:libdwarfs-wr.a -l:libdwarfs.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:libssl.a -l:libcrypto.a -l:liblz4.a -l:libz.a \
             -l:libzstd.a -l:libffi.a -l:libgdbm.a -l:libncurses.a -l:libjemalloc.a -l:libunwind.a -l:liblzma.a -l:libiberty.a \
-            #{yaml_reference(ruby_ver)} -l:libstdc++.a -l:libdl.a -lole32 -loleaut32 -luuid
+            #{PatchHelpers.yaml_reference(ruby_ver)} -l:libstdc++.a -l:libdl.a -lole32 -loleaut32 -luuid
           SUBST
         end
 
@@ -138,22 +156,14 @@ module Tebako
         end
 
         def template_makefile_in_patch(ostype, deps_lib_dir, ruby_ver)
-          base_patch = {
-            "LIBS = @LIBS@ $(EXTLIBS)" => <<~SUBST
-              # -- Start of tebako patch --
-              LIBS = $(MAINLIBS) @LIBS@
-              # -- End of tebako patch --
-            SUBST
-          }
-          base_patch.merge!(mlibs_subst(ostype, deps_lib_dir, ruby_ver))
-          base_patch.merge!(template_makefile_in_patch_two(ruby_ver))
+          template_makefile_in_patch_two(ruby_ver).merge(mlibs_subst(ostype, deps_lib_dir, ruby_ver))
         end
 
         def template_makefile_in_patch_two(ruby_ver)
           if PatchHelpers.ruby31?(ruby_ver)
-            { TEMPLATE_MAKEFILE_IN_BASE_PATTERN_TWO => TEMPLATE_MAKEFILE_IN_BASE_PATCH_TWO }
+            { TEMPLATE_MAKEFILE_IN_BASE_PATTERN => TEMPLATE_MAKEFILE_IN_BASE_PATCH }
           else
-            { TEMPLATE_MAKEFILE_IN_BASE_PATTERN_TWO_PRE_3_1 => TEMPLATE_MAKEFILE_IN_BASE_PATCH_TWO_PRE_3_1 }
+            { TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_1 => TEMPLATE_MAKEFILE_IN_BASE_PATCH_PRE_3_1 }
           end
         end
       end

data/lib/tebako/packager/patch_helpers.rb

@@ -34,13 +34,23 @@ module Tebako
     # Ruby patching helpers (pass2)
     module PatchHelpers
       class << self
-        def get_prefix(package)
+        def get_prefix_macos(package)
           out, st = Open3.capture2("brew --prefix #{package}")
           raise Tebako::Error, "brew --prefix #{package} failed with code #{st.exitstatus}" unless st.exitstatus.zero?
 
           out
         end
 
+        def get_prefix_linux(package)
+          out, st = Open3.capture2("pkg-config --variable=libdir #{package}")
+          unless st.exitstatus.zero?
+            raise Tebako::Error,
+                  "pkg-config --variable=libdir #{package} failed with code #{st.exitstatus}"
+          end
+
+          out
+        end
+
         def ruby3x?(ruby_ver)
           ruby_ver[0] == "3"
         end
@@ -52,6 +62,10 @@ module Tebako
         def ruby32?(ruby_ver)
           ruby3x?(ruby_ver) && ruby_ver[2].to_i >= 2
         end
+
+        def yaml_reference(ruby_ver)
+          ruby32?(ruby_ver) ? "-l:libyaml.a" : ""
+        end
       end
     end
   end

data/lib/tebako/packager/patch_literals.rb

@@ -168,24 +168,24 @@ module Tebako
         ["dln.c", "static const char funcname_prefix[sizeof(FUNCNAME_PREFIX) - 1] = FUNCNAME_PREFIX;"]
       ].freeze
 
-      TEMPLATE_MAKEFILE_IN_BASE_PATTERN_TWO_PRE_3_1 =
+      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_TWO_PRE_3_1 =
+      TEMPLATE_MAKEFILE_IN_BASE_PATCH_PRE_3_1 =
         "# -- Start of tebako patch --\n" \
         "\t\t$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
-        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(LIBS) $(OUTFLAG)$@\n" \
+        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
         "# -- End of tebako patch --"
 
-      TEMPLATE_MAKEFILE_IN_BASE_PATTERN_TWO =
-        "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
-        "$(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@"
+      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_TWO =
+      TEMPLATE_MAKEFILE_IN_BASE_PATCH =
         "# -- Start of tebako patch --\n" \
         "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
-        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(LIBS) $(OUTFLAG)$@\n" \
+        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
         "# -- End of tebako patch --"
 
       C_FILE_SUBST = <<~SUBST
@@ -199,6 +199,20 @@ module Tebako
         /* -- End of tebako patch -- */
       SUBST
 
+      GEM_PRELUDE_RB_PATCH = {
+        "if defined?(DidYouMean)" => <<~SUBST
+          if defined?(DidYouMean)
+
+          # -- Start of tebako patch --
+          begin
+            require 'tebako-runtime'
+          rescue LoadError
+            warn "'tebako-runtime' was not loaded."
+          end
+          # -- End of tebako patch --
+        SUBST
+      }.freeze
+
       MSYS_PATCHES = {
         "ruby.c" => {
           "#define RUBY_RELATIVE(path, len) rb_str_buf_cat(BASEPATH(), (path), (len))" =>
@@ -237,17 +251,28 @@ module Tebako
 
       }.freeze
 
+      LINUX_PATCHES = {
+        "ext/extmk.rb" => {
+          "mf.macro \"EXTLIBS\", $extlibs" => "#  mf.macro \"EXTLIBS\", $extlibs   tebako patched"
+        }
+      }.freeze
+
       # rubocop:disable Style/WordArray
+
+      # NOTE: folly provides build-in implementation of jemalloc
+
       DARWIN_BREW_LIBS = [
-        ["openssl@1.1", "ssl"],   ["openssl@1.1", "crypto"],  ["zlib", "z"],            ["gdbm", "gdbm"],
-        ["readline", "readline"], ["libffi", "ffi"],          ["ncurses", "ncurses"],   ["fmt", "fmt"],
-        ["lz4", "lz4"],           ["xz", "lzma"],             ["libyaml", "yaml"],
+        ["zlib", "z"],            ["gdbm", "gdbm"],           ["readline", "readline"], ["libffi", "ffi"],
+        ["ncurses", "ncurses"],   ["fmt", "fmt"],             ["lz4", "lz4"],           ["xz", "lzma"],
+        ["libyaml", "yaml"],      ["boost", "boost_chrono"],
         ["double-conversion", "double-conversion"]
       ].freeze
 
-      DARWIN_BREW_LIBS_32 = [["libyaml", "yaml"]].freeze
+      DARWIN_BREW_LIBS_PRE_31 = [["openssl@1.1", "ssl"], ["openssl@1.1", "crypto"]].freeze
+
+      DARWIN_BREW_LIBS_31 = [["libyaml", "yaml"], ["openssl@3", "ssl"], ["openssl@3", "crypto"]].freeze
 
-      DARWIN_DEP_LIBS = ["glog", "gflags"].freeze
+      DARWIN_DEP_LIBS = ["glog", "gflags", "brotlienc", "brotlidec", "brotlicommon"].freeze
       # rubocop:enable Style/WordArray
     end
     # rubocop:enable Metrics/ModuleLength

data/lib/tebako/packager.rb

@@ -42,6 +42,7 @@ module Tebako
       file.c
       io.c
       tool/mkconfig.rb
+      gem_prelude.rb
     ].freeze
 
     FILES_TO_RESTORE_MSYS = %w[
@@ -55,6 +56,12 @@ module Tebako
       thread_pthread.c
     ].freeze
 
+    DEPLOY_ENV = {
+      "GEM_HOME" => nil,
+      "GEM_PATH" => nil,
+      "TEBAKO_PASS_THROUGH" => "1"
+    }.freeze
+
     class << self
       # Pass1
       # Executed before Ruby build, patching ensures that Ruby itself is linked statically
@@ -83,7 +90,7 @@ module Tebako
       # Saves pristine Ruby environment that is used to deploy applications for packaging
       def stash(src_dir, stash_dir)
         puts "-- Running stash script"
-        #  .... this code snippet is executed 'outdside' of Ruby scripts
+        #  .... this code snippet is executed 'outside' of Ruby scripts
         # shall be reconsidered
         #    FileUtils.cd ruby_source_dir do
         #        puts "   ... creating pristine ruby environment at #{src_dir} [patience, it will take some time]"
@@ -98,18 +105,40 @@ module Tebako
       end
 
       # Deploy
-      # To be extended
-      # Now it just recreates Ruby prostine environment from stash
-      def deploy(stash_dir, src_dir, pre_dir, bin_dir)
+      def deploy(stash_dir, src_dir, pre_dir, bin_dir, tbd)
         puts "-- Running deploy script"
 
         puts "   ... creating packaging environment at #{src_dir}"
         recreate([src_dir, pre_dir, bin_dir])
         FileUtils.cp_r "#{stash_dir}/.", src_dir
+
+        install_gem tbd, "tebako-runtime"
       end
 
       private
 
+      def install_gem(tbd, name)
+        puts "   ... installing #{name} gem"
+        with_env(DEPLOY_ENV) do
+          out, st = Open3.capture2e("#{tbd}/gem", "install", name.to_s, "--no-doc")
+          raise Tebako::Error, "Failed to install #{name} (#{st}):\n #{out}" unless st.exitstatus.zero?
+        end
+      end
+
+      def do_patch(patch_map, root)
+        patch_map.each { |fname, mapping| patch_file("#{root}/#{fname}", mapping) }
+      end
+
+      def patch_file(fname, mapping)
+        raise Tebako::Error, "Could not patch #{fname} because it does not exist." unless File.exist?(fname)
+
+        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
+
       def recreate(dirname)
         FileUtils.rm_rf(dirname, noop: nil, verbose: nil, secure: true)
         FileUtils.mkdir(dirname)
@@ -132,18 +161,20 @@ module Tebako
         end
       end
 
-      def patch_file(fname, mapping)
-        raise Tebako::Error, "Could not patch #{fname} because it does not exist." unless File.exist?(fname)
-
-        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
-
-      def do_patch(patch_map, root)
-        patch_map.each { |fname, mapping| patch_file("#{root}/#{fname}", mapping) }
+      # Sets up temporary environment variables and yields to the
+      # block. When the block exits, the environment variables are set
+      # back to their original values.
+      def with_env(hash)
+        old = {}
+        hash.each do |k, v|
+          old[k] = ENV.fetch(k, nil)
+          ENV[k] = v
+        end
+        begin
+          yield
+        ensure
+          hash.each { |k, _v| ENV[k] = old[k] }
+        end
       end
     end
   end

data/lib/tebako/version.rb

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

data/resources/tebako-fs.cpp.in

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (c) 2021-2022 [Ribose Inc](https://www.ribose.com).
+ * Copyright (c) 2021-2023 [Ribose Inc](https://www.ribose.com).
  * All rights reserved.
  * This file is a part of tebako
  *
@@ -34,4 +34,4 @@ namespace tebako {
 	const char * fs_mount_point = "@FS_MOUNT_POINT@";
 	const char * fs_entry_point = "@FS_ENTRY_POINT@";
 	INCBIN(fs, "@DATA_BIN_FILE@");
-}
+}

data/version.txt

@@ -1 +1 @@
-0.5.3
+0.5.5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-18 00:00:00.000000000 Z
+date: 2023-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -57,7 +57,6 @@ files:
 - bin/console
 - bin/setup
 - cmake/copy_dir.cmake
-- cmake/def_tty_colours.cmake
 - common.env
 - exe/tebako
 - exe/tebako-packager

data/cmake/def_tty_colours.cmake

@@ -1,19 +0,0 @@
-if(NOT WIN32)
-  string(ASCII 27 Escape)
-  set(ColourReset       "${Escape}[m")
-  set(ColourBold        "${Escape}[1m")
-  set(ColourRed         "${Escape}[31m")
-  set(ColourGreen       "${Escape}[32m")
-  set(ColourYellow      "${Escape}[33m")
-  set(ColourBlue        "${Escape}[34m")
-  set(ColourMagenta     "${Escape}[35m")
-  set(ColourCyan        "${Escape}[36m")
-  set(ColourWhite       "${Escape}[37m")
-  set(ColourBoldRed     "${Escape}[1;31m")
-  set(ColourBoldGreen   "${Escape}[1;32m")
-  set(ColourBoldYellow  "${Escape}[1;33m")
-  set(ColourBoldBlue    "${Escape}[1;34m")
-  set(ColourBoldMagenta "${Escape}[1;35m")
-  set(ColourBoldCyan    "${Escape}[1;36m")
-  set(ColourBoldWhite   "${Escape}[1;37m")
-endif()