tebako 0.5.0 → 0.5.2

data/lib/tebako/packager.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 # Copyright (c) 2021-2023 [Ribose Inc](https://www.ribose.com).
@@ -36,18 +35,24 @@ require_relative "packager/pass2"
 module Tebako
   # Tebako packaging support (internal)
   module Packager
-    FILES_TO_RESTORE = [
-      "main.c",     "dir.c",     "dln.c",
-      "file.c",     "io.c",      "tool/mkconfig.rb"
+    FILES_TO_RESTORE = %w[
+      main.c
+      dir.c
+      dln.c
+      file.c
+      io.c
+      tool/mkconfig.rb
     ].freeze
 
-    FILES_TO_RESTORE_MSYS = [
-      "ruby.c",        "win32/win32.c",
-      "win32/file.c",  "win32/dir.h"
+    FILES_TO_RESTORE_MSYS = %w[
+      ruby.c
+      win32/win32.c
+      win32/file.c
+      win32/dir.h
     ].freeze
 
-    FILES_TO_RESTORE_MUSL = [
-      "thread_pthread.c"
+    FILES_TO_RESTORE_MUSL = %w[
+      thread_pthread.c
     ].freeze
 
     class << self
@@ -84,7 +89,7 @@ module Tebako
         #        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 TebakoError.new("stash [make install] failed with code #{st.exitstatus}") if st.exitstatus != 0
+        #        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}"
@@ -111,7 +116,7 @@ module Tebako
       end
 
       def restore_and_save(fname)
-        raise TebakoError, "Could not save #{fname} because it does not exist." unless File.exist?(fname)
+        raise Tebako::Error, "Could not save #{fname} because it does not exist." unless File.exist?(fname)
 
         old_fname = "#{fname}.old"
         if File.exist?(old_fname)
@@ -128,7 +133,7 @@ module Tebako
       end
 
       def patch_file(fname, mapping)
-        raise TebakoError, "Could not patch #{fname} because it does not exist." unless File.exist?(fname)
+        raise Tebako::Error, "Could not patch #{fname} because it does not exist." unless File.exist?(fname)
 
         puts "   ... patching #{fname}"
         restore_and_save(fname)
@@ -143,68 +148,3 @@ module Tebako
     end
   end
 end
-
-begin
-  unless ARGV.length.positive?
-    raise Tebako::TebakoError, "Tebako script needs at least 1 arguments (command), none has been provided."
-  end
-
-  case ARGV[0]
-  when "pass1"
-    #       ARGV[0] -- command
-    #       ARGV[1] -- OSTYPE
-    #       ARGV[2] -- RUBY_SOURCE_DIR
-    #       ARGV[3] -- FS_MOUNT_POINT
-    #       ARGV[4] -- DATA_SRC_DIR
-    #       ARGV[5] -- RUBY_VER
-    unless ARGV.length == 6
-      raise Tebako::TebakoError,
-            "pass1 script expects 6 arguments, #{ARGV.length} has been provided."
-    end
-
-    Tebako::Packager.pass1(ARGV[1], ARGV[2], ARGV[3], ARGV[4], ARGV[5])
-  when "stash"
-    #       ARGV[0] -- command
-    #       ARGV[1] -- DATA_SRC_DIR
-    #       ARGV[2] -- RUBY_STASH_DIR
-    unless ARGV.length == 3
-      raise Tebako::TebakoError,
-            "stash script expects 3 arguments, #{ARGV.length} has been provided."
-    end
-
-    Tebako::Packager.stash(ARGV[1], ARGV[2])
-  when "pass2"
-    #       ARGV[0] -- command
-    #       ARGV[1] -- OSTYPE
-    #       ARGV[2] -- RUBY_SOURCE_DIR
-    #       ARGV[3] -- DEPS_LIB_DIR
-    #       ARGV[4] -- DATA_SRC_DIR
-    #       ARGV[5] -- RUBY_STASH_DIR
-    #       ARGV[6] -- RUBY_VER
-    unless ARGV.length == 7
-      raise Tebako::TebakoError,
-            "pass1 script expects 7 arguments, #{ARGV.length} has been provided."
-    end
-
-    Tebako::Packager.stash(ARGV[4], ARGV[5])
-    Tebako::Packager.pass2(ARGV[1], ARGV[2], ARGV[3], ARGV[6])
-  when "deploy"
-    #       ARGV[0] -- command
-    #       ARGV[1] -- FS_STASH_DIR
-    #       ARGV[2] -- DATA_SRC_DIR
-    #       ARGV[3] -- DATA_PRE_DIR
-    #       ARGV[4] -- DATA_BIN_DIR
-    unless ARGV.length == 5
-      raise Tebako::TebakoError,
-            "deploy script expects 5 arguments, #{ARGV.length} has been provided."
-    end
-    Tebako::Packager.deploy(ARGV[1], ARGV[2], ARGV[3], ARGV[4])
-  else
-    raise Tebako::TebakoError, "Tebako script cannot process #{ARGV[0]} command"
-  end
-rescue Tebako::TebakoError => e
-  puts "Tebako script failed: #{e.message} [#{e.error_code}]"
-  exit(e.error_code)
-end
-
-exit(0)

data/lib/tebako/version.rb

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

data/lib/{cli.rb → tebako.rb}

@@ -25,4 +25,10 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require_relative "tebako/cli"
+# Tebako - an executable packager
+# Core module
+module Tebako
+end
+
+require_relative "tebako/version"
+require_relative "tebako/error"

data/tebako.gemspec

@@ -54,6 +54,9 @@ Gem::Specification.new do |spec|
         f.match(%r{\A(?:(?:test|spec|features|deps|output|common\.env)/|\.(?:git|cirrus|tebako|rubocop))})
     end
   end
+
+  spec.files << "version.txt"
+
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = %w[cmake exe ext include lib resources src tools/ci-scripts tools/cmake-scripts tools/includes]

data/tests-2/tebako-test.rb

@@ -268,11 +268,12 @@ class TebakoTest < MiniTest::Test
   # -- that we are linking to known set of shared libraries (https://github.com/tamatebako/tebako/issues/42)
 
   def expected_libs
-    if RbConfig::CONFIG["target_os"] =~ /darwin/
+    case RbConfig::CONFIG["target_os"]
+    when /darwin/
       ["Security.framework", "Foundation.framework", "CoreFoundation.framework", "libSystem",
        "libc++", "launcher-package-package:"]
     # This is the test program itself: 'launcher-package-package:'
-    elsif RbConfig::CONFIG["target_os"] =~ /linux-musl/
+    when /linux-musl/
       ["libc.musl-x86_64.so", "ld-musl-x86_64.so"]
     else # linux-gnu assumed
       ["linux-vdso.so", "libpthread.so", "libdl.so", "libc.so", "ld-linux-", "libm.so",

data/tools/.gitattributes

@@ -0,0 +1,4 @@
+*.giattributes text eol=lf
+*.sh text eol=lf
+*.cmake text eol=lf
+*.h text eol=lf

data/tools/.github/workflows/lint.yml

@@ -0,0 +1,41 @@
+# Copyright (c) 2022, [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.
+
+name: lint
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  shellcheck:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ludeeus/action-shellcheck@master
+        env:
+          SHELLCHECK_OPTS: -x

data/tools/README.md

@@ -0,0 +1,5 @@
+[![lint](https://github.com/tamatebako/macos-cross-compile/actions/workflows/lint.yml/badge.svg)](https://github.com/tamatebako/macos-cross-compile/actions/workflows/lint.yml)
+
+## Tebako portability tools ##
+
+This repository contains cmake, shell scripts and include files aimed to support tebako builds on different platforms.

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

@@ -0,0 +1,43 @@
+#! /bin/bash
+#
+# Copyright (c) 2022, [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.
+
+set -o errexit -o pipefail -o noclobber -o nounset
+
+# for zsh
+# https://stackoverflow.com/questions/6715388/variable-expansion-is-different-in-zsh-from-that-in-bash
+# setopt sh_word_split
+
+DIR0="$( cd "$1" && pwd )"
+DIR1="$DIR0/arm-homebrew"
+
+for bottle in "${@:2}"
+do
+    echo "Installing $bottle"
+    response=$("$DIR1/bin/brew" fetch --force --bottle-tag=arm64_big_sur "$bottle" | grep "Downloaded to")
+    IFS=" " read -r -a parsed <<< "$response"
+    "$DIR1/bin/brew" install "${parsed[2]}"
+done

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

@@ -0,0 +1,33 @@
+#! /bin/bash
+#
+# Copyright (c) 2022, [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.
+
+set -o errexit -o pipefail -o noclobber -o nounset
+
+DIR0="$( cd "$1" && pwd )"
+DIR1="$DIR0/arm-homebrew"
+mkdir "$DIR1"
+curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C "$DIR1"

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

@@ -0,0 +1,35 @@
+#! /bin/bash
+#
+# Copyright (c) 2022, [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.
+
+set -o errexit -o pipefail -o noclobber -o nounset
+
+# for zsh
+# https://stackoverflow.com/questions/6715388/variable-expansion-is-different-in-zsh-from-that-in-bash
+# setopt sh_word_split
+
+DIR0="$( cd "$1" && pwd )"
+echo "$DIR0"

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

@@ -0,0 +1,92 @@
+#! /bin/bash
+# Copyright (c) 2022, [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.
+
+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"
+  sed -i "s/$2/$3/g" "$1"
+}
+
+# ....................................................
+# Surprise, surprise ... Upstream project shall found boost libraries for fbthrift
+# https://github.com/facebook/fbthrift/commit/c23af9dee42374d43d2f10e0e07edf1c1c97c328
+
+
+if [[ "$OSTYPE" == "linux-gnu"* || "$OSTYPE" == "linux-musl"* || "$OSTYPE" == "msys" ]]; then
+  gSed="sed"
+# shellcheck disable=SC2251
+! IFS= read -r -d '' sbst << EOM
+find_package(OpenSSL REQUIRED)
+# -- Start of tebako patch --
+find_package(Boost 1.65 REQUIRED COMPONENTS filesystem)
+include_directories(\${Boost_INCLUDE_DIRS})
+# -- End of tebako patch --
+EOM
+
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+  gSed="gsed"
+
+# shellcheck disable=SC2251
+! IFS= read -r -d '' sbst << EOM
+find_package(OpenSSL REQUIRED)
+# -- Start of tebako patch --
+find_package(Boost 1.65 REQUIRED COMPONENTS filesystem)
+include_directories(\${Boost_INCLUDE_DIRS})
+# Suppress superfluous randlib warnings about \"*.a\" having no symbols on MacOSX.
+set(CMAKE_C_ARCHIVE_CREATE   \"<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>\")
+set(CMAKE_CXX_ARCHIVE_CREATE \"<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>\")
+set(CMAKE_C_ARCHIVE_FINISH   \"<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>\")
+set(CMAKE_CXX_ARCHIVE_FINISH \"<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>\")
+# -- End of tebako patch --
+EOM
+
+else
+  echo "Unknown OSTYPE=$OSTYPE"
+  exit 1
+fi
+
+restore_and_save "$1/CMakeLists.txt"
+re="find_package(OpenSSL REQUIRED)"
+"$gSed" -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1/CMakeLists.txt"
+
+if [[ "$OSTYPE" == "msys" ]]; then
+  re="if(WIN32)"
+  sbst="if(MSVC) # tebako patched"
+  do_patch "$1/thrift/compiler/CMakeLists.txt" "$re" "$sbst"
+
+  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"
+
+fi