tebako 0.7.2.rc5 → 0.7.3.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 446a6e7b682bc902e8f22715760ad946a1c35e62c8a5b634af7a0a60436213cf
-  data.tar.gz: 8ea046fe2708966ff3cafb6c66ace15af072eabf0b83b588d1ed7525c9937bc1
+  metadata.gz: 3f3b44e8963dcb8233b713cecb17e415a7b8197f2ec7ac2273653643a4966e8c
+  data.tar.gz: def76f0080fb30b67a93c601e1d87d7d4d1e77dd3690fd4393b7814072c188ab
 SHA512:
-  metadata.gz: 84f293aecf93beef4e2bbe7db8792a4acef9ed6e1d126f3f49b1c5c93231f2e2dfa8e5277b259e48f42239dd721b05029be3276e59587e44f979928c64f7de0a
-  data.tar.gz: 7c644560f564737a05a557a9b1e97b6d34b82771d2eb45d76189b4c03723c9948d685528e424b99dea78f22968cac3b2104d965c87a551186c3999e73c01482c
+  metadata.gz: 2ef735655d9381b8c9ea00e126b310f1467ea5073aaed4d0e7d843c3d47689249840d7cf6d94603bdbd73052ccbad2e4f4900b64277486b93504f222443b7c7c
+  data.tar.gz: 40b6af3a9ae43db759b1853e7bbcf1f488a388eb6f0afefeb38158d725d37d3cc8b623b72e3213e8345371eb99ad191156ac984a1cad4f7ca61e8e0b55052b53

data/CMakeLists.txt

@@ -211,7 +211,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.3")
+  def_ext_prj_g(DWARFS_WR "v0.5.4")
 endif(DWARFS_PRELOAD)
 
 set(LIBYAML_RUBY_OPTION "")

data/common.env

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

data/lib/tebako/version.rb

@@ -26,5 +26,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Tebako
-  VERSION = "0.7.2.rc5"
+  VERSION = "0.7.3.rc4"
 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/ci-scripts/patch-fbthrift.sh

@@ -56,4 +56,8 @@ if [[ "$OSTYPE" == "msys" ]]; 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"
 fi

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

@@ -146,7 +146,7 @@ if [[ "$OSTYPE" == "linux-musl"* ]]; then
 # https://github.com/facebook/folly/issues/1478
   re="#elif defined(__FreeBSD__)"
   sbst="#elif defined(__FreeBSD__) || defined(__musl__)  \/* Tebako patched *\/"
-  do_patch "$1/folly/experimental/symbolizer/Elf.cpp" "$re" "$sbst"
+  do_patch "$1/folly/debugging/symbolizer/Elf.cpp" "$re" "$sbst"
 
   restore_and_save "$1/CMake/FollyConfigChecks.cmake"
   re="FOLLY_HAVE_IFUNC"
@@ -289,23 +289,23 @@ EOM
   sbst="(\/* tebako patched *\/ folly::portability::unistd::dup2,"
   "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/FileUtil.cpp"
 
-# --- folly/experimental/TestUtil.cpp ---
-  defined_win32_to_msc_ver "$1/folly/experimental/TestUtil.cpp"
+# --- folly/testing/TestUtil.cpp ---
+  defined_win32_to_msc_ver "$1/folly/testing/TestUtil.cpp"
   re="dup("
   sbst="\/* tebako patched *\/ folly::portability::unistd::dup("
-  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/experimental/TestUtil.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/testing/TestUtil.cpp"
 
   re="dup2("
   sbst="\/* tebako patched *\/ folly::portability::unistd::dup2("
-  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/experimental/TestUtil.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/testing/TestUtil.cpp"
 
   re="lseek("
   sbst="\/* tebako patched *\/ folly::portability::unistd::lseek("
-  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/experimental/TestUtil.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/testing/TestUtil.cpp"
 
   re="(close("
   sbst="(\/* tebako patched *\/ folly::portability::unistd::close("
-  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/experimental/TestUtil.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/testing/TestUtil.cpp"
 
 # --- folly/system/MemoryMapping.cpp ---
   re="0 == ftruncate("
@@ -475,11 +475,6 @@ EOM
   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 *\/ "
@@ -488,8 +483,13 @@ EOM
   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"
-# ---
 
+# --- folly/io/async/AsyncUDPSocket.cpp
+  re="#elif _WIN32"
+  sbst="#elif _MSC_VER \/* tebako patched *\/ "
+  do_patch  "$1/folly/io/async/AsyncUDPSocket.cpp" "$re" "$sbst"
+
+# ---
   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"

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,47 +58,24 @@ 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>")
   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>")
+
+  if (CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
+    set(CMAKE_C_ARCHIVE_FINISH   "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
+  endif (CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
+
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+    set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
+  endif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
 
   set(CMAKE_CXX_FLAGS "-DTARGET_OS_SIMULATOR=0 -DTARGET_OS_IPHONE=0")
 

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)

data/version.txt

@@ -1 +1 @@
-0.7.2
+0.7.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.7.2.rc5
+  version: 0.7.3.rc4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-09 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -104,6 +104,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