tebako 0.7.2.rc1 → 0.7.2.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9814ddc341bfd35eda55c9622169d70a833f244925ca8f5e49e401e0dd73f930
-  data.tar.gz: 2df44f4d1a0c899d6d432f33ec69b5abf6642c0d83621382eb8eb9aec0a08b80
+  metadata.gz: 99a2a477845a6154633205dd8d0420156f97c057cfb820158d0f88e432e09a85
+  data.tar.gz: e8fb206e64c629a058620c9563bd34b274af06f8d14fdaacd7b3ad3788406536
 SHA512:
-  metadata.gz: 1952f88ddc52932de24a43ff8899296021cd91494bdbc45ed9617401fef8a16d25523c45fb8bd9e92c8cba89bb83e528f47111884ecb8e3ab9b9ebb9cb01c4f8
-  data.tar.gz: 1acfc8e2974572083e5d12aa436da559a2c2190fb4598c8190ac7829332d5b1d51af8c652ffb5ef499ae0fbca181bb508ab90c8ece1ae89b5631bd354ec8a495
+  metadata.gz: 78846d4443cdd33781108b1be109b191b8f1398a882083d4c6e4840b5dcaf5a122c60ec887fd3ef3c2a2562355457e1cf7bd4bd1eff96d33b056ff78042a9414
+  data.tar.gz: 5803abbe66b044013d221c3ca3e18f1f7fded575deca85b9b9210b4920488a3d87c5b3314f2fcb3d4c0302b634f48a18cb01c6515e6ee6985f7ece0d023ea336

data/CMakeLists.txt

@@ -216,7 +216,7 @@ if(DWARFS_PRELOAD)
   list(GET LIBDWARFS_WR_VER_COMPONENTS 2 LIBDWARFS_WR_VER_PATCH)
   set (LIBDWARFS_WR_VER_M ${LIBDWARFS_WR_VER_MAJOR}.${LIBDWARFS_WR_VER_MINOR}.${LIBDWARFS_WR_VER_PATCH})
 else(DWARFS_PRELOAD)
-  def_ext_prj_g(DWARFS_WR "v0.5.2")
+  def_ext_prj_g(DWARFS_WR "v0.5.3")
 endif(DWARFS_PRELOAD)
 
 set(LIBYAML_RUBY_OPTION "")

data/README.adoc

@@ -150,55 +150,9 @@ There is no workaround for this issue as it lloks like is a limitation of the ma
 
 === General
 
-Tebako is distributed as a Ruby gem
-
-[source,sh]
-----
-gem install tebako
-----
-
-=== Quick setup on Ubuntu 20.04 on Docker
-
-Launch a container on the target platform:
-
-[source,sh]
-----
-# For x86_64
-docker run -it --platform linux/x86_64 ubuntu bash
-
-# For Apple M1
-docker run -it --platform linux/aarch64 ubuntu bash
-----
-
-In the container:
-
-[source,sh]
-----
-export DEBIAN_FRONTEND=noninteractive
-export TZ=Etc/UTC
-
-apt-get update
-apt-get install -y software-properties-common
-add-apt-repository -y ppa:ubuntu-toolchain-r/test
-apt-get install -y gcc-10 g++-10
-
-apt-get install -y curl git ruby ruby-dev pkg-config bison flex make autoconf
-curl https://apt.kitware.com/kitware-archive.sh | bash
-apt-get install -y cmake
-
-apt-get -y install sudo git curl build-essential pkg-config bison flex autoconf \
-   binutils-dev libevent-dev acl-dev libfmt-dev libjemalloc-dev libiberty-dev    \
-   libdouble-conversion-dev liblz4-dev liblzma-dev libssl-dev libunwind-dev      \
-   libboost-filesystem-dev libboost-program-options-dev libboost-system-dev      \
-   libboost-iostreams-dev  libboost-date-time-dev libboost-context-dev           \
-   libboost-regex-dev libboost-thread-dev libbrotli-dev libdwarf-dev libelf-dev  \
-   libgoogle-glog-dev libffi-dev libgdbm-dev libyaml-dev libncurses-dev          \
-   libreadline-dev libutfcpp-dev libncurses-dev libreadline-dev gcc-10 g++-10    \
-   ruby-dev ruby-bundler
-
-gem install tebako
-
-----
+Tebako is distributed as a Ruby gem.
+Additionally, Docker containers for Ubuntu and Alpine Linux with a preinstalled Tebako packaging environment
+are available at https://github.com/orgs/tamatebako/packages.
 
 == Usage
 
@@ -248,7 +202,8 @@ tebako press     \
   -r|--root=<project-root-folder>     \
   -e|--entry-point=<entry-point>      \
   [-o|--output=<packaged file name>] \
-  [-l|--log-level=<error|warn|debug|trace>]
+  [-l|--log-level=<error|warn|debug|trace>] \
+  [-D|--devmode]
 ----
 
 Where:
@@ -268,6 +223,9 @@ point base name`)
 
 * `log-level`, the logging level for tebako built-in memory filesystem driver (optional, defaults to `error`)
 
+* `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.
+
 [example]
 ====
 [source,sh]
@@ -295,7 +253,8 @@ based on ```tebako setup``` output. Building cache based on ```tebako press``` m
 ----
 tebako setup     \
   [-p |--prefix=<tebako-root-folder>] \
-  [-R |--Ruby=<2.7.8|3.0.7|3.1.4|3.1.5|3.1.6|3.2.3|3.2.4>]
+  [-R |--Ruby=<2.7.8|3.0.7|3.1.4|3.1.5|3.1.6|3.2.3|3.2.4>] \
+  [-D | --devmode]
 ----
 
 Where:
@@ -304,6 +263,9 @@ Where:
 
 * `Ruby` parameter defines Ruby version that will be packaged (optional, defaults to 3.1.6)
 
+* `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
 
 This command deletes tebako artifacts created by setup and press commands.

data/common.env

@@ -1,5 +1,5 @@
 BUILD_TYPE=Release
 DEPS=deps
 INCBIN_TAG=348e36b
-DWARFS_WR_TAG=v0.5.2
+DWARFS_WR_TAG=v0.5.3
 RUBY_VER=3.1.6

data/lib/tebako/cli.rb

@@ -69,7 +69,7 @@ module Tebako
 
     desc "hash", "Print build script hash (ci cache key)"
     def hash
-      print Digest::SHA256.hexdigest File.read File.join(source, "CMakeLists.txt")
+      print Digest::SHA256.hexdigest [File.read(File.join(source, "CMakeLists.txt")), Tebako::VERSION].join
     end
 
     desc "press", "Press tebako image"

data/lib/tebako/cli_helpers.rb

@@ -65,8 +65,14 @@ module Tebako
     end
 
     def clean_output
-      puts "Cleaning CMake cache"
+      puts "Cleaning CMake cache and Ruby build files"
       # Using File.join(output, "") to ensure that the slashes are appropriate
+
+      nmr = "src/_ruby_*"
+      nms = "stash_*"
+      FileUtils.rm_rf(Dir.glob(File.join(deps, nmr)), secure: true)
+      FileUtils.rm_rf(Dir.glob(File.join(deps, nms)), secure: true)
+
       FileUtils.rm_rf(File.join(output, ""), secure: true)
     end
 

data/lib/tebako/version.rb

@@ -26,5 +26,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Tebako
-  VERSION = "0.7.2.rc1"
+  VERSION = "0.7.2.rc3"
 end

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

@@ -42,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, macos-11.0 ]
+        os: [ ubuntu-20.04, macos-12 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -67,7 +67,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, macos-11.0 ]
+        os: [ ubuntu-20.04, macos-12 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -89,7 +89,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, macos-11.0 ]
+        os: [ ubuntu-20.04, macos-12 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -106,7 +106,7 @@ jobs:
 
   test-cross-brew-install:
     name: test arm-brew-setup/install
-    runs-on: macos-11.0
+    runs-on: macos-12
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -122,3 +122,24 @@ jobs:
           set -o errexit -o pipefail -o noclobber -o nounset
           test -f $PWD/arm-homebrew/lib/libgflags.dylib
           test -f $PWD/arm-homebrew/lib/libglog.dylib
+
+  test-macos-environment-script:
+    name: test macos-environment.cmake on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ macos-12, macos-13, 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

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2021-2024, [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tamatebako
 #
@@ -25,14 +25,32 @@
 #
 
 if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
+
+  function(find_and_set_homebrew_prefix package_name pkg_name executable_name)
+    execute_process(
+      COMMAND brew --prefix ${package_name}
+      RESULT_VARIABLE BREW_${pkg_name}_RESULT
+      OUTPUT_VARIABLE BREW_${pkg_name}_PREFIX_TMP
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    if (BREW_${pkg_name}_RESULT EQUAL 0 AND EXISTS "${BREW_${pkg_name}_PREFIX_TMP}")
+      set(BREW_${pkg_name}_PREFIX "${BREW_${pkg_name}_PREFIX_TMP}" CACHE PATH "${package_name} prefix")
+      message(STATUS "Found ${package_name} keg installed by Homebrew at ${BREW_${pkg_name}_PREFIX}")
+      set(${executable_name} "${BREW_${pkg_name}_PREFIX}/bin/${package_name}" CACHE FILEPATH "${executable_name} executable")
+    endif()
+  endfunction()
+
+
   execute_process(
     COMMAND brew --prefix
     RESULT_VARIABLE BREW_PREFIX_RES
-    OUTPUT_VARIABLE BREW_PREFIX
+    OUTPUT_VARIABLE BREW_PREFIX_TMP
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-  if(NOT (BREW_PREFIX_RES EQUAL 0 AND EXISTS ${BREW_PREFIX}))
+  if(NOT (BREW_PREFIX_RES EQUAL 0 AND EXISTS ${BREW_PREFIX_TMP}))
     message(FATAL "Could not find build brew setup")
+  else()
+    set(BREW_PREFIX "${BREW_PREFIX_TMP}" CACHE PATH "Brew installation prefix")
   endif()
 
   message(STATUS "Using brew environment at ${BREW_PREFIX}")
@@ -40,41 +58,12 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
   set(OPENSSL_ROOT_DIR "${BREW_PREFIX}/opt/openssl@3")
   set(CMAKE_PREFIX_PATH "${BREW_PREFIX}")
   include_directories("${OPENSSL_ROOT_DIR}/include")
-  include_directories("${TARGET_BREW_PREFIX}/include")
+  include_directories("${BREW_PREFIX}/include")
 
   #  https://stackoverflow.com/questions/53877344/cannot-configure-cmake-to-look-for-homebrew-installed-version-of-bison
-  execute_process(
-    COMMAND brew --prefix bison
-    RESULT_VARIABLE BREW_BISON
-    OUTPUT_VARIABLE BREW_BISON_PREFIX
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if (BREW_BISON EQUAL 0 AND EXISTS "${BREW_BISON_PREFIX}")
-    message(STATUS "Found Bison keg installed by Homebrew at ${BREW_BISON_PREFIX}")
-    set(BISON_EXECUTABLE "${BREW_BISON_PREFIX}/bin/bison")
-  endif()
-
-  execute_process(
-    COMMAND brew --prefix flex
-    RESULT_VARIABLE BREW_FLEX
-    OUTPUT_VARIABLE BREW_FLEX_PREFIX
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if (BREW_FLEX EQUAL 0 AND EXISTS "${BREW_FLEX_PREFIX}")
-    message(STATUS "Found Flex keg installed by Homebrew at ${BREW_FLEX_PREFIX}")
-    set(FLEX_EXECUTABLE "${BREW_FLEX_PREFIX}/bin/flex")
-  endif()
-
-  execute_process(
-    COMMAND brew --prefix bash
-    RESULT_VARIABLE BREW_BASH
-    OUTPUT_VARIABLE BREW_BASH_PREFIX
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if (BREW_BASH EQUAL 0 AND EXISTS "${BREW_BASH_PREFIX}")
-    message(STATUS "Found GNU bash keg installed by Homebrew at ${BREW_BASH_PREFIX}")
-    set(GNU_BASH "${BREW_BASH_PREFIX}/bin/bash")
-  endif()
+  find_and_set_homebrew_prefix("bison" "BISON" "BISON_EXECUTABLE")
+  find_and_set_homebrew_prefix("flex" "FLEX" "FLEX_EXECUTABLE")
+  find_and_set_homebrew_prefix("bash" "BASH" "GNU_BASH")
 
 # Suppress superfluous randlib warnings about "*.a" having no symbols on MacOSX.
   set(CMAKE_C_ARCHIVE_CREATE   "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")

data/tools/tests/cmake/CMakeLists.txt

@@ -0,0 +1,81 @@
+# Copyright (c) 2024, [Ribose Inc](https://www.ribose.com).
+# All rights reserved.
+# This file is a part of tebako
+#
+# 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.
+
+cmake_minimum_required(VERSION 3.15)
+project(cmake-tests)
+
+
+# Adjust the path to where your macos-environment.cmake is located
+include("${CMAKE_CURRENT_LIST_DIR}/../../cmake-scripts/macos-environment.cmake")
+
+# Function to check if a variable is set (not empty)
+function(check_variable_set VAR_NAME)
+    if(NOT ${VAR_NAME})
+        message(FATAL_ERROR "${VAR_NAME} is not set.")
+    endif()
+endfunction()
+
+# Function to check if a file/directory exists at the path specified by a variable
+function(check_exists VAR_NAME TYPE)
+    if(NOT EXISTS "${${VAR_NAME}}")
+        if(TYPE STREQUAL "FILE")
+            message(FATAL_ERROR "The file specified in ${VAR_NAME} does not exist: ${${VAR_NAME}}")
+        elseif(TYPE STREQUAL "DIRECTORY")
+            message(FATAL_ERROR "The directory specified in ${VAR_NAME} does not exist: ${${VAR_NAME}}")
+        endif()
+    endif()
+endfunction()
+
+message(STATUS "BREW_PREFIX: ${BREW_PREFIX}")
+check_variable_set(BREW_PREFIX)
+check_exists(BREW_PREFIX DIRECTORY)
+
+message(STATUS "OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
+check_variable_set(OPENSSL_ROOT_DIR)
+check_exists(OPENSSL_ROOT_DIR DIRECTORY)
+
+message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
+check_variable_set(CMAKE_PREFIX_PATH)
+check_exists(CMAKE_PREFIX_PATH DIRECTORY)
+
+message(STATUS "BREW_BISON_PREFIX: ${BREW_BISON_PREFIX}")
+check_variable_set(BREW_BISON_PREFIX)
+check_exists(BREW_BISON_PREFIX DIRECTORY)
+
+message(STATUS "BREW_FLEX_PREFIX: ${BREW_FLEX_PREFIX}")
+check_variable_set(BREW_FLEX_PREFIX)
+check_exists(BREW_FLEX_PREFIX DIRECTORY)
+
+message(STATUS "FLEX_EXECUTABLE: ${FLEX_EXECUTABLE}")
+check_variable_set(FLEX_EXECUTABLE)
+check_exists(FLEX_EXECUTABLE FILE)
+
+message(STATUS "BREW_BASH_PREFIX: ${BREW_BASH_PREFIX}")
+check_variable_set(BREW_BASH_PREFIX)
+check_exists(BREW_BASH_PREFIX DIRECTORY)
+
+message(STATUS "GNU_BASH: ${GNU_BASH}")
+check_variable_set(GNU_BASH)
+check_exists(GNU_BASH FILE)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.7.2.rc1
+  version: 0.7.2.rc3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-01 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -103,6 +103,7 @@ files:
 - tools/cmake-scripts/setup-openssl.cmake
 - tools/cmake-scripts/version.cmake
 - tools/include/pro-statvfs.h
+- tools/tests/cmake/CMakeLists.txt
 - tools/tests/setup-libhowardhinnerdate/CMakeLists.txt
 - tools/tests/setup-librachive/CMakeLists.txt
 - tools/tests/setup-libutfcpp/CMakeLists.txt