tebako 0.5.11 → 0.6.0

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.11"
+  VERSION = "0.6.0"
 end

data/src/tebako-main.cpp

@@ -35,6 +35,7 @@
 #include <fcntl.h>
 
 #include <string>
+#include <cstdint>
 
 #ifdef _WIN32
  #include <winsock2.h>
@@ -148,41 +149,3 @@ extern "C" int tebako_main(int* argc, char*** argv) {
 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;
-}
-
-#endif

data/version.txt

@@ -1 +1 @@
-0.5.11
+0.6.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.6.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-26 00:00:00.000000000 Z
+date: 2024-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -65,11 +65,13 @@ 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_helpers.rb
+- lib/tebako/packager/patch_libraries.rb
 - lib/tebako/packager/patch_literals.rb
 - lib/tebako/version.rb
 - resources/tebako-fs.cpp.in