tebako 0.13.4 → 0.15.0

data/tools/.github/workflows/test.yml

@@ -1,4 +1,4 @@
-# Copyright (c) 2024-2025, [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 the Tebako project.
 #
@@ -28,7 +28,13 @@ name: test
 on:
   push:
     branches: [ master, main ]
+    paths-ignore:
+      - 'docker/**'
+      - '.github/workflows/build-containers.yml'
   pull_request:
+    paths-ignore:
+      - 'docker/**'
+      - '.github/workflows/build-containers.yml'
   workflow_dispatch:
 
 concurrency:
@@ -42,7 +48,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-13, macos-14 ]
+        os: [ macos-14 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -130,7 +136,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-13, macos-14 ]
+        os: [ macos-14 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -144,7 +150,6 @@ jobs:
         run: |
           set -o errexit -o pipefail -o noclobber -o nounset
           test -f build/setup-librachive/deps/lib/pkgconfig/libarchive.pc
-          test -f build/setup-librachive/deps/lib/libarchive.so || test -f build/setup-librachive/deps/lib/libarchive.dylib
           test -f build/setup-librachive/deps/lib/libarchive.a
           test -f build/setup-librachive/deps/include/archive.h
           test -f build/setup-librachive/deps/include/archive_entry.h
@@ -178,7 +183,6 @@ jobs:
         run: |
           set -o errexit -o pipefail -o noclobber -o nounset
           test -f build/setup-librachive/deps/lib/pkgconfig/libarchive.pc
-          test -f build/setup-librachive/deps/lib/libarchive.so || test -f build/setup-librachive/deps/lib/libarchive.dylib
           test -f build/setup-librachive/deps/lib/libarchive.a
           test -f build/setup-librachive/deps/include/archive.h
           test -f build/setup-librachive/deps/include/archive_entry.h
@@ -189,7 +193,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-13, macos-14 ]
+        os: [ macos-14 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -241,7 +245,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-13, macos-14 ]
+        os: [ macos-14 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -287,7 +291,8 @@ jobs:
 
   test-cross-brew-install:
     name: test arm-brew-setup/install
-    runs-on: macos-13
+    runs-on: macos-14
+    continue-on-error: true
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -310,40 +315,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-13, macos-14 ]
+        os: [ macos-14 ]
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Checkout
+        uses: actions/checkout@v4
+
       - name: Install packages
         run: brew install flex bison bash
 
       - name: Run CMake test
         run: cmake -B test.build -S tests/cmake
-
-  test-setup-openssl-alpine:
-    name: test openssl 1.1.1 setup on alpine
-    runs-on: ubuntu-latest
-    container:
-      image: 'ghcr.io/${{ github.repository_owner }}/tebako-alpine-3.17-dev'
-
-    steps:
-      - name: Install packages
-        run: |
-          apk --no-cache --upgrade add git bash cmake make build-base autoconf binutils-dev linux-headers
-          git config --global --add safe.directory $PWD
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Run cmake script
-        run: |
-          cmake -B build/setup-openssl tests/setup-openssl
-          cmake --build build/setup-openssl
-
-      - name: Test
-        run: |
-          set -o errexit -o pipefail -o noclobber -o nounset
-          v=$(build/setup-openssl/deps/bin/openssl version)
-          [ "$v" = "OpenSSL 1.1.1w  11 Sep 2023" ]

data/tools/ci-scripts/arm-brew-install.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 #
-# Copyright (c) 2022, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2022-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of the Tebako project.
 #

data/tools/ci-scripts/arm-brew-setup.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 #
-# Copyright (c) 2022, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2022-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of the Tebako project.
 #

data/tools/ci-scripts/level-up.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 #
-# Copyright (c) 2022, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2022-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of the Tebako project.
 #

data/tools/ci-scripts/{patch-fbthrift.sh → patch-glog.sh}

@@ -1,5 +1,5 @@
 #! /bin/bash
-# Copyright (c) 2022,2024 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of the Tebako project.
 #
@@ -52,27 +52,6 @@ else
   exit 1
 fi
 
-if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
-  re="ftruncate(file\.fd(), finalBufferSize),"
-  sbst="folly::portability::unistd::ftruncate(file.fd(), finalBufferSize), \/* tebako patched *\/"
-  do_patch "$1/thrift/lib/cpp2/frozen/FrozenUtil.h" "$re" "$sbst"
-
-  re="if (detail::platform_is_windows()) {"
-  sbst="if (false) { \/* tebako patched *\/"
-  do_patch "$1/thrift/compiler/source_location.cc" "$re" "$sbst"
-
-  re="#include <fmt\/fmt-format\.h>"
- # shellcheck disable=SC2251
-! IFS= read -r -d '' sbst << EOM
-#include <fmt\/format.h>
-
-\/* -- Start of tebako patch -- *\/
-#include <fmt\/fmt-ranges.h>
-\/* -- End of tebako patch -- *\/
-EOM
-
-do_patch_multiline "$1/thrift/compiler/lib/cpp2/util.h" "$re" "$sbst"
-do_patch_multiline "$1/thrift/compiler/gen/cpp/namespace_resolver.cc" "$re" "$sbst"
-do_patch_multiline "$1/thrift/compiler/ast/t_const_value.h" "$re" "$sbst"
-
-fi
+re="cmake_policy (VERSION 3.3)"
+sbst="cmake_policy (VERSION 3.16...3.27)"
+do_patch "$1/cmake/GetCacheVariables.cmake"  "$re" "$sbst"

data/tools/ci-scripts/patch-zstd.sh

@@ -0,0 +1,57 @@
+#! /bin/bash
+# Copyright (c) 2025 [Ribose Inc](https://www.ribose.com).
+# All rights reserved.
+# 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
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+set -o errexit -o pipefail -o noclobber -o nounset
+
+# ....................................................
+restore_and_save() {
+  echo "Patching $1"
+  test -e "$1.old" && cp -f "$1.old" "$1"
+  cp -f "$1" "$1.old"
+}
+
+do_patch() {
+  restore_and_save "$1"
+  "$gSed" -i "s/$2/$3/g" "$1"
+}
+
+do_patch_multiline() {
+  restore_and_save "$1"
+  "$gSed" -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1"
+}
+
+if [[ "$OSTYPE" == "linux-gnu"* || "$OSTYPE" == "linux-musl"* || "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
+  gSed="sed"
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+  gSed="gsed"
+else
+  echo "Unknown OSTYPE=$OSTYPE"
+  exit 1
+fi
+
+re="cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)"
+sbst="cmake_minimum_required(VERSION 3.24.0)"
+do_patch "$1/build/cmake/CMakeLists.txt"  "$re" "$sbst"

data/tools/ci-scripts/tools.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2023, [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 the Tebako project.
 #

data/tools/ci-scripts/x86-brew-install.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 #
-# Copyright (c) 2022, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2022-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of the Tebako project.
 #

data/tools/ci-scripts/x86-brew-setup.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 #
-# Copyright (c) 2022, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2022-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of the Tebako project.
 #

data/tools/cmake-scripts/def-external-project.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2022 [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 the Tebako project.
 #

data/tools/cmake-scripts/macos-environment.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2025, [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 the Tebako project.
 #
@@ -59,9 +59,18 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
     set(OPENSSL_VERSION "3")
   endif()
   set(OPENSSL_ROOT_DIR "${BREW_PREFIX}/opt/openssl@${OPENSSL_VERSION}")
+
+  # IMPORTANT: Set CMAKE_PREFIX_PATH but do NOT add Homebrew include directories
+  # globally. vcpkg provides our dependencies and its includes must take precedence.
+  # Homebrew's include paths would conflict with vcpkg packages (e.g., dwarfs).
+  # Only add specific Homebrew package includes when explicitly needed via target_*
+  # functions, not global include_directories().
+  #
+  # Previously this file had:
+  #   include_directories("${OPENSSL_ROOT_DIR}/include")
+  #   include_directories("${BREW_PREFIX}/include")
+  # These caused Homebrew's dwarfs headers to shadow vcpkg's newer dwarfs headers.
   set(CMAKE_PREFIX_PATH "${BREW_PREFIX}")
-  include_directories("${OPENSSL_ROOT_DIR}/include")
-  include_directories("${BREW_PREFIX}/include")
 
   #  https://stackoverflow.com/questions/53877344/cannot-configure-cmake-to-look-for-homebrew-installed-version-of-bison
   find_and_set_homebrew_prefix("bison" "BISON" "BISON_EXECUTABLE")

data/tools/cmake-scripts/msys-environment.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2022, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2022-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of the Tebako project.
 #

data/tools/cmake-scripts/setup-libarchive.cmake

@@ -23,7 +23,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-def_ext_prj_t(LIBARCHIVE "3.6.2" "9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d")
+def_ext_prj_t(LIBARCHIVE "3.7.9" "ed8b5732e4cd6e30fae909fb945cad8ff9cb7be5c6cdaa3944ec96e4a200c04c")
 
 message(STATUS "Collecting libarchive - " v${LIBARCHIVE_VER} " at " ${LIBARCHIVE_SOURCE_DIR})
 
@@ -74,15 +74,11 @@ endif(DEFINED TEBAKO_BUILD_TARGET)
   # Method #1 is implemented here.
   # ...................................................................
 
-if(${IS_MSYS})
-  set(__LIBARCHIVE "${DEPS}/lib/libarchive_static.a")
-else(${IS_MSYS})
-  set(__LIBARCHIVE "${DEPS}/lib/libarchive.a")
-endif(${IS_MSYS})
+set(__LIBARCHIVE "${DEPS}/lib/libarchive.a")
 
 ExternalProject_Add(${LIBARCHIVE_PRJ}
   PREFIX "${DEPS}"
-  URL http://www.libarchive.org/downloads/libarchive-${LIBARCHIVE_VER}.tar.xz
+  URL https://www.libarchive.org/downloads/libarchive-${LIBARCHIVE_VER}.tar.xz
   URL_HASH SHA256=${LIBARCHIVE_HASH}
   DOWNLOAD_NO_PROGRESS true
   UPDATE_COMMAND ""

data/tools/cmake-scripts/setup-libfmt.cmake

@@ -1,4 +1,4 @@
-# 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 the Tebako project.
 #

data/tools/cmake-scripts/setup-libhowardhinnerdate.cmake

@@ -1,4 +1,4 @@
-# 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 the Tebako project.
 #

data/tools/cmake-scripts/version.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2021 Ribose Inc.
+# Copyright (c) 2018-2025 Ribose Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

data/tools/dwarfs-test-helper/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2025, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of the Tebako project.
 #

data/tools/include/pro-statvfs.h

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (c) 2022, [Ribose Inc](https://www.ribose.com).
+ * Copyright (c) 2022-2025 [Ribose Inc](https://www.ribose.com).
  * All rights reserved.
  * This file is a part of the Tebako project. (libdwarfs-wr)
  *

data/tools/tests/cmake/CMakeLists.txt

@@ -1,4 +1,4 @@
-# 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 the Tebako project.
 #

data/tools/tests/setup-libfmt/CMakeLists.txt

@@ -1,4 +1,4 @@
-# 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 the Tebako project.
 #

data/tools/tests/setup-libhowardhinnerdate/CMakeLists.txt

@@ -1,4 +1,4 @@
-# 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 the Tebako project.
 #

data/tools/tests/setup-librachive/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2024, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2024-2025
 # All rights reserved.
 # This file is a part of the Tebako project.
 #

data/tools/tests/setup-libutfcpp/CMakeLists.txt

@@ -1,4 +1,4 @@
-# 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 the Tebako project.
 #

data/tools/tests/setup-openssl/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2025, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2025-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of the Tebako project.
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.15.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-02 00:00:00.000000000 Z
+date: 2026-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -203,12 +203,14 @@ files:
 - bin/console
 - bin/setup
 - cmake/copy_dir.cmake
+- cmake/tebako-libtfs.cmake
 - common.env
 - exe/tebako
 - exe/tebako-packager
 - include/tebako/tebako-fs.h
 - include/tebako/tebako-main.h
 - include/tebako/tebako-prism.h
+- include/tebako/tpkg.h
 - lib/tebako.rb
 - lib/tebako/build_helpers.rb
 - lib/tebako/cache_manager.rb
@@ -217,6 +219,7 @@ files:
 - lib/tebako/codegen.rb
 - lib/tebako/deploy_helper.rb
 - lib/tebako/error.rb
+- lib/tebako/launcher_abi.rb
 - lib/tebako/options_manager.rb
 - lib/tebako/package_descriptor.rb
 - lib/tebako/packager.rb
@@ -235,7 +238,9 @@ files:
 - lib/tebako/packager_lite.rb
 - lib/tebako/ruby_builder.rb
 - lib/tebako/ruby_version.rb
+- lib/tebako/runtime_manager.rb
 - lib/tebako/scenario_manager.rb
+- lib/tebako/stitcher.rb
 - lib/tebako/stripper.rb
 - lib/tebako/version.rb
 - src/tebako-main.cpp
@@ -249,8 +254,8 @@ files:
 - tools/ci-scripts/arm-brew-install.sh
 - tools/ci-scripts/arm-brew-setup.sh
 - tools/ci-scripts/level-up.sh
-- tools/ci-scripts/patch-fbthrift.sh
-- tools/ci-scripts/patch-folly.sh
+- tools/ci-scripts/patch-glog.sh
+- tools/ci-scripts/patch-zstd.sh
 - tools/ci-scripts/tools.sh
 - tools/ci-scripts/x86-brew-install.sh
 - tools/ci-scripts/x86-brew-setup.sh
@@ -261,7 +266,6 @@ files:
 - tools/cmake-scripts/setup-libfmt.cmake
 - tools/cmake-scripts/setup-libhowardhinnerdate.cmake
 - tools/cmake-scripts/setup-libutfcpp.cmake
-- tools/cmake-scripts/setup-openssl-1.1.1.cmake
 - tools/cmake-scripts/version.cmake
 - tools/docker/alpine-3.17-dev.Dockerfile
 - tools/docker/tools/tools.sh