tebako 0.12.3 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f8ba6c5001a0f85b9ce548a1eb6c6a1d2bfc91315996b67f5b6073464912ead
-  data.tar.gz: 5b254551b21adeb112681cc7c67bf260d7b0659e95a14d1b31b2d9c75a89d24a
+  metadata.gz: 4bf78c78af608eb796946d5bd3f8e39ad8533c00e1e51a1f4dea8ac015fa1436
+  data.tar.gz: cf2b93839047502ba5a222702f6fced52d35de4d15aae3ea87ff7892700fa6b4
 SHA512:
-  metadata.gz: 937ea025ebed046f071e216a26f735b92fd65a2af19b16544f6b720493e86c314bf7fb04a4fb13a8d2b16c60a75ff5831f2cb62571829164e8d943a9be969f33
-  data.tar.gz: 7f164193fcdae2f6a425867ae37587d4f74a5461075867f7eca1a0f34cc3e55b9c7c6959c4ae14637ef59077885c5840db57f40eba415605495786c2cf85d350
+  metadata.gz: ff6b16b6658bf9501b9812d0e5d67714781ec70f3e51077a49d4b50cb3c18bb03e9766e2dc44c57a55a0c185f44d16d911e4608e7107725bbeb62c1f6d50ccee
+  data.tar.gz: 4b3a6e2b0e1d0510b63ae359f02bf18393c5e65687ea661fcf359d193192bd6946d7b5f50a0f908b32e32eb8661141182d661b6c0158e0ead5f111b861bf6315

data/CMakeLists.txt

@@ -361,7 +361,8 @@ ExternalProject_Add(${RUBY_PRJ}
   DOWNLOAD_NO_PROGRESS true
   SOURCE_DIR ${RUBY_SOURCE_DIR}
   BUILD_IN_SOURCE true
-  CONFIGURE_COMMAND ruby ${EXE}/tebako-packager pass1 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${FS_MOUNT_POINT} ${DATA_SRC_DIR} ${RUBY_VER}
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ruby ${EXE}/tebako-packager pass1 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${FS_MOUNT_POINT} ${DATA_SRC_DIR} ${RUBY_VER}
   # Make it for MacOS otherwise LDFLAGS are invalid
   COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_LIB_DIR}
   COMMAND ${GNU_BASH} -c "${RUBY_SOURCE_DIR}/configure  ${OPENSSL_RUBY_OPTION} ${LIBYAML_RUBY_OPTION} \
@@ -375,10 +376,8 @@ 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 -j${NCORES}
-  INSTALL_COMMAND  make install -j${NCORES}
-  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}"
+  COMMAND   ruby ${EXE}/tebako-packager pass2 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${DEPS_LIB_DIR} ${DATA_SRC_DIR} ${RUBY_STASH_DIR} ${RUBY_VER}
+  INSTALL_COMMAND  ""
 )
 
 # add_dependencies(${RUBY_PRJ} ${DWARFS_WR_PRJ})

data/exe/tebako-packager

@@ -51,14 +51,6 @@ begin
     ruby_ver = Tebako::RubyVersion.new(ARGV[5])
     Tebako::Packager.pass1(ARGV[1], ARGV[2], ARGV[3], ARGV[4], ruby_ver)
 
-  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
@@ -72,7 +64,8 @@ begin
             "tebako-packager pass2 command expects 7 arguments, #{ARGV.length} has been provided."
     end
     ruby_ver = Tebako::RubyVersion.new(ARGV[6])
-    Tebako::Packager.stash(ARGV[4], ARGV[5])
+    Tebako::Packager.pass1a(ARGV[2])
+    Tebako::Packager.stash(ARGV[4], ARGV[5], ARGV[2], ruby_ver)
     Tebako::Packager.pass2(ARGV[1], ARGV[2], ARGV[3], ruby_ver)
 
   when "finalize"

data/lib/tebako/packager.rb

@@ -92,7 +92,7 @@ module Tebako
       def finalize(os_type, src_dir, app_name, ruby_ver, patchelf)
         puts "-- Running finalize script"
 
-        RubyBuilder.new(ruby_ver, src_dir).final_build
+        RubyBuilder.new(ruby_ver, src_dir).target_build
         exe_suffix = Packager::PatchHelpers.exe_suffix(os_type)
         src_name = File.join(src_dir, "ruby#{exe_suffix}")
         patchelf(src_name, patchelf)
@@ -149,19 +149,12 @@ module Tebako
       end
 
       # Stash
-      # Saves pristine Ruby environment that is used to deploy applications for packaging
-      def stash(src_dir, stash_dir)
+      # Created and saves pristine Ruby environment that is used to deploy applications for packaging
+      def stash(src_dir, stash_dir, ruby_source_dir, ruby_ver)
         puts "-- Running stash script"
-        #  .... 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]"
-        #        out, st = Open3.capture2e("cmake", "-E", "chdir", ruby_source_dir, "make", "install")
-        #        print out if st.exitstatus != 0 || verbose
-        #        raise Tebako::Error.new("stash [make install] failed with code #{st.exitstatus}") if st.exitstatus != 0
-        #    end
-
-        puts "   ... saving pristine ruby environment to #{stash_dir}"
+        RubyBuilder.new(ruby_ver, ruby_source_dir).toolchain_build
+
+        puts "   ... saving pristine Ruby environment to #{stash_dir}"
         PatchHelpers.recreate(stash_dir)
         FileUtils.cp_r "#{src_dir}/.", stash_dir
       end

data/lib/tebako/ruby_builder.rb

@@ -41,7 +41,16 @@ module Tebako
     end
 
     # Final build of tebako package
-    def final_build
+    def toolchain_build
+      puts "   ... building toolchain Ruby"
+      Dir.chdir(@src_dir) do
+        BuildHelpers.run_with_capture(["make", "-j#{@ncores}"])
+        BuildHelpers.run_with_capture(["make", "install", "-j#{@ncores}"])
+      end
+    end
+
+    # Final build of tebako package
+    def target_build
       puts "   ... building tebako package"
       Dir.chdir(@src_dir) do
         BuildHelpers.run_with_capture(["make", "ruby", "-j#{@ncores}"]) if @ruby_ver.ruby3x?

data/lib/tebako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-17 00:00:00.000000000 Z
+date: 2025-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor