tebako 0.12.15 → 0.13.0

data/Rakefile

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2023-2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/cmake/copy_dir.cmake

@@ -1,6 +1,6 @@
 # Copyright (c) 2021, [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/common.env

@@ -1,5 +1,5 @@
 BUILD_TYPE=Release
 DEPS=deps
 INCBIN_TAG=348e36b
-DWARFS_WR_TAG=v0.9.7
+DWARFS_WR_TAG=v0.10.1
 RUBY_VER=3.3.7

data/exe/tebako

@@ -3,7 +3,7 @@
 
 # Copyright (c) 2023 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/exe/tebako-packager

@@ -3,7 +3,7 @@
 
 # Copyright (c) 2023-2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -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/include/tebako/tebako-fs.h

@@ -2,7 +2,7 @@
  *
  * Copyright (c) 2021-2024, [Ribose Inc](https://www.ribose.com).
  * All rights reserved.
- * This file is a part of tebako
+ * This file is a part of the Tebako project.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

data/include/tebako/tebako-main.h

@@ -2,7 +2,7 @@
  *
  * Copyright (c) 2021-2024, [Ribose Inc](https://www.ribose.com).
  * All rights reserved.
- * This file is a part of tebako
+ * This file is a part of the Tebako project.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

data/lib/tebako/build_helpers.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2023-2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/cache_manager.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/cli.rb

@@ -3,7 +3,7 @@
 
 # Copyright (c) 2021-2023 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/cli_helpers.rb

@@ -1,8 +1,8 @@
 # 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
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -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/codegen.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/deploy_helper.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -110,12 +110,13 @@ module Tebako
     private
 
     def bundle_config
-      BuildHelpers.run_with_capture_v([@bundler_command, bundler_reference, "config", "set", "--local", "build.ffi",
-                                       "--disable-system-libffi"])
-      BuildHelpers.run_with_capture_v([@bundler_command, bundler_reference, "config",
-                                       "set", "--local", "build.nokogiri", @nokogiri_option])
-      BuildHelpers.run_with_capture_v([@bundler_command, bundler_reference, "config",
-                                       "set", "--local", "force_ruby_platform", @force_ruby_platform])
+      bundle_config_option(["build.ffi", "--disable-system-libffi"])
+      bundle_config_option(["build.nokogiri", @nokogiri_option])
+      bundle_config_option(["force_ruby_platform", @force_ruby_platform])
+    end
+
+    def bundle_config_option(opt)
+      BuildHelpers.run_with_capture_v([@bundler_command, bundler_reference, "config", "set", "--local"] + opt)
     end
 
     def check_entry_point(entry_point_root)

data/lib/tebako/error.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2023-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/options_manager.rb

@@ -1,8 +1,8 @@
 # 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
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -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/package_descriptor.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2023-2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/packager/pass1_patch.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2021-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/packager/pass1a_patch.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2024-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/packager/pass2_patch.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2021-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/packager/pass2_patch_crt.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2021-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/packager/pass2msys_patch.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2021-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/packager/patch.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/packager/patch_buildsystem.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2023-2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/packager/patch_helpers.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2023-2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/packager/patch_libraries.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2021-2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/packager/patch_literals.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2023-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/packager/patch_main.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2023-2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/packager/rubygems_patch.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2024-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/packager.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2021-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -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,8 +1,8 @@
 # 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
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -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,8 +1,8 @@
 # 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
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -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/ruby_version.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2023-2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -45,7 +45,8 @@ module Tebako
       "3.3.5" => "3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196",
       "3.3.6" => "8dc48fffaf270f86f1019053f28e51e4da4cce32a36760a0603a9aee67d7fd8d",
       "3.3.7" => "9c37c3b12288c7aec20ca121ce76845be5bb5d77662a24919651aaf1d12c8628",
-      "3.4.1" => "3d385e5d22d368b064c817a13ed8e3cc3f71a7705d7ed1bae78013c33aa7c87f"
+      "3.4.1" => "3d385e5d22d368b064c817a13ed8e3cc3f71a7705d7ed1bae78013c33aa7c87f",
+      "3.4.2" => "41328ac21f2bfdd7de6b3565ef4f0dd7543354d37e96f157a1552a6bd0eb364b"
     }.freeze
 
     MIN_RUBY_VERSION_WINDOWS = "3.1.6"

data/lib/tebako/scenario_manager.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2024-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -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/stripper.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2024-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/tebako/version.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2023-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -26,5 +26,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Tebako
-  VERSION = "0.12.15"
+  VERSION = "0.13.0"
 end

data/lib/tebako.rb

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2023 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/src/tebako-main.cpp

@@ -2,7 +2,7 @@
  *
  * Copyright (c) 2021-2024 [Ribose Inc](https://www.ribose.com).
  * All rights reserved.
- * This file is a part of tebako
+ * This file is a part of the Tebako project.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

data/tebako.gemspec

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2023 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
-# This file is a part of tebako
+# This file is a part of the Tebako project.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions