tebako 0.12.15 → 0.12.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ca5253989e3915a15d811d014547ffadc66d4ddc7b4981ba2670f16479b0e2e
-  data.tar.gz: 17c0075bf2f3dd8eabfd10c492afc1982123d0cafac113ff9b519493119ecdb2
+  metadata.gz: 90a79cb3c7cf5d46a64d7337c96dfeff2b2c1aa0bcc73ba6ef19a260fff8d2e8
+  data.tar.gz: 32dd49b7bca79dc56611dbc08c838bd211fd75c99b99d81df72f4962237ccc4e
 SHA512:
-  metadata.gz: b6f8340c839065cd63eb9bf6491b1b51061e55bd5f2648d94137b42d10e9fc9e00ce739c3f68c66d84174981fedcd364a0bd2e86dba7fad159f080e3e6e55090
-  data.tar.gz: 4134e0c4e5cede91de0bcd9afff617d30c83bdd7729d67d81544b52df308e34a7226f018ef35eb54689771ab89c4a27ea1a80740603080dd9e8962bec261402d
+  metadata.gz: 9e8b56db99c71dc148ab2596cf9338babd50784f2a98a9361e101af8734801ccaa72d580575ebad7599faed6f66e0100fdf4c0f045d857581d0af58a194b1c0a
+  data.tar.gz: 0d63898d6c18e696a44fb31a15c76821b0dabbf9ccc69ea98437d2962a522eecec40ddd9277a3680cf3a23e2a8f8882c750e74e930f1e20224f25ed7d59e9f61

data/CMakeLists.txt

@@ -436,7 +436,7 @@ if (${SETUP_MODE})
 
   add_dependencies(tebako-fs packaged_filesystem)
 
-  add_custom_target(tebako COMMAND ruby ${EXE}/tebako-packager finalize ${RUBY_SOURCE_DIR} ${APP_NAME} ${RUBY_VER} ${DEPS_BIN_DIR}/patchelf ${WITH_PATCHELF})
+  add_custom_target(tebako COMMAND ${CMAKE_COMMAND} -E true)
   add_dependencies(tebako setup tebako-fs)
 
 endif(${SETUP_MODE})

data/README.adoc

@@ -580,21 +580,22 @@ The following instructions work for:
 
 We use Homebrew to install the necessary packages on macOS.
 
+Tebako provides a `Brewfile` at the repository root that you can install all
+dependencies using the `brew bundle` command.
+
 [source,sh]
 ----
-brew update
-brew install gnu-sed bash pkg-config bison flex binutils libffi gdbm zlib \
-  ncurses double-conversion boost jemalloc fmt glog libevent libsodium lz4 xz \
-  libyaml openssl@3
-brew bundle
+$ brew bundle
 ----
 
-Additionaly tebako repository includes `Brewfile` that can be used with
-`brew bundle` command.
+Alternatively, you can install the packages manually.
 
 [source,sh]
 ----
-brew bundle
+$ brew update
+$ brew install gnu-sed bash pkg-config bison flex binutils libffi gdbm zlib \
+  ncurses double-conversion boost jemalloc fmt glog libevent libsodium lz4 xz \
+  libyaml openssl@3
 ----
 
 ====== Bison 3+
@@ -703,9 +704,8 @@ $ pacman -S git tar bison flex toolchain make cmake
 [[root-folder-selection]]
 === Tebako root folder (aka prefix) selection
 
-The Tebako prefix determines the base directory for the Tebako setup.
-
-It is an essential part of configuring how Tebako operates within your system.
+The Tebako prefix determines the base directory for the tebako packaging environment. It contain build artifacts for
+Tebako run-time, libraries and other components and is an essential part of configuring how Tebako operates within your system.
 
 The selection of the Tebako prefix follows a specific order of precedence to
 ensure flexibility and ease of use:
@@ -727,12 +727,14 @@ 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 Tebako 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 `~`.
 
+Please do not use Tebako prefix under your application root (`--root` parameter). It is not an error
+but it will cause Tebako to place all build-time artifacts to tebako package dramatically increasing its size.
+You do not need it unless under very special circumstances like tebako packaging tebako itself.
 
 === Commands
 
@@ -766,7 +768,7 @@ tebako press \
   [-R|--Ruby=<ruby-version>] \
   [-o|--output=<packaged-file-name>] \
   [-l|--log-level=<error|warn|debug|trace>] \
-  [-c|--cwd=<package current working directory>]
+  [-c|--cwd=<package-current-working-directory>] \
   [-D|--devmode] \
   [-P|--patchelf] \
   [-m|--mode=<bundle|both|application|runtime>] \
@@ -776,56 +778,70 @@ tebako press \
 
 Where:
 
-`<tebako-root-folder>`::
+`--entry-point=<entry-point>`::
+an executable file (binary executable or script) that shall be started when
+packaged file is called. This parameter is not required if the operation mode is `runtime`.
+
+`--prefix=<tebako-root-folder>`::
 the Tebako root folder (see details: <<root-folder-selection>>)
 
-`Ruby`::
+`--Ruby=<ruby-version>`::
 this parameter defines Ruby version that will be packaged (optional, defaults to
 `3.3.7`)
 
-`project-root`::
+`--root=<project-root-folder>`::
 a folder at the host source file system where project files are located.
 This parameter is not required if the operation mode is `runtime`.
 
-`entry-point`::
-an executable file (binary executable or script) that shall be started when
-packaged file is called. This parameter is not required if the operation mode is `runtime`.
-
-`output`::
+`--output=<packaged-file-name>`::
 (optional)
 the output file name.
 +
-Defaults to `<current folder>/<entry point base name>`.
-+
-On Windows output file will have `exe` extension.
-If the application is to be a separate file (`both` or `application` mode), it
-will have the same name with the `.tebako` extension.
+On Windows, the output file is automatically appended the `.exe` extension.
+
+** If the `-o` option is not specified:
+
+*** in `runtime` mode, the runtime package is created at `tebako-runtime`.
+*** in `application` mode, the application package is created at `<current-folder>/<entry-point-base-name>`.
+*** in `bundle` mode, the bundled package is created at `<current-folder>/<entry-point-base-name>`.
+*** in `both` mode, the runtime package is created at `<current-folder>/<entry-point-base-name>`,
+and the application package is created at `<current-folder>/<entry-point-base-name>.tebako`.
+
+** If the `-o` option is specified:
 
-`log-level`::
-logging level for the Tebako built-in memory filesystem driver
+*** in `runtime` mode, the runtime package is named according to the `-o` option.
+*** in `application` mode, the application package is named according to the `-o` option.
+*** in `bundle` mode, the bundled package is named according to the `-o` option.
+*** in `both` mode, the runtime package is named according to the `-o` option,
+and the application package is named according to the `-o` option with the `.tebako` extension.
+
+
+`--log-level=<error|warn|debug|trace>`::
 (optional, defaults to `error`)
+logging level for the Tebako built-in memory filesystem driver.
 
-`cwd`::
+`--cwd=<package-current-working-directory>`::
 (optional)
-a folder within Tebako memfs where the packaged application will start. This folder should be specified relative to the memfs root.
+A folder within Tebako memfs where the packaged application will start. This
+folder should be specified relative to the memfs root.
 +
 If not provided, the application will start within the current folder of the
 host (i.e., at `$PWD`).
 +
 This argument is required because it is not possible to change the directory to
 a memfs folder until the package is started, as opposed to any host folder that
-can be set as the current directory before Tebako package invocation.  Tebako
+can be set as the current directory before Tebako package invocation. Tebako
 saves the original working directory in a global Ruby variable
 `$tebako_original_pwd`.
 
-`devmode`:: flag that activates development mode, in which Tebako's cache and
+`--devmode`:: flag that activates development mode, in which Tebako's cache and
 packaging consistency checks are relaxed.
 
-`patchelf`::
+`--patchelf`::
 Allows forward-compatibility of Tebako packages with Linux GNU distributions.
 +
 Specifically, this is a flag that removes a reference to the `GLIBC_PRIVATE`
-version of `libpthread` from a Tebako package.  This allows Linux GNU packages
+version of `libpthread` from a Tebako package. This allows Linux GNU packages
 to run against versions of `libpthread` that differ from the version used for
 packaging.
 +
@@ -836,32 +852,34 @@ For example, a package created at Ubuntu 20 system can be used on Ubuntu 22.
 +
 NOTE: The feature is exeprimental, we may consider another approach in the future.
 
-`mode`::
-output mode for tebako package (optional, defaults to `bundle`).
+`--mode=<mode>`::
+(optional, defaults to `bundle`)
+Package output mode, determines whether the runtime and/or application are
+to be separately packaged.
 
-`bundle`::: place runtime and application to a single file
-`both`::: create both run-rime and application
-`application`::: create appplication only
-`runtime`::: create runtime only
+`bundle`::: Create a single package bundling both the runtime and application. The output file is named according to the `-o` option.
+`both`::: Create separate packages for the runtime and application. Outputs two separate files: one for the runtime at the location specified at the `-o {filename}` and one for the application at `{filename}.package`.
+`application`::: Create the application package only. The output file is named according to the `-o` option.
+`runtime`::: Create the runtime package only. The output file is named according to the `-o` option.
 
-`ref`::
+`--ref`::
 (optional)
 Defaults to `tebako-runtime`.
 When a Tebako application package is created on Windows, it is linked against a
 Tebako runtime file name. The `ref` parameter allows to specify the name of the
 runtime file.
 +
-NOTE: The `ref` option specificies the name of the runtime -- the runtime file
+NOTE: The `--ref` option specifies the name of the runtime -- the runtime file
 can be recreated or changed but not renamed.
 
-`tebafile`::
+`--tebafile=<path>`::
 the tebako configuration file (optional, defaults to `$PWD/.tebako.yml`).
 Please refer to the separate section below for description of the tebafile.
 +
 NOTE: Development mode is *not intended for production use* and should only be
 used during development.
 +
-NOTE: `entry-point` and `project-root-folder` are required parameters and may be
+NOTE: `--entry-point` and `--project-root-folder` are required parameters and may be
 provided either via command-line or in the tebafile.
 
 [example]
@@ -903,16 +921,18 @@ $ tebako setup \
 
 Where:
 
-`<tebako-root-folder>`:: the Tebako root folder (see details: <<root-folder-selection>>)
+`--prefix=<tebako-root-folder>`:: the Tebako root folder (see details: <<root-folder-selection>>)
 
-`Ruby`:: parameter defines package Ruby version (optional). This version is used in conjuction with requirements
-from the Gemfile as explained below in 'Package Ruby version selection rules' section.
+`--Ruby=<ruby-version>`::
+parameter defines package Ruby version (optional).
+This version is used in conjunction with requirements from the `Gemfile` as
+explained below in <<ruby-and-bundler-versions>>.
 
-`tebafile`::
+`--tebafile=<path>`::
 the tebako configuration file (optional, defaults to `$PWD/.tebako.yml`).
 Please refer to the separate section below for tebafile description.
 
-`devmode`:: flag activates development mode, in which Tebako's cache and packaging consistency checks are relaxed.
+`--devmode`:: flag activates development mode, in which Tebako's cache and packaging consistency checks are relaxed.
 Please note that this mode is not intended for production use and should only be used during development.
 
 ==== Clean
@@ -931,9 +951,9 @@ $ tebako clean \
 
 Where:
 
-`<tebako-root-folder>`:: the Tebako root folder (see details: <<root-folder-selection>>)
+`--prefix=<tebako-root-folder>`:: the Tebako root folder (see details: <<root-folder-selection>>)
 
-`tebafile`::
+`--tebafile=<path>`::
 the tebako configuration file (optional, defaults to `$PWD/.tebako.yml`).
 Please refer to the separate section below for tebafile description.
 
@@ -968,13 +988,14 @@ $ tebako clean_ruby
 
 Where:
 
-`<tebako-root-folder>`::
+`--prefix=<tebako-root-folder>`::
 the Tebako setup folder (optional, defaults to current folder)
 
-`Ruby`::
-defines Ruby version that will cleaned (optional, cleans all versions by default)
+`--Ruby=<ruby-version>`::
+(optional, cleans all versions by default)
+defines Ruby version that will be cleaned.
 
-`tebafile`::
+`--tebafile=<path>`::
 the tebako configuration file (optional, defaults to `$PWD/.tebako.yml`).
 Please refer to the separate section below for tebafile description.
 
@@ -1036,11 +1057,11 @@ samller order means higher proirity.
 | Order | Mode | Option source | Applicability
 
 | 1 | All | Command-line | All options
-| 2 | All |Tebako configuration file | All option except ``--tebafile`` (you can not specify new tebafile in a tebafile)
-.2+| 3 .2+| All .2+| Environment variable | TEBAKO_PREFIX to set ``--prefix`` option
-| LG_VADDR to set ``--with-lg-vaddr`` jemalloc parameter
-.2+| 4 | ``runtime`` | Tebako defaults | All options except ``--entry-point`` and ``--root`` that are mandatory
-| ``bundle``, ``both``, ``application`` | Tebako defaults | All options
+| 2 | All |Tebako configuration file | All option except `--tebafile` (you can not specify new tebafile in a tebafile)
+.2+| 3 .2+| All .2+| Environment variable | TEBAKO_PREFIX to set `--prefix` option
+| LG_VADDR to set `--with-lg-vaddr` jemalloc parameter
+.2+| 4 | `runtime` | Tebako defaults | All options except `--entry-point` and `--root` that are mandatory
+| `bundle`, `both`, `application` | Tebako defaults | All options
 
 |===
 
@@ -1075,6 +1096,7 @@ operation. The following table lists the possible exit codes and their meanings.
 | 116  | Ruby version does not satify Gemfile requirements
 |===
 
+[[ruby-and-bundler-versions]]
 == Ruby and bundler versions selection
 
 During packaging tebako creates its own Ruby execution environment that is independent from the host Ruby environment.
@@ -1226,52 +1248,155 @@ myproject --option --parameter value
 However there are several command-line parameters that are intercepted processed
 by Tebako bootstrap code as described below.
 
-=== Running tebako image by tebako runtime (`--tebako-run` option)
 
-Tebako provides an option to an extract its DwarFS filesystem from a package to
-a local folder for verification or execution.
+=== Creating a bundle package
+
+Tebako provides a method to create and manage a bundle package, which simplifies
+the process of packaging dependencies along with the application.
 
 [source,sh]
 ----
-$ <tebako-runtime> --tebako-run [<tebako application>]
+$ tebako bundle create -o <bundle-package> -r <project-root-folder> [-R <ruby-version>]
 ----
 
-Where,
+To run the bundle package, use the following command:
+
+[source,sh]
+----
+$ <bundle-package>
+----
+
+[example]
+====
+[source,sh]
+----
+$ tebako bundle create -o myproject-bundle -r ~/projects/myproject -R 3.4.1
+# => creates `myproject-bundle`, a bundle package for Ruby 3.4.1
+$ myproject-bundle
+# => runs the bundle package
+----
+====
+
+=== Creating separate runtime and application packages
+
+Tebako allows creating separate runtime and application packages that can be used
+to run a Tebako application package.
+
+[source,sh]
+----
+$ tebako press -m both \
+  -o <tebako-runtime-package> \
+  -e <entry-point> \
+  -r <project-root-folder> \
+  [-R <ruby-version>]
+----
+
+The resulting packages will be generated in the current directory as:
+
+* Tebako runtime package at the `-o` location, i.e. `<tebako-runtime-package>`.
+* Tebako application package. The name of the application package will be the
+  same as the runtime package with the `.package` extension.
+
+
+=== Creating a Tebako runtime package
+
+Tebako allows creating a Tebako runtime package that can be used to run a Tebako
+application package.
 
-`<tebako runtime>`::
-The tebako runtime in ```runtime``` or ```both``` mode
+[source,sh]
+----
+$ tebako press -m runtime -o <tebako-runtime-package> [-R <ruby-version>]
+----
+
+[example]
+====
+[source,sh]
+----
+$ tebako press -o tebako-ruby-3.4.1 -R 3.4.1
+# => creates `tebako-ruby-3.4.1`, a Tebako runtime package for Ruby 3.4.1
+----
+====
+
+=== Creating a Tebako application package
 
-`<tebako application>`::
-The tebako application package created in ```application``` or ```both``` mode
+Tebako allows creating a Tebako application package that can be run with a
+Tebako runtime package.
+
+[source,sh]
+----
+$ tebako press -m application \
+    -o <tebako-application-package> \
+    -e <entry-point> \
+    -r <project-root-folder> \
+    [-R <ruby-version>]
+----
 
 [example]
 ====
-Creating separate runtime and application and running it:
+[source,sh]
+----
+$ tebako press -m application \
+    -o tebako-application-package \
+    -e start.rb \
+    -r ~/projects/myproject \
+    -R 3.4.1
+# => creates `tebako-application-package`, a Tebako application package for Ruby 3.4.1
+----
+====
+
+
+=== Running Tebako application using a Tebako runtime (`--tebako-run` option)
+
+The Tebako application package can be executed by a Tebako runtime package.
 
 [source,sh]
 ----
-tebako press -m runtime -o tebako-runtime
-tebako press -m application -o tebako-application -e hello.rb -r test
-tabako-runtime --tebako-run tebako-application Maxim
+$ <tebako-runtime-package> --tebako-run [<tebako-application-package>]
 ----
-where hello.rb is the Ruby application
+
+Where,
+
+`<tebako-runtime-package>`::
+The Tebako runtime package file created using in `runtime` or `both` mode.
+
+`<tebako-application-package>`::
+The Tebako application package created in `application` or `both` mode.
+
+[example]
+====
+Given a Ruby application at `hello.rb`:
+
 [source,Ruby]
 ----
-# frozen_string_literal: true
-
 puts "Hello, #{ARGV[0]}!"
 ----
-And expected output from ```tabako-runtime --tebako-run tebako-application Maxim``` is
+
+Create separate runtime and application packages:
+
+[source,sh]
+----
+tebako press -m runtime -o tebako-runtime-package
+tebako press -m application -o tebako-application-package -e hello.rb -r test
+----
+
+Run the application using the pre-packaged runtime:
+
 [source,sh]
 ----
-Hello, Maxim!
+tebako-runtime-package --tebako-run tebako-application-package Maxim
 ----
 
+The expected output is:
+
+[source]
+----
+Hello, Maxim!
+----
 ====
 
 === Image extraction (`--tebako-extract` option)
 
-Tebako provides an option to an extract its DwarFS filesystem from a package to
+Tebako provides an option to extract its DwarFS filesystem from a package to
 a local folder for verification or execution.
 
 [source,sh]

data/exe/tebako-packager

@@ -67,21 +67,6 @@ begin
     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"
-    #       ARGV[0] -- command
-    #       ARGV[1] -- RUBY_SOURCE_DIR
-    #       ARGV[2] -- APP_NAME
-    #       ARGV[3] -- RUBY_VER
-    #       ARGV[4] -- patchelf executable
-    #       ARGV[5] -- WITH_PATHELF
-    unless ARGV.length == 6
-      raise Tebako::Error,
-            "tebako-packager finalize command expects 6 arguments, #{ARGV.length} has been provided."
-    end
-    ruby_ver = Tebako::RubyVersion.new(ARGV[3])
-    with_patchelf = ARGV[5].casecmp("ON").zero? || ARGV[5].casecmp("YES").zero?
-    Tebako::Packager.finalize(ARGV[1], ARGV[2], ruby_ver, with_patchelf ? ARGV[4] : nil)
   else
     raise Tebako::Error, "tebako-packager cannot process #{ARGV[0]} command"
   end

data/lib/tebako/cli_helpers.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2023-2024 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2023-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -55,18 +55,36 @@ module Tebako
 
     WARN
 
+    WARN2 = <<~WARN
+
+      ******************************************************************************************************************
+      *                                                                                                                *
+      *  WARNING: You are creating packaging environment inside application root.                                      *
+      *  It is not an error but it means that all build-time artifacts will ne included in tebako package.             *
+      *  You do not need it unless under very special circumstances like tebako packaging tebako itself.               *
+      *                                                                                                                *
+      *  Please consider removing your exisitng `--prefix` folder abd use another one that points outside of `--root`  *
+      *  like tebako press --r ~/projects/myproject -e start.rb -o /temp/myproject.tebako -p ~/.tebako                 *
+      *                                                                                                                *
+      ******************************************************************************************************************
+
+    WARN
+
+    def check_warnings(options_manager)
+      return unless options_manager.mode != "runtime"
+
+      puts WARN if options_manager.package_within_root?
+      puts WARN2 if options_manager.prefix_within_root?
+      sleep 5
+    end
+
     def do_press(options_manager)
       scenario_manager = Tebako::ScenarioManager.new(options_manager.root, options_manager.fs_entrance)
       scenario_manager.configure_scenario
       options_manager.process_gemfile(scenario_manager.gemfile_path) if scenario_manager.with_gemfile
-
+      check_warnings(options_manager)
       puts options_manager.press_announce(scenario_manager.msys?)
 
-      if options_manager.package_within_root?
-        puts WARN
-        sleep 5
-      end
-
       do_press_runtime(options_manager, scenario_manager)
       do_press_application(options_manager, scenario_manager)
     end
@@ -85,6 +103,7 @@ module Tebako
       merged_env = ENV.to_h.merge(scenario_manager.b_env)
       Tebako.packaging_error(103) unless system(merged_env, press_cfg_cmd(options_manager))
       Tebako.packaging_error(104) unless system(merged_env, press_build_cmd(options_manager))
+      finalize(options_manager, scenario_manager)
     end
 
     def do_setup(options_manager)
@@ -108,6 +127,13 @@ module Tebako
       Tebako::Codegen.generate_stub_rb(options_manager)
     end
 
+    def finalize(options_manager, scenario_manager)
+      use_patchelf = options_manager.patchelf? && scenario_manager.linux_gnu?
+      patchelf = use_patchelf ? "#{options_manager.deps_bin_dir}/patchelf" : nil
+      Tebako::Packager.finalize(options_manager.ruby_src_dir, options_manager.package,
+                                options_manager.rv, patchelf, options_manager.output_type_first)
+    end
+
     def options_from_tebafile(tebafile)
       ::YAML.load_file(tebafile)["options"] || {}
     rescue Psych::SyntaxError => e

data/lib/tebako/options_manager.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2023-2024 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2023-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -117,6 +117,15 @@ module Tebako
       @deps_lib_dir ||= File.join(deps, "lib")
     end
 
+    def folder_within_root?(folder)
+      folder_path = Pathname.new(folder.chomp("/"))
+      root_path = Pathname.new(root.chomp("/"))
+      folder_path.ascend do |path|
+        return true if path == root_path
+      end
+      false
+    end
+
     def fs_current
       fs_current = Dir.pwd
       if @scmb.msys?
@@ -154,9 +163,17 @@ module Tebako
       @output_folder ||= File.join(prefix, "o")
     end
 
+    def output_type_first
+      @output_type_first ||= %w[both runtime].include?(mode) ? "runtime package" : "package"
+    end
+
+    def output_type_second
+      "application package"
+    end
+
     def package
       package = if @options["output"].nil?
-                  File.join(Dir.pwd, File.basename(fs_entrance, ".*"))
+                  File.join(Dir.pwd, mode == "runtime" ? "tebako-runtime" : File.basename(fs_entrance, ".*"))
                 else
                   @options["output"]&.gsub("\\", "/")
                 end
@@ -168,12 +185,11 @@ module Tebako
     end
 
     def package_within_root?
-      package_path = Pathname.new(package.chomp("/"))
-      root_path = Pathname.new(root.chomp("/"))
-      package_path.ascend do |path|
-        return true if path == root_path
-      end
-      false
+      folder_within_root?(package)
+    end
+
+    def patchelf?
+      @options["patchelf"]
     end
 
     def prefix
@@ -186,6 +202,10 @@ module Tebako
                   end
     end
 
+    def prefix_within_root?
+      folder_within_root?(prefix)
+    end
+
     def press_announce(is_msys)
       case mode
       when "application"

data/lib/tebako/packager.rb

@@ -93,17 +93,17 @@ module Tebako
         patch_map.each { |fname, mapping| PatchHelpers.patch_file("#{root}/#{fname}", mapping) }
       end
 
-      def finalize(src_dir, app_name, ruby_ver, patchelf)
+      def finalize(src_dir, app_name, ruby_ver, patchelf, output_type)
         puts "-- Running finalize script"
 
-        RubyBuilder.new(ruby_ver, src_dir).target_build
+        RubyBuilder.new(ruby_ver, src_dir).target_build(output_type)
         exe_suffix = ScenarioManagerBase.new.exe_suffix
         src_name = File.join(src_dir, "ruby#{exe_suffix}")
         patchelf(src_name, patchelf)
         package_name = "#{app_name}#{exe_suffix}"
         # strip_or_copy(os_type, src_name, package_name)
         Tebako::Stripper.strip_file(src_name, package_name)
-        puts "Created tebako package at \"#{package_name}\""
+        puts "Created tebako #{output_type} at \"#{package_name}\""
       end
 
       # Init

data/lib/tebako/packager_lite.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2023-2024 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2023-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -61,7 +61,7 @@ module Tebako
       deploy
       FileUtils.rm_f(name)
       Tebako::Packager.mkdwarfs(@opts.deps_bin_dir, name, @opts.data_src_dir, codegen)
-      puts "Created tebako package at \"#{name}\""
+      puts "Created tebako #{@opts.output_type_second} at \"#{name}\""
     end
 
     def deploy

data/lib/tebako/ruby_builder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2024-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -50,8 +50,8 @@ module Tebako
     end
 
     # Final build of tebako package
-    def target_build
-      puts "   ... building tebako package"
+    def target_build(output_type)
+      puts "   ... building tebako #{output_type}"
       Dir.chdir(@src_dir) do
         BuildHelpers.run_with_capture(["make", "ruby", "-j#{@ncores}"]) if @ruby_ver.ruby3x?
         BuildHelpers.run_with_capture(["make", "-j#{@ncores}"])

data/lib/tebako/scenario_manager.rb

@@ -66,6 +66,14 @@ module Tebako
       @linux
     end
 
+    def linux_gnu?
+      @linux && !@musl
+    end
+
+    def linux_musl?
+      @linux && @musl
+    end
+
     def m_files
       # [TODO]
       # Ninja generates incorrect script for tebako press target -- gets lost in a chain custom targets

data/lib/tebako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.12.15
+  version: 0.12.16
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-24 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler