tebako 0.12.10 → 0.12.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '009ef5486538fdd768a0b44c2833236a1f4f5a86ec9a00d89608d4eb601a06d1'
-  data.tar.gz: 3e2fde5102b5dfc56d9ea8cb9ab133133634e5e586de593f2183ba67c2504eb4
+  metadata.gz: e83bf9e1b207b0c69258ee96c251355c5e274705e839cde51e865f2d1a110335
+  data.tar.gz: 2c1d9c07af744ebfafa83f8e1d571a0b1b51f39be6c34cabc32fa68259e8ac30
 SHA512:
-  metadata.gz: 7ffba2ca2bdd4724bdce1cf7179383028dbeea2e38d3c1ae070f25809eabfcb7bd16a1ed4550895259423d42ae8b190db2438f135cda439b28af9c2004192999
-  data.tar.gz: 49c62bfdbe3312f7582cc67b9b9766ec1fe38aee715a7888a8de61764b338b2fb21dc35cf2b91f1f96948b9baf5ab9d3ad5758737e91728420f754736ecebc7c
+  metadata.gz: ce52bc24ca5699401edb0cca3dcd33d7ba1211e66979f47d19b9019767d2d63d74e95dcd7f4674eb4228cf12795c3135b465b4540473aaafc14edf9a8a7aba02
+  data.tar.gz: 0c9c7025bd565c9d7cf39332f29744c9f0d651dcbd6437b7e062d5b6f497a73bdbd272102419c9a30a949a646dc25ff3efc2befb15237bc5fb5ef1e9719fe00c

data/CMakeLists.txt

@@ -101,7 +101,7 @@ if("${OSTYPE_TXT}" MATCHES "^linux-gnu.*")
   endif(REMOVE_GLIBC_PRIVATE)
 elseif("${OSTYPE_TXT}" MATCHES "^linux-musl.*")
   set(IS_MUSL ON)
-elseif("${OSTYPE_TXT}" MATCHES "^msys*")
+elseif("${OSTYPE_TXT}" MATCHES "^msys*" OR "${OSTYPE_TXT}" MATCHES "^cygwin*")
   set(IS_MSYS ON)
   # set(DWARFS_PRELOAD ON)
   set(RB_W32 ON)
@@ -177,7 +177,7 @@ string(CONCAT RUBY_API_VER ${RUBY_VER_BASE} ".0")
 #  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.9.3")
+def_ext_prj_g(DWARFS_WR "v0.9.4")
 #endif(DWARFS_PRELOAD)
 
 def_ext_prj_g(PATCHELF "65e14792061c298f1d2bc44becd48a10cbf0bc81")
@@ -425,9 +425,9 @@ if (${SETUP_MODE})
     ${DEPS_INCLUDE_DIR}/tebako/tebako-version.h
   )
 
-  if(${RUBY_VER} VERSION_LESS "3.3.0" AND "${OSTYPE_TXT}" MATCHES "^msys*")
+  if(${RUBY_VER} VERSION_LESS "3.3.0" AND ("${OSTYPE_TXT}" MATCHES "^msys*" OR "${OSTYPE_TXT}" MATCHES "^cygwin*"))
     target_compile_definitions(tebako-fs PUBLIC RB_W32_PRE_33)
-  endif(${RUBY_VER} VERSION_LESS "3.3.0" AND "${OSTYPE_TXT}" MATCHES "^msys*")
+  endif(${RUBY_VER} VERSION_LESS "3.3.0" AND ("${OSTYPE_TXT}" MATCHES "^msys*" OR "${OSTYPE_TXT}" MATCHES "^cygwin*"))
 
   add_dependencies(tebako-fs packaged_filesystem)
 

data/common.env

@@ -1,5 +1,5 @@
 BUILD_TYPE=Release
 DEPS=deps
 INCBIN_TAG=348e36b
-DWARFS_WR_TAG=v0.9.3
+DWARFS_WR_TAG=v0.9.4
 RUBY_VER=3.2.6

data/lib/tebako/packager/pass1_patch.rb

@@ -35,11 +35,11 @@ module Tebako
   # Packager module
   module Packager
     class << self
-      def crt_pass1_patch(os_type, mount_point, ruby_ver)
-        case os_type
-        when /darwin/
+      def crt_pass1_patch(ostype, mount_point, ruby_ver)
+        scmb = ScenarioManagerBase.new(ostype)
+        if scmb.macos?
           Pass1DarwinPatch.new(mount_point, ruby_ver)
-        when /msys/
+        elsif scmb.msys?
           Pass1MSysPatch.new(mount_point, ruby_ver)
         else
           Pass1Patch.new(mount_point, ruby_ver)
@@ -197,8 +197,6 @@ module Tebako
 
       private
 
-      include Tebako::Packager::PatchBuildsystem
-
       def gnumakefile_in_patch_p1 # rubocop:disable Metrics/MethodLength
         objext = @ruby_ver.ruby32? ? "$(OBJEXT)" : "@OBJEXT@"
         {
@@ -208,7 +206,6 @@ module Tebako
             "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext} $(WINMAINOBJ)  # tebako patched",
 
           "$(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@" =>
-
             "$(WINMAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@  # tebako patched",
 
           "--output-exp=$(RUBY_EXP) \\" => "# tebako patched --output-exp=$(RUBY_EXP) \\",

data/lib/tebako/packager/pass2_patch.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2021-2024 [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 tebako
 #
@@ -33,7 +33,18 @@ require_relative "patch_buildsystem"
 
 # Tebako - an executable packager
 module Tebako
+  # Packager module
   module Packager
+    class << self
+      def crt_pass2_patch(ostype, deps_lib_dir, ruby_ver)
+        scmb = ScenarioManagerBase.new(ostype)
+        if scmb.msys?
+          Pass2MSysPatch.new(ostype, deps_lib_dir, ruby_ver)
+        else
+          Pass2NonMSysPatch.new(ostype, deps_lib_dir, ruby_ver)
+        end
+      end
+    end
     # Ruby patching definitions (pass2)
     class Pass2Patch < Patch
       def initialize(ostype, deps_lib_dir, ruby_ver)
@@ -45,32 +56,19 @@ module Tebako
       end
 
       def patch_map
-        patch_map = patch_map_base
-        patch_map.store("thread_pthread.c", LINUX_MUSL_THREAD_PTHREAD_PATCH) if @scmb.musl?
-        if @scmb.msys?
-          patch_map.merge!(msys_patches)
-        elsif @ruby_ver.ruby3x?
-          patch_map.store("common.mk", COMMON_MK_PATCH)
-        end
-        extend_patch_map_r33(patch_map)
-        patch_map.store("prism_compile.c", PRISM_PATCHES) if @ruby_ver.ruby34?
-        patch_map
+        pm = patch_map_base
+        pm.store("thread_pthread.c", LINUX_MUSL_THREAD_PTHREAD_PATCH) if @scmb.musl?
+        pm.store("prism_compile.c", PRISM_PATCHES) if @ruby_ver.ruby34?
+        pm
       end
 
       private
 
       include Tebako::Packager::PatchBuildsystem
       include Tebako::Packager::PatchLiterals
-      def extend_patch_map_r33(patch_map)
-        if @ruby_ver.ruby33? || @scmb.msys?
-          patch_map.store("config.status",
-                          get_config_status_patch(@ostype, @deps_lib_dir, @ruby_ver))
-        end
-        patch_map
-      end
 
       def dir_c_patch
-        pattern = ScenarioManagerBase.new.msys? ? "/* define system APIs */" : "#ifdef HAVE_GETATTRLIST"
+        pattern = @scmb.msys? ? "/* define system APIs */" : "#ifdef HAVE_GETATTRLIST"
         patch = PatchHelpers.patch_c_file_pre(pattern)
         patch.merge!(DIR_C_BASE_PATCH)
         patch
@@ -116,15 +114,6 @@ module Tebako
         }
       end
 
-      def msys_patches
-        {
-          "cygwin/GNUmakefile.in" => get_gnumakefile_in_patch_p2(@ruby_ver),
-          "ruby.c" => RUBY_C_MSYS_PATCHES,
-          "win32/file.c" => WIN32_FILE_C_MSYS_PATCHES,
-          "win32/win32.c" => WIN32_WIN32_C_MSYS_PATCHES
-        }
-      end
-
       def patch_map_base
         {
           "template/Makefile.in" => template_makefile_in_patch,
@@ -150,5 +139,81 @@ module Tebako
         template_makefile_in_patch_two(@ruby_ver).merge(mlibs_subst)
       end
     end
+
+    # Msys Pass2 patches
+    class Pass2MSysPatch < Pass2Patch
+      def patch_map
+        pm = super
+        pm.merge!(msys_patches)
+        pm.store("config.status", get_config_status_patch(@ostype, @deps_lib_dir, @ruby_ver))
+        pm
+      end
+
+      private
+
+      include Tebako::Packager::PatchBuildsystem
+      include Tebako::Packager::PatchLiterals
+
+      # Other MSYS (GNUMakefile) specific patches
+      #  - The same issue with libraries as for Makefile above
+      #  - 'Kill' ruby.exp regeneration on pass2
+      #     since we want to use output from pass1 for implib generation
+      #     [VERY UGLY HACK]
+      #  - Introduce LIBRUBY dependency on static extensions
+      #    This is an addition to COMMON_MK_PATCH specified above
+      def gnumakefile_in_patch_p2 # rubocop:disable Metrics/MethodLength
+        objext = @ruby_ver.ruby32? ? "$(OBJEXT)" : "@OBJEXT@"
+
+        {
+          "$(Q) $(DLLWRAP) \\" => GNUMAKEFILE_IN_DLLTOOL_SUBST,
+
+          "--output-exp=$(RUBY_EXP) \\" => "# tebako patched --output-exp=$(RUBY_EXP) \\",
+
+          "--export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)" =>
+            "# tebako patched --export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)",
+
+          "@rm -f $(PROGRAM)" => "# tebako patched @rm -f $(PROGRAM)",
+
+          "	$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)" =>
+           "# tebako patched  $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)",
+
+          "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext}" =>
+            "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext} $(WINMAINOBJ)  # tebako patched",
+
+          "RUBYDEF = $(DLL_BASE_NAME).def" => GNUMAKEFILE_IN_WINMAIN_SUBST,
+
+          "$(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@" =>
+            "$(WINMAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) -o $@  # tebako patched",
+
+          "$(RUBY_EXP): $(LIBRUBY_A)" => "dummy.exp: $(LIBRUBY_A) # tebako patched",
+
+          "$(PROGRAM): $(RUBY_INSTALL_NAME).res.#{objext}" =>
+            "$(PROGRAM): $(RUBY_INSTALL_NAME).res.#{objext} $(LIBRUBY_A) # tebako patched\n" \
+            "$(LIBRUBY_A): $(LIBRUBY_A_OBJS) $(INITOBJS) # tebako patched\n"
+        }
+      end
+
+      def msys_patches
+        {
+          "cygwin/GNUmakefile.in" => gnumakefile_in_patch_p2,
+          "ruby.c" => RUBY_C_MSYS_PATCHES,
+          "win32/file.c" => WIN32_FILE_C_MSYS_PATCHES,
+          "win32/win32.c" => WIN32_WIN32_C_MSYS_PATCHES
+        }
+      end
+    end
+
+    # Non-msys Pass2 patches
+    class Pass2NonMSysPatch < Pass2Patch
+      def patch_map
+        pm = super
+        pm.store("common.mk", COMMON_MK_PATCH) if @ruby_ver.ruby3x?
+        pm.store("config.status", get_config_status_patch(@ostype, @deps_lib_dir, @ruby_ver)) if @ruby_ver.ruby33?
+        pm
+      end
+
+      include Tebako::Packager::PatchBuildsystem
+      include Tebako::Packager::PatchLiterals
+    end
   end
 end

data/lib/tebako/packager/patch.rb

@@ -28,6 +28,22 @@
 # Tebako - an executable packager
 module Tebako
   module Packager
+    # Substitutions for cygwin/Gnumakefile.in shared across Pass1 and Pass2
+    GNUMAKEFILE_IN_DLLTOOL_SUBST = <<~SUBST
+      $(Q) dlltool --output-lib=$(LIBRUBY) --output-def=tebako.def --export-all $(LIBRUBY_A) --output-exp=$(RUBY_EXP)   # tebako patched
+    SUBST
+
+    # This MSYS specific thing ensure compilation of winmain.c
+    # Did try to understand why it did not work out of the box
+    GNUMAKEFILE_IN_WINMAIN_SUBST = <<~SUBST
+      RUBYDEF = $(DLL_BASE_NAME).def
+
+      # Start of tebako patch
+      WINMAINOBJ    = win32/winmain.$(OBJEXT)
+      $(WINMAINOBJ): win32/winmain.c
+      # End of tebako patch
+    SUBST
+
     # Ruby patching definitions (common base)
     class Patch
       def patch_map

data/lib/tebako/packager/patch_buildsystem.rb

@@ -97,31 +97,14 @@ module Tebako
         end
       end
 
-      GNUMAKEFILE_IN_DLLTOOL_SUBST = <<~SUBST
-        $(Q) dlltool --output-lib=$(LIBRUBY) --output-def=tebako.def --export-all $(LIBRUBY_A) --output-exp=$(RUBY_EXP)   # tebako patched
-      SUBST
-
-      # This MSYS specific thing ensure compilation of winmain.c
-      # Did try to understand why it did not work out of the box
-      GNUMAKEFILE_IN_WINMAIN_SUBST = <<~SUBST
-        RUBYDEF = $(DLL_BASE_NAME).def
-
-        # Start of tebako patch
-        WINMAINOBJ    = win32/winmain.$(OBJEXT)
-        $(WINMAINOBJ): win32/winmain.c
-        # End of tebako patch
-      SUBST
-
       def get_config_status_pattern(ostype)
-        case ostype
-        when /linux-/
-          "S[\"MAINLIBS\"]=\"-lz -lrt -lrt -ldl -lcrypt -lm -lpthread \""
-        when /darwin/
+        scmb = ScenarioManagerBase.new(ostype)
+        if scmb.macos?
           "S[\"MAINLIBS\"]=\"-ldl -lobjc -lpthread \""
-        when /msys/
+        elsif scmb.msys?
           "S[\"MAINLIBS\"]=\"-lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi -lbcrypt \""
         else
-          raise Tebako::Error, "Unknown ostype #{ostype}"
+          "S[\"MAINLIBS\"]=\"-lz -lrt -lrt -ldl -lcrypt -lm -lpthread \""
         end
       end
 
@@ -131,33 +114,6 @@ module Tebako
             "S[\"MAINLIBS\"]=\"#{PatchLibraries.mlibs(ostype, deps_lib_dir, ruby_ver, false)}\""
         }
       end
-
-      # Other MSYS (GNUMakefile) specific patches
-      #  - The same issue with libraries as for Makefile above
-      #  - 'Kill' ruby.exp regeneration on pass2
-      #     since we want to use output from pass1 for implib generation
-      #     [VERY UGLY HACK]
-      #  - Introduce LIBRUBY dependency on static extensions
-      #    This is an addition to COMMON_MK_PATCH specified above
-      def get_gnumakefile_in_patch_p2(ruby_ver) # rubocop:disable Metrics/MethodLength
-        objext = ruby_ver.ruby32? ? "$(OBJEXT)" : "@OBJEXT@"
-
-        {
-          "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext}" =>
-            "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext} $(WINMAINOBJ)  # tebako patched",
-
-          "RUBYDEF = $(DLL_BASE_NAME).def" => GNUMAKEFILE_IN_WINMAIN_SUBST,
-
-          "$(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@" =>
-            "$(WINMAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) -o $@  # tebako patched",
-
-          "$(RUBY_EXP): $(LIBRUBY_A)" => "dummy.exp: $(LIBRUBY_A) # tebako patched",
-
-          "$(PROGRAM): $(RUBY_INSTALL_NAME).res.#{objext}" =>
-            "$(PROGRAM): $(RUBY_INSTALL_NAME).res.#{objext} $(LIBRUBY_A) # tebako patched\n" \
-            "$(LIBRUBY_A): $(LIBRUBY_A_OBJS) $(INITOBJS) # tebako patched\n"
-        }
-      end
     end
   end
 end

data/lib/tebako/packager/patch_libraries.rb

@@ -148,18 +148,16 @@ module Tebako
         #      This is fixed by ext/extmk.rb patch [TODO ?]
         # .....................................................
 
-        def mlibs(ostype, deps_lib_dir, ruby_ver, with_compression) # rubocop:disable Metrics/MethodLength
-          case ostype
-          when /linux-gnu/
-            linux_gnu_libraries(ruby_ver, with_compression)
-          when /linux-musl/
-            linux_musl_libraries(ruby_ver, with_compression)
-          when /darwin/
-            darwin_libraries(deps_lib_dir, ruby_ver, with_compression)
-          when /msys/
+        def mlibs(ostype, deps_lib_dir, ruby_ver, with_compression)
+          scmb = ScenarioManagerBase.new(ostype)
+          if scmb.msys?
             msys_libraries(ruby_ver, with_compression)
+          elsif scmb.macos?
+            darwin_libraries(deps_lib_dir, ruby_ver, with_compression)
+          elsif scmb.musl?
+            linux_musl_libraries(ruby_ver, with_compression)
           else
-            raise Tebako::Error, "Unknown ostype #{ostype}"
+            linux_gnu_libraries(ruby_ver, with_compression)
           end
         end
       end

data/lib/tebako/packager.rb

@@ -141,8 +141,8 @@ module Tebako
       # Patch gem_prelude.rb
       def pass1a(ruby_source_dir)
         puts "-- Running pass1a script"
-        patch = Pass1APatch.new.patch_map
-        do_patch(patch, ruby_source_dir)
+        patch = Pass1APatch.new
+        do_patch(patch.patch_map, ruby_source_dir)
       end
 
       # Pass2
@@ -150,8 +150,8 @@ module Tebako
       def pass2(ostype, ruby_source_dir, deps_lib_dir, ruby_ver)
         puts "-- Running pass2 script"
 
-        patch = Pass2Patch.new(ostype, deps_lib_dir, ruby_ver).patch_map
-        do_patch(patch, ruby_source_dir)
+        patch = crt_pass2_patch(ostype, deps_lib_dir, ruby_ver)
+        do_patch(patch.patch_map, ruby_source_dir)
       end
 
       # Stash

data/lib/tebako/version.rb

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

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

@@ -36,13 +36,52 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  test-setup-libfmt:
+    name: test setup-libfmt on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-20.04, macos-13, macos-14 ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Run cmake script
+        run: |
+          cmake -B build/setup-libfmt -DROOT=$PWD tests/setup-libfmt
+          cmake --build build/setup-libfmt
+
+      - name: Test setup-libfmt
+        run: |
+          set -o errexit -o pipefail -o noclobber -o nounset
+          test -f build/setup-libfmt/deps/lib/libfmt.a
+          test -f build/setup-libfmt/deps/include/fmt/args.h
+          test -f build/setup-libfmt/deps/include/fmt/chrono.h
+          test -f build/setup-libfmt/deps/include/fmt/color.h
+          test -f build/setup-libfmt/deps/include/fmt/compile.h
+          test -f build/setup-libfmt/deps/include/fmt/core.h
+          test -f build/setup-libfmt/deps/include/fmt/format.h
+          test -f build/setup-libfmt/deps/include/fmt/format-inl.h
+          test -f build/setup-libfmt/deps/include/fmt/os.h
+          test -f build/setup-libfmt/deps/include/fmt/ostream.h
+          test -f build/setup-libfmt/deps/include/fmt/printf.h
+          test -f build/setup-libfmt/deps/include/fmt/ranges.h
+          test -f build/setup-libfmt/deps/include/fmt/std.h
+          test -f build/setup-libfmt/deps/include/fmt/xchar.h
+          test -f build/setup-libfmt/deps/lib/cmake/fmt/fmt-config.cmake
+          test -f build/setup-libfmt/deps/lib/cmake/fmt/fmt-config-version.cmake
+          test -f build/setup-libfmt/deps/lib/cmake/fmt/fmt-targets.cmake
+          test -f build/setup-libfmt/deps/lib/cmake/fmt/fmt-targets-release.cmake
+          test -f build/setup-libfmt/deps/lib/pkgconfig/fmt.pc
+
   test-setup-librachive:
     name: test setup-librachive on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, macos-12 ]
+        os: [ ubuntu-20.04, macos-13, macos-14 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -67,7 +106,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, macos-12 ]
+        os: [ ubuntu-20.04, macos-13, macos-14 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -89,7 +128,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, macos-12 ]
+        os: [ ubuntu-20.04, macos-13 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -106,7 +145,7 @@ jobs:
 
   test-cross-brew-install:
     name: test arm-brew-setup/install
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -129,7 +168,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-12, macos-13, macos-14 ]
+        os: [ macos-13, macos-14 ]
 
     steps:
       - name: Checkout

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

@@ -37,7 +37,7 @@ 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")
+    response=$("$DIR1/bin/brew" fetch --force --bottle-tag=arm64_ventura "$bottle" | grep "bottle.tar.gz")
     IFS=" " read -r -a parsed <<< "$response"
     "$DIR1/bin/brew" install "${parsed[2]}"
 done

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

@@ -43,7 +43,7 @@ do_patch_multiline() {
   "$gSed" -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1"
 }
 
-if [[ "$OSTYPE" == "linux-gnu"* || "$OSTYPE" == "linux-musl"* || "$OSTYPE" == "msys" ]]; then
+if [[ "$OSTYPE" == "linux-gnu"* || "$OSTYPE" == "linux-musl"* || "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
   gSed="sed"
 elif [[ "$OSTYPE" == "darwin"* ]]; then
   gSed="gsed"
@@ -52,7 +52,7 @@ else
   exit 1
 fi
 
-if [[ "$OSTYPE" == "msys" ]]; then
+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"
@@ -60,4 +60,19 @@ if [[ "$OSTYPE" == "msys" ]]; then
   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

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

@@ -70,6 +70,12 @@ defined_n_win32_to_msc_ver() {
   "$GNU_SED" -i "s/$re/$sbst/g" "$1"
 }
 
+defined_el_win32_to_msc_ver() {
+  re="#elif _WIN32"
+  sbst="#elif _MSC_VER \/* tebako patched *\/ "
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1"
+}
+
 defined_msc_ver_to_win32() {
   re="defined(_MSC_VER)"
   sbst="defined(_WIN32) \/* tebako patched *\/ "
@@ -195,7 +201,7 @@ EOM
   sbst="set(OPENSSL_INCLUDE_DIR \"\${OPENSSL_ROOT_DIR}\/include\")    # tebako patched"
   "$GNU_SED" -i "s/$re/$sbst/g" "$1/CMakeLists.txt"
 
-elif [[ "$OSTYPE" == "msys"* ]]; then
+elif [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
 # --- folly/portability/Stdlib.h ---
   re="#define PATH_MAX _MAX_PATH"
   sbst="\/* #define PATH_MAX _MAX_PATH --- tebako patched *\/"
@@ -514,4 +520,5 @@ EOM
   defined_win32_to_msc_ver "$1/folly/portability/SysTime.cpp"
   defined_win32_to_msc_ver "$1/folly/lang/Exception.cpp"
 
+  defined_el_win32_to_msc_ver "$1/folly/io/async/AsyncUDPSocket.cpp"
 fi

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

@@ -0,0 +1,61 @@
+# 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.
+
+def_ext_prj_t(LIBFMT "10.2.1" "312151a2d13c8327f5c9c586ac6cf7cddc1658e8f53edae0ec56509c8fa516c9")
+
+message(STATUS "Collecting libfmt - " v${LIBFMT_VER} " at " ${LIBFMT_SOURCE_DIR})
+
+set(__LIBFMT "${DEPS}/lib/libfmt.a")
+
+set(CMAKE_ARGUMENTS -DCMAKE_INSTALL_PREFIX=${DEPS}
+                    -DFMT_DOC=OFF
+                    -DFMT_TEST=OFF
+                    -DFMT_FUZZ=OFF
+                    -DFMT_CUDA_TEST=OFF
+                    -DCMAKE_BUILD_TYPE=Release
+                    -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+                    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+)
+
+if(TEBAKO_BUILD_TARGET)
+  list(APPEND CMAKE_ARGUMENTS  -DCMAKE_C_FLAGS=--target=${TEBAKO_BUILD_TARGET})
+  list(APPEND CMAKE_ARGUMENTS  -DCMAKE_EXE_LINKER_FLAGS=--target=${TEBAKO_BUILD_TARGET})
+  list(APPEND CMAKE_ARGUMENTS  -DCMAKE_SHARED_LINKER_FLAGS=--target=${TEBAKO_BUILD_TARGET})
+endif(TEBAKO_BUILD_TARGET)
+
+ExternalProject_Add(${LIBFMT_PRJ}
+  PREFIX "${DEPS}"
+  URL https://github.com/fmtlib/fmt/releases/download/${LIBFMT_VER}/fmt-${LIBFMT_VER}.zip
+  URL_HASH SHA256=${LIBFMT_HASH}
+  DOWNLOAD_NO_PROGRESS true
+  CMAKE_ARGS ${CMAKE_ARGUMENTS}
+  SOURCE_DIR ${LIBFMT_SOURCE_DIR}
+  BINARY_DIR ${LIBFMT_BINARY_DIR}
+  BUILD_BYPRODUCTS ${__LIBFMT}
+)
+
+add_library(_LIBFMT STATIC IMPORTED)
+set_target_properties(_LIBFMT PROPERTIES IMPORTED_LOCATION  ${__LIBFMT})
+add_dependencies(_LIBFMT ${LIBFMT_PRJ})

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

@@ -0,0 +1,35 @@
+# 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.24.0)
+project(setup-libfmt-test)
+
+include(ExternalProject)
+
+set(ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..)
+set(DEPS ${CMAKE_CURRENT_BINARY_DIR}/deps)
+
+include(${ROOT}/cmake-scripts/def-external-project.cmake)
+include(${ROOT}/cmake-scripts/setup-libfmt.cmake)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.12.10
+  version: 0.12.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-07 00:00:00.000000000 Z
+date: 2025-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -251,12 +251,14 @@ files:
 - tools/cmake-scripts/macos-environment.cmake
 - tools/cmake-scripts/msys-environment.cmake
 - tools/cmake-scripts/setup-libarchive.cmake
+- tools/cmake-scripts/setup-libfmt.cmake
 - tools/cmake-scripts/setup-libhowardhinnerdate.cmake
 - tools/cmake-scripts/setup-libutfcpp.cmake
 - tools/cmake-scripts/setup-openssl.cmake
 - tools/cmake-scripts/version.cmake
 - tools/include/pro-statvfs.h
 - tools/tests/cmake/CMakeLists.txt
+- tools/tests/setup-libfmt/CMakeLists.txt
 - tools/tests/setup-libhowardhinnerdate/CMakeLists.txt
 - tools/tests/setup-librachive/CMakeLists.txt
 - tools/tests/setup-libutfcpp/CMakeLists.txt