tebako 0.6.2 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d208b7629dd786cecb0861c1958099047988c471122286028d7b1ca047df3c33
-  data.tar.gz: 7246a876406c06abd60d05808d5686844f8bd3fda1c4a69384b3d4aaaab513d7
+  metadata.gz: 6801b020721b24c392eeaa2bd9d90d0a9956f9e58f9be52923b09e88ace99921
+  data.tar.gz: 6b9ca98620896137036801269a5f2b741842679d237fa926912fa61f15454e12
 SHA512:
-  metadata.gz: fa0eef41e50f5aa1fc52010c221004d7e5b038ae0b98a293e3731ce4a742e7e4ea8dcc7c166bb937dd8d74ec78573a88d63ee46e2028d5c71e41c05e1aa5f350
-  data.tar.gz: 78a564e010d2892bf0243de1b2b90c86bbe2c727f75196629132ee867b8f7116bb874044ec705cd6fc154ed85059a450773a38975c5d1f5d4c90d494055fa26a
+  metadata.gz: 7fc14c5e8bc6866bdc6249821a0ffd647484838083f8a28de9e61d2cc6224968c202eb0eefcf1afc393e2db31cbc42da0b72e95ca8eb1dc48b81fde7524316ff
+  data.tar.gz: 9629168174744693f2400108ec2a446fda1ed9aafc3db47e0d84357e9a99cb34bc814ca49b639508dc3c8f0950a9a29ed2ee735d720357c985906f1f804d6af1

data/CMakeLists.txt

@@ -214,7 +214,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.1")
+  def_ext_prj_g(DWARFS_WR "v0.5.2")
 endif(DWARFS_PRELOAD)
 
 set(LIBYAML_RUBY_OPTION "")

data/README.adoc

@@ -5,7 +5,6 @@ image:https://github.com/tamatebako/tebako/actions/workflows/alpine.yml/badge.sv
 image:https://github.com/tamatebako/tebako/actions/workflows/macos.yml/badge.svg["MacOS amd64", link="https://github.com/tamatebako/tebako/actions/workflows/macos.yml"]
 image:https://github.com/tamatebako/tebako/actions/workflows/windows-msys.yml/badge.svg["Windows msys", link="https://github.com/tamatebako/tebako/actions/workflows/windows-msys.yml"]
 
-image:https://api.cirrus-ci.com/github/tamatebako/tebako.svg?branch=main&task=macos-arm64["MacOS arm64", link="https://cirrus-ci.com/github/tamatebako/tebako"]
 image:https://api.cirrus-ci.com/github/tamatebako/tebako.svg?branch=main&task=ubuntu-aarch64["Ubuntu aarch64", link="https://cirrus-ci.com/github/tamatebako/tebako"]
 
 image:https://github.com/tamatebako/tebako/actions/workflows/lint.yml/badge.svg["lint", link="https://github.com/tamatebako/tebako/actions/workflows/lint.yml"]
@@ -36,7 +35,7 @@ In the future:
 The Tebako packager is tested on the following platforms:
 
 * Linux: Ubuntu 20.04; Alpine 3.17
-* MacOS: macOS 12 (Monterey), 13 (Ventura)
+* MacOS: macOS 12 (Monterey), 13 (Ventura), 14 (Sonoma)
 * Windows: 2019, 2022 (using MinGW ucrt64 toolchain)
 
 Please note that Windows support is in pre-release and is a subject of further testing and optimization

data/common.env

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

data/lib/tebako/version.rb

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

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

@@ -1,5 +1,5 @@
 #! /bin/bash
-# Copyright (c) 2022,2024 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2022, [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -43,17 +43,70 @@ do_patch_multiline() {
   "$gSed" -i "s/$re/${sbst//$'\n'/"\\n"}/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"
+
+# GCC 13 compatibility
+# --- thrift/compiler/lib/cpp2/util.cc ---
+re="#include <stdexcept>"
+# shellcheck disable=SC2251
+! IFS= read -r -d '' sbst << EOM
+#include <stdexcept>
+
+\/* -- Start of tebako patch -- *\/
+#include <cstdint>
+\/* -- End of tebako patch -- *\/
+EOM
+
+do_patch_multiline "$1/thrift/compiler/lib/cpp2/util.cc"
+
+
 if [[ "$OSTYPE" == "msys" ]]; then
-  re="ftruncate(file\.fd(), finalBufferSize),"
-  sbst="folly::portability::unistd::ftruncate(file.fd(), finalBufferSize), \/* tebako patched *\/"
+  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

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

@@ -1,5 +1,5 @@
 #! /bin/bash
-# Copyright (c) 2022-2024, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2022-2023, [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -41,7 +41,6 @@ restore_and_save() {
 
 do_patch() {
   restore_and_save "$1"
-#  echo "$GNU_SED" -i "s/$2/$3/g" "$1"
   "$GNU_SED" -i "s/$2/$3/g" "$1"
 }
 
@@ -317,6 +316,15 @@ EOM
   sbst=" \/* tebako patched *\/ folly::portability::unistd::lseek(fd,"
   do_patch  "$1/folly/portability/SysUio.cpp" "$re" "$sbst"
 
+# --- folly/portability/Unistd.cpp ---
+  re="(lseek(fd,"
+  sbst="( \/* tebako patched *\/ folly::portability::unistd::lseek(fd,"
+  do_patch  "$1/folly/portability/Unistd.cpp" "$re" "$sbst"
+
+  re="lseek(fd, 0,"
+  sbst=" \/* tebako patched *\/ folly::portability::unistd::lseek(fd, 0,"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/portability/Unistd.cpp"
+
 # --- folly/logging/ImmediateFileWriter.h ---
   re="isatty(file"
   sbst=" \/* tebako patched *\/ folly::portability::unistd::isatty(file"
@@ -394,7 +402,6 @@ EOM
 #ifdef __MINGW32__
   #include <mswsock.h>
   using cmsghdr = WSACMSGHDR;
-  #define CMSG_SPACE WSA_CMSG_SPACE
 #endif
 \/* -- End of tebako patch -- *\/
 
@@ -441,55 +448,7 @@ EOM
   sbst="#if defined(__XROS__) || defined(__MINGW32__) \/* tebako patched *\/"
   "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/system/ThreadName.cpp"
 
-# --- folly/net/NetOps.h ---
-
-  re="#include <WS2tcpip\.h> \/\/ @manual"
-# shellcheck disable=SC2251
-! IFS= read -r -d '' sbst << EOM
-#include <WS2tcpip.h> \/\/ @manual
-
-\/* -- Start of tebako patch -- *\/
-#ifdef __MINGW32__
-  #include <memory>
-  #include <mswsock.h>
-#endif
-\/* -- End of tebako patch -- *\/
-EOM
-  do_patch_multiline  "$1/folly/net/NetOps.h" "$re" "$sbst"
-
-# --- folly/Random.cpp ---
-
-  re="#include <folly\/synchronization\/RelaxedAtomic\.h>"
-# shellcheck disable=SC2251
-! IFS= read -r -d '' sbst << EOM
-#include <folly\/synchronization\/RelaxedAtomic.h>
-
-\/* -- Start of tebako patch -- *\/
-#include <folly\/portability\/Fcntl.h>
-\/* -- End of tebako patch -- *\/
-EOM
-  do_patch_multiline  "$1/folly/Random.cpp" "$re" "$sbst"
-
-# --- folly/Utility.h ---
-  re="T uninit;"
-  sbst="T uninit = 0;  \/* tebako patched *\/"
-  do_patch  "$1/folly/Utility.h" "$re" "$sbst"
-
-# --- folly/experimental/io/AsyncBase.cpp ---
-  re="CHECK_ERR(close(pollFd_));"
-  sbst="CHECK_ERR(folly::portability::unistd::close(pollFd_));  \/* tebako patched *\/"
-  do_patch  "$1/folly/experimental/io/AsyncBase.cpp" "$re" "$sbst"
-
-# --- folly/portability/Unistd.cpp ---
-  re="res = lseek64(fd, offset, whence);"
-  sbst="res = folly::portability::unistd::lseek64(fd, offset, whence); \/* tebako patched *\/ "
-  do_patch  "$1/folly/portability/Unistd.cpp" "$re" "$sbst"
-
-  re="res = lseek(fd, offset, whence);"
-  sbst="res = folly::portability::unistd::lseek(fd, offset, whence); \/* tebako patched *\/ "
-  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/portability/Unistd.cpp"
 # ---
-
   defined_msc_ver_to_win32 "$1/folly/external/farmhash/farmhash.cpp"
   defined_msc_ver_to_win32 "$1/folly/detail/IPAddressSource.h"
   defined_msc_ver_to_win32 "$1/folly/portability/Sockets.cpp"
@@ -512,6 +471,5 @@ EOM
 # while gettimeofday is provided by MSys, the other two functions are lost
   defined_n_win32_to_msc_ver "$1/folly/portability/SysTime.h"
   defined_win32_to_msc_ver "$1/folly/portability/SysTime.cpp"
-  defined_win32_to_msc_ver "$1/folly/lang/Exception.cpp"
 
 fi

data/version.txt

@@ -1 +1 @@
-0.6.2
+0.6.4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Packager for Ruby executables