tebako 0.5.12 → 0.6.2

data/lib/tebako/packager/patch_literals.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2023 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2023-2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -29,20 +29,14 @@
 module Tebako
   module Packager
     # Ruby patching literals (pass2)
-    # rubocop:disable Metrics/ModuleLength
     module PatchLiterals
       TOOL_MKCONFIG_RB_PATCH = {
         "    if fast[name]" => <<~SUBST
           # -- Start of tebako patch --
               v_head_comp = "  CONFIG[\\"prefix\\"] \#{eq} "
               if v_head_comp == v[0...(v_head_comp.length)]
-                if win32
-                v = "\#{v[0...(v_head_comp.length)]}CONFIG[\\"RUBY_EXEC_PREFIX\\"] = '/__tebako_memfs__'
-          "
-                else
                   v = "\#{v[0...(v_head_comp.length)]}'/__tebako_memfs__'
           "
-                end
               end
               v_head_comp = "  CONFIG[\\"RUBY_EXEC_PREFIX\\"] \#{eq} "
               if v_head_comp == v[0...(v_head_comp.length)]
@@ -54,6 +48,22 @@ module Tebako
         SUBST
       }.freeze
 
+      TOOLS_MKCONFIG_RB_SUBST = <<~SUBST
+        # -- Start of tebako patch --
+            v_head_comp = "  CONFIG[\\"prefix\\"] \#{eq} "
+            if v_head_comp == v[0...(v_head_comp.length)]
+              v = "\#{v[0...(v_head_comp.length)]}CONFIG[\\"RUBY_EXEC_PREFIX\\"] = 'A:/__tebako_memfs__'
+        "
+            end
+            v_head_comp = "  CONFIG[\\"RUBY_EXEC_PREFIX\\"] \#{eq} "
+            if v_head_comp == v[0...(v_head_comp.length)]
+              v = "\#{v[0...(v_head_comp.length)]}'A:/__tebako_memfs__'
+        "
+            end
+        # -- End of tebako patch --
+            if fast[name]
+      SUBST
+
       # Alpine-specific patches https://github.com/docker-library/ruby/blob/master/3.1/alpine3.15/Dockerfile
       # -- Patch no. 1 --
       # https://github.com/docker-library/ruby/issues/196
@@ -125,6 +135,7 @@ module Tebako
               ruby_sysinit(&argc, &argv);
           /* -- Start of tebako patch -- */
               if (tebako_main(&argc, &argv) != 0) {
+                printf("Tebako intialization failed.");
                 return -1;
               }
           /* -- End of tebako patch -- */
@@ -156,46 +167,62 @@ module Tebako
           "else if (e == EIO /* tebako patch */ && !within_tebako_memfs(path)) {"
       }.freeze
 
-      COMMON_MK_PATCH = {
-        "ext/extinit.c: $(srcdir)/template/extinit.c.tmpl $(PREP)" =>
-          "ext/extinit.c: $(srcdir)/template/extinit.c.tmpl $(PREP) $(EXTS_MK)"
+      DLN_C_MSYS_PATCH_PRE32 = {
+        "    winfile = rb_w32_mbstr_to_wstr(CP_UTF8, file, -1, NULL);" => <<~SUBST
+          /* -- Start of tebako patch -- */
+            char *f = NULL;
+            winfile = NULL;
+            if (file && within_tebako_memfs(file)) {
+              f = tebako_dlmap2file(file);
+              if (f) {
+                winfile = rb_w32_mbstr_to_wstr(CP_UTF8, f, -1, NULL);
+                free(f);
+              }
+              else {
+                goto failed;
+              }
+            }
+            else {
+              winfile = rb_w32_mbstr_to_wstr(CP_UTF8, file, -1, NULL);
+            }
+          /* -- End of tebako patch -- */
+        SUBST
       }.freeze
 
-      C_FILES_TO_PATCH = [
-        ["file.c", "/* define system APIs */"],
-        ["io.c", "/* define system APIs */"],
-        ["util.c", "#ifndef S_ISDIR"],
-        ["dln.c", "static const char funcname_prefix[sizeof(FUNCNAME_PREFIX) - 1] = FUNCNAME_PREFIX;"]
-      ].freeze
-
-      TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_1 =
-        "\t\t$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
-        "$(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@"
-
-      TEMPLATE_MAKEFILE_IN_BASE_PATCH_PRE_3_1 =
-        "# -- Start of tebako patch --\n" \
-        "\t\t$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
-        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
-        "# -- End of tebako patch --"
-
-      TEMPLATE_MAKEFILE_IN_BASE_PATTERN =
-        "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) " \
-        "$(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@"
-
-      TEMPLATE_MAKEFILE_IN_BASE_PATCH =
-        "# -- Start of tebako patch --\n" \
-        "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
-        "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
-        "# -- End of tebako patch --"
+      DLN_C_MSYS_PATCH = {
+        "    WCHAR *winfile = rb_w32_mbstr_to_wstr(CP_UTF8, file, -1, NULL);" => <<~SUBST
+          /* -- Start of tebako patch -- */
+            char *f = NULL;
+            WCHAR *winfile = NULL;
+            if (file && within_tebako_memfs(file)) {
+              f = tebako_dlmap2file(file);
+              if (f) {
+                winfile = rb_w32_mbstr_to_wstr(CP_UTF8, f, -1, NULL);
+                free(f);
+              }
+              else {
+                goto failed;
+              }
+            }
+            else {
+              winfile = rb_w32_mbstr_to_wstr(CP_UTF8, file, -1, NULL);
+            }
+          /* -- End of tebako patch -- */
+        SUBST
+      }.freeze
 
       C_FILE_SUBST = <<~SUBST
         /* -- Start of tebako patch -- */
-        #ifndef NO_TEBAKO_INCLUDES
         #include <tebako/tebako-config.h>
         #include <tebako/tebako-defines.h>
-        #include <tebako/tebako-io-rb-w32.h>
         #include <tebako/tebako-io.h>
-        #endif
+        /* -- End of tebako patch -- */
+      SUBST
+
+      C_FILE_SUBST_LESS = <<~SUBST
+        /* -- Start of tebako patch -- */
+        #include <tebako/tebako-config.h>
+        #include <tebako/tebako-io.h>
         /* -- End of tebako patch -- */
       SUBST
 
@@ -213,68 +240,111 @@ module Tebako
         SUBST
       }.freeze
 
-      MSYS_PATCHES = {
-        "ruby.c" => {
-          "#define RUBY_RELATIVE(path, len) rb_str_buf_cat(BASEPATH(), (path), (len))" =>
-          "#define RUBY_RELATIVE(path, len) rubylib_path_new((path), (len))  /* tebako patched */",
-          "#define PREFIX_PATH() sopath" =>
-            "#define PREFIX_PATH() rubylib_path_new(tebako_mount_point(), " \
-            "strlen(tebako_mount_point())) /* tebako patched */",
-          '#include "mjit.h"' =>
-            "#include \"mjit.h\"\n" \
-            "/* -- Start of tebako patch -- */\n" \
-            "#include <tebako/tebako-main.h>\n" \
-            "/* -- End of tebako patch -- */"
-        },
-        "/win32/win32.c" => {
-          "#undef __STRICT_ANSI__" =>
-          "#undef __STRICT_ANSI__\n" \
-          "/* -- Start of tebako patch -- */\n" \
-          "#define NO_TEBAKO_INCLUDES\n" \
-          "/* -- End of tebako patch -- */"
-        },
-        "win32/dir.h" => {
-          "#define opendir(s)   rb_w32_opendir((s))" => "#{C_FILE_SUBST}\n#define opendir(s)   rb_w32_opendir((s))"
-        },
-        "file.c" => {
-          "    wpath = mbstr_to_wstr(CP_UTF8, path, -1, &len);" =>
-          "/* -- Start of tebako patch -- */\n" \
-          "if (tebako_file_load_ok(path)) return 1;\n" \
-          "/* -- End of tebako patch -- */\n" \
-          "wpath = mbstr_to_wstr(CP_UTF8, path, -1, &len);",
-          '#include "win32/file.h' =>
-          "#include \"win32/file.h\"\n" \
-          "/* -- Start of tebako patch -- */\n" \
-          "#include <tebako/tebako-main.h>\n" \
-          "/* -- End of tebako patch -- */"
-        }
+      IO_C_SUBST = <<~SUBST
+        /* -- Start of tebako patch -- */
+            if (is_tebako_file_descriptor(fd)) return;
+            /* -- End of tebako patch -- */
+            flags = fcntl(fd, F_GETFD); /* should not fail except EBADF. */
+      SUBST
 
+      IO_C_MSYS_BASE_PATCH = {
+        "#define open	rb_w32_uopen" => "#define open(p, f, m) tebako_open(3, (p), (f), (m))"
       }.freeze
 
-      LINUX_PATCHES = {
-        "ext/extmk.rb" => {
-          "mf.macro \"EXTLIBS\", $extlibs" => "#  mf.macro \"EXTLIBS\", $extlibs   tebako patched"
-        }
+      IO_C_MSYS_PATCH_PRE_32 = {
+        "(rb_w32_io_cancelable_p((fptr)->fd) ? Qnil : rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_READABLE), Qnil))" =>
+            "((is_tebako_file_descriptor((fptr)->fd) || rb_w32_io_cancelable_p((fptr)->fd)) ? \\\n" \
+            "Qnil : rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_READABLE), Qnil))"
       }.freeze
 
-      # rubocop:disable Style/WordArray
+      IO_C_MSYS_PATCH = {
+        "(rb_w32_io_cancelable_p((fptr)->fd) ? Qnil : rb_io_wait(fptr->self, " \
+        "RB_INT2NUM(RUBY_IO_READABLE), RUBY_IO_TIMEOUT_DEFAULT))" =>
+            "((is_tebako_file_descriptor((fptr)->fd) || rb_w32_io_cancelable_p((fptr)->fd)) ? \\\n" \
+            "Qnil : rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_READABLE), RUBY_IO_TIMEOUT_DEFAULT))"
+      }.freeze
 
-      # NOTE: folly provides build-in implementation of jemalloc
+      FILE_C_MSYS_SUBST = <<~SUBST
+        /* -- Start of tebako patch -- */
+               if (is_tebako_file_descriptor((fptr)->fd)) return ENOTSUP;
+               /* -- End of tebako patch -- */
+               while ((int)rb_thread_io_blocking_region(rb_thread_flock, op, fptr->fd) < 0) {
+      SUBST
+
+      FILE_C_MSYS_PATCH = {
+        "while ((int)rb_thread_io_blocking_region(rb_thread_flock, op, fptr->fd) < 0) {" => FILE_C_MSYS_SUBST
+      }.freeze
+
+      RUBY_C_MSYS_PATH_SUBST = <<~SUBST
+        /* -- Start of tebako patch -- */
+                VALUE path = within_tebako_memfs(paths) ?
+                                rb_str_new_cstr(paths) :
+                                RUBY_RELATIVE(paths, len);
+               /* -- End of tebako patch -- */
+      SUBST
 
-      DARWIN_BREW_LIBS = [
-        ["zlib", "z"],            ["gdbm", "gdbm"],           ["readline", "readline"], ["libffi", "ffi"],
-        ["ncurses", "ncurses"],   ["fmt", "fmt"],             ["lz4", "lz4"],           ["xz", "lzma"],
-        ["libyaml", "yaml"],      ["boost", "boost_chrono"],
-        ["double-conversion", "double-conversion"]
-      ].freeze
+      RUBY_C_MSYS_PATCHES = {
+        "#ifndef MAXPATHLEN" => "#{C_FILE_SUBST_LESS}\n#ifndef MAXPATHLEN",
+        "VALUE path = RUBY_RELATIVE(paths, len);" => RUBY_C_MSYS_PATH_SUBST
+      }.freeze
 
-      DARWIN_BREW_LIBS_PRE_31 = [["openssl@1.1", "ssl"], ["openssl@1.1", "crypto"]].freeze
+      WIN32_FILE_C_MSYS_SUBST = <<~SUBST
+        /* -- Start of tebako patch -- */
+          if (tebako_file_load_ok(path)) return ret;
+            /* -- End of tebako patch -- */
+        wpath = mbstr_to_wstr(CP_UTF8, path, -1, &len);
+      SUBST
 
-      DARWIN_BREW_LIBS_31 = [["libyaml", "yaml"], ["openssl@3", "ssl"], ["openssl@3", "crypto"]].freeze
+      WIN32_FILE_C_MSYS_PATCHES = {
+        "#ifndef INVALID_FILE_ATTRIBUTES" => "#{C_FILE_SUBST_LESS}\n#ifndef INVALID_FILE_ATTRIBUTES",
+        "wpath = mbstr_to_wstr(CP_UTF8, path, -1, &len);" => WIN32_FILE_C_MSYS_SUBST
+      }.freeze
 
-      DARWIN_DEP_LIBS = ["glog", "gflags", "brotlienc", "brotlidec", "brotlicommon"].freeze
-      # rubocop:enable Style/WordArray
+      WIN32_WIN32_C_MSYS_SUBST = <<~SUBST
+        /* -- Start of tebako patch -- */
+          if (is_tebako_cwd()) {
+            char* tebako_cwd = tebako_getcwd(NULL,0);
+            if (tebako_cwd == NULL) {
+              errno = ENOMEM;
+              return NULL;
+            }
+            len = strlen(tebako_cwd) + 1;
+
+            if (buffer) {
+              if (size < len) {
+                free(tebako_cwd);
+                errno = ERANGE;
+                return NULL;
+              }
+            }
+            else {
+              buffer = (*alloc)(len, arg);
+              if (!buffer) {
+                free(tebako_cwd);
+                errno = ENOMEM;
+                return NULL;
+              }
+            }
+            translate_char(tebako_cwd, (char)0x5c, '/', CP_UTF8);
+            strcpy(buffer, tebako_cwd);
+            free(tebako_cwd);
+            return buffer;
+          }
+          /* -- End of tebako patch -- */
+
+          len = GetCurrentDirectoryW(0, NULL);
+      SUBST
+
+      WIN32_WIN32_C_MSYS_PATCHES = {
+        "#if defined _MSC_VER && _MSC_VER <= 1200" => "#{C_FILE_SUBST_LESS}\n#if defined _MSC_VER && _MSC_VER <= 1200",
+        "len = GetCurrentDirectoryW(0, NULL);" => WIN32_WIN32_C_MSYS_SUBST
+      }.freeze
+
+      LINUX_PATCHES = {
+        "ext/extmk.rb" => {
+          "mf.macro \"EXTLIBS\", $extlibs" => "#  mf.macro \"EXTLIBS\", $extlibs   tebako patched"
+        }
+      }.freeze
     end
-    # rubocop:enable Metrics/ModuleLength
   end
 end

data/lib/tebako/packager.rb

@@ -48,10 +48,11 @@ module Tebako
 
     FILES_TO_RESTORE_MSYS = %w[
       ruby.c
-      win32/win32.c
       win32/file.c
-      win32/dir.h
     ].freeze
+    # Do not need to restore cygwin/GNUmakefile.in
+    # because it is patched (differently) both on pass 1 and pass2
+    # cygwin/GNUmakefile.in
 
     FILES_TO_RESTORE_MUSL = %w[
       thread_pthread.c
@@ -70,6 +71,19 @@ module Tebako
     RUBYGEMS_VERSION = "3.4.22"
 
     class << self
+      # Create implib
+      def create_implib(src_dir, package_src_dir, app_name, ruby_ver)
+        puts "   ... creating Windows import library"
+        File.open(def_fname(src_dir, app_name), "w") do |file|
+          file.puts "LIBRARY #{out_fname(app_name)}"
+          file.puts File.read(File.join(src_dir, "tebako.def"))
+        end
+        params = ["dlltool", "-d", def_fname(src_dir, app_name), "-D", out_fname(app_name),
+                  "--output-lib", lib_fname(package_src_dir, ruby_ver)]
+        out, st = Open3.capture2e(*params)
+        raise Tebako::Error, "Failed to create import library:\n #{out}" unless st.exitstatus.zero?
+      end
+
       # Deploy
       def deploy(src_dir, tbd, gflength)
         puts "-- Running deploy script"
@@ -132,6 +146,18 @@ module Tebako
 
       private
 
+      def def_fname(src_dir, app_name)
+        File.join(src_dir, "#{app_name}.def")
+      end
+
+      def out_fname(app_name)
+        File.join("#{app_name}.exe")
+      end
+
+      def lib_fname(src_dir, ruby_ver)
+        File.join(src_dir, "lib", "libx64-ucrt-ruby#{ruby_ver[0]}#{ruby_ver[2]}0.a")
+      end
+
       def install_gem(tbd, name, ver = nil)
         puts "   ... installing #{name} gem#{" version #{ver}" if ver}"
         PatchHelpers.with_env(DEPLOY_ENV) do

data/lib/tebako/version.rb

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

data/src/tebako-main.cpp

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (c) 2021-2022 [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 tebako
  *
@@ -35,6 +35,7 @@
 #include <fcntl.h>
 
 #include <string>
+#include <cstdint>
 
 #ifdef _WIN32
  #include <winsock2.h>
@@ -49,6 +50,8 @@
 #include <tebako/tebako-main.h>
 #include <tebako/tebako-fs.h>
 
+static int running_miniruby = 0;
+
 extern "C" int tebako_main(int* argc, char*** argv) {
 	int ret = -1, fsret = -1;
 	char** new_argv = NULL;
@@ -58,6 +61,7 @@ extern "C" int tebako_main(int* argc, char*** argv) {
 // Ruby build script is designed in such a way that this patch is also applied towards miniruby
 // Just pass through in such case
 		ret = 0;
+		running_miniruby = -1;
 	}
 	else {
 		try {
@@ -149,40 +153,6 @@ extern "C" const char* tebako_mount_point(void) {
 	return tebako::fs_mount_point;
 }
 
-#ifdef RB_W32
-
-#if !defined(RUBY_WIN32_H)
-    struct stati128 {
-        _dev_t st_dev;
-        unsigned __int64 st_ino;
-        __int64 st_inohigh;
-        unsigned short st_mode;
-        short st_nlink;
-        short st_uid;
-        short st_gid;
-        _dev_t st_rdev;
-        __int64 st_size;
-        __time64_t st_atime;
-        long st_atimensec;
-        __time64_t st_mtime;
-        long st_mtimensec;
-        __time64_t st_ctime;
-        long st_ctimensec;
-    };
-#endif
-
-extern "C" int tebako_file_load_ok(const char *path) {
-	int ret = 0;
-
-	if (within_tebako_memfs(path)) {
-		int fd = tebako_open(2, path, O_RDONLY);
-		if (fd != -1) {
-			struct STAT_TYPE st;
-			ret = (tebako_fstat(fd, &st)==0) ? 1:0;
-    		tebako_close(fd);
-		}
-	}
-	return ret;
+extern "C" int tebako_is_running_miniruby(void) {
+	return running_miniruby;
 }
-
-#endif

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

@@ -1,5 +1,5 @@
 #! /bin/bash
-# Copyright (c) 2022, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2022,2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -43,70 +43,17 @@ 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="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 *\/"
+  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-2023, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2022-2024, [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -41,6 +41,7 @@ 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"
 }
 
@@ -316,15 +317,6 @@ 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"
@@ -402,6 +394,7 @@ EOM
 #ifdef __MINGW32__
   #include <mswsock.h>
   using cmsghdr = WSACMSGHDR;
+  #define CMSG_SPACE WSA_CMSG_SPACE
 #endif
 \/* -- End of tebako patch -- *\/
 
@@ -448,7 +441,55 @@ 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"
@@ -471,5 +512,6 @@ 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.5.12
+0.6.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.6.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-27 00:00:00.000000000 Z
+date: 2024-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -65,11 +65,14 @@ files:
 - lib/tebako.rb
 - lib/tebako/cli.rb
 - lib/tebako/cli_helpers.rb
+- lib/tebako/cli_rubies.rb
 - lib/tebako/error.rb
 - lib/tebako/packager.rb
 - lib/tebako/packager/pass1.rb
 - lib/tebako/packager/pass2.rb
+- lib/tebako/packager/patch_buildsystem.rb
 - lib/tebako/packager/patch_helpers.rb
+- lib/tebako/packager/patch_libraries.rb
 - lib/tebako/packager/patch_literals.rb
 - lib/tebako/version.rb
 - resources/tebako-fs.cpp.in