tebako 0.12.2 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3acd4d518e560abf4901a25e53452f910db850469375deb7e13b5ebc7c8173c4
-  data.tar.gz: 260a96de335ba92231b01543f4a19ef41a59156ae8ea8546ac7b277bb8b3d7de
+  metadata.gz: 633e17c7549e90b7c460701122d4331970925368dd0a17787a746ae2c71ed331
+  data.tar.gz: b143e619ff94f5bc5f296a7c611cd0f1ef00c60b3c50c0d731be2c9178b11ef6
 SHA512:
-  metadata.gz: 3899ed838eb003e918e9adc91efeeb1eae7d6248bff9e664ace699c1042503b19dce0179cffacaf9c7e7d7418691f0142d9a30388059e82fdb5a07b9a6a395cc
-  data.tar.gz: 499099ca4dfc86e43f8de369b590e052a46156f2bcbce28081562687dbc42fa3de044e944163df36955f639ab82655921beba41e5e8d29e884e1e2fcb69e874f
+  metadata.gz: 6f599028137f315f0394b84679f89874a264a48a9ca834b044a7b56943affaf3b5a79612860bc82ba7c4f6c5982d7edab6bbcda6ac0a0245db92fee422147189
+  data.tar.gz: c77a413e42a2d91bf7c8b05ea60372194ad52e225243eba05b86431f9dc25bbfae1ca08779ca7469fdfa63310ded32b00df0b2605888a811e59aa4c9b5eba4bf

data/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2024 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2021-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -361,8 +361,11 @@ ExternalProject_Add(${RUBY_PRJ}
   DOWNLOAD_NO_PROGRESS true
   SOURCE_DIR ${RUBY_SOURCE_DIR}
   BUILD_IN_SOURCE true
-  PATCH_COMMAND ruby ${EXE}/tebako-packager pass1 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${FS_MOUNT_POINT} ${DATA_SRC_DIR} ${RUBY_VER}
-  CONFIGURE_COMMAND ${GNU_BASH} -c "${RUBY_SOURCE_DIR}/configure  ${OPENSSL_RUBY_OPTION} ${LIBYAML_RUBY_OPTION} \
+  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} \
                                                         --without-gmp                         \
                                                         --disable-dtrace                      \
                                                         --disable-debug-env                   \
@@ -373,29 +376,31 @@ 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} ${LIBDWARFS_WR_PRJ})
-
-if(IS_GNU)
-  add_dependencies(${RUBY_PRJ} ${PATCHELF_PRJ})
-endif(IS_GNU)
-
+# add_dependencies(${RUBY_PRJ} ${DWARFS_WR_PRJ})
 
 if (${SETUP_MODE})
   add_custom_target(setup
     ${CMAKE_COMMAND} -E echo "Tebako setup has completed"
     DEPENDS ${DWARFS_WR_PRJ} ${RUBY_PRJ}
   )
-else (${SETUP_MODE})
+  if(IS_GNU)
+    add_dependencies(setup ${PATCHELF_PRJ})
+  endif(IS_GNU)
+
+  else (${SETUP_MODE})
   add_custom_target(setup
     ${CMAKE_COMMAND} -E echo "Tebako setup has been verified"
     DEPENDS ${DWARFS_WR_PRJ} ${RUBY_PRJ}
   )
+  if(IS_GNU)
+    add_dependencies(setup ${PATCHELF_PRJ})
+  endif(IS_GNU)
+
+
 
   set(CMAKE_CXX_STANDARD      20)
   set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -406,7 +411,7 @@ else (${SETUP_MODE})
 
   add_custom_target(packaged_filesystem
     COMMAND ruby ${DEPS_BIN_DIR}/deploy.rb
-    DEPENDS ${RUBY_PRJ}
+    DEPENDS setup
     BYPRODUCTS ${DATA_BIN_FILE}
   )
 

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/options_manager.rb

@@ -121,6 +121,10 @@ module Tebako
       @deps_bin_dir ||= File.join(deps, "bin")
     end
 
+    def deps_lib_dir
+      @deps_lib_dir ||= File.join(deps, "lib")
+    end
+
     def fs_current
       fs_current = Dir.pwd
       if RUBY_PLATFORM =~ /msys|mingw|cygwin/

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.2"
+  VERSION = "0.12.4"
 end

metadata

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