tebako 0.8.3 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf7f343e3ed1cef12b766eaa2cc0834c31882f7cf78629b5079856d9c5b94765
-  data.tar.gz: 852554fa13a1c95a22bef4234a2063f0879b66ffd53b0cc2635b232c8dbfa1bd
+  metadata.gz: ebe002df1e8e8daadd33a026a9c6025942fbfd862a3db0c3ef1c65ffefa4b631
+  data.tar.gz: d814f2f7c57f01d497472afb7262f7ae635af13f16e107eaa3794dd180474309
 SHA512:
-  metadata.gz: ad25d6a39cb8a2b3ff00d2f109299682da1cdceda1b852e9ea6b144b6bfbc4e087a70e9441295196623e10f5f9281390fefa2c9d9b40858e7beb622d6a860275
-  data.tar.gz: fdcf01004d51fafd178f76fc7684140653cdf84dc8ea400c2956713c7034e0b8f99b7ff46f236babc1b8b313ac4f199b128d0c6fb8d5f71af93baa215c23e743
+  metadata.gz: c2e39d4b7869385b5ef17ed3e6233ea83040f18b8b791a8ac195c3a4c94846954e4a7a1ef64e6a176fd4f4c335cd81c234446b41602e8dcd45e03fdde137cf83
+  data.tar.gz: e97d5ffc1d62860a623d3a342a7258f43bbfd9922cb341a26cc6ffcdeda8d5efac2aafa1e67d6e0d8e5e1d7edf6860b5a91df7d739f6e38aa192fa3bc342addc

data/CMakeLists.txt

@@ -33,8 +33,9 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.23.10")
   cmake_policy(SET CMP0135 NEW)
 endif()
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake-scripts/version.cmake)
-determine_version("${CMAKE_CURRENT_SOURCE_DIR}" TEBAKO)
+if ("-${TEBAKO_VERSION}" STREQUAL "-")
+  message(FATAL_ERROR "Tebako version is not specified.")
+endif()
 
 project(tebako_packager VERSION ${TEBAKO_VERSION})
 
@@ -203,7 +204,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.5.8")
+def_ext_prj_g(DWARFS_WR "v0.5.9")
 #endif(DWARFS_PRELOAD)
 
 set(LIBYAML_RUBY_OPTION "")
@@ -331,7 +332,7 @@ endif(DWARFS_PRELOAD)
 # Ruby
 
 set(RUBY_L_FLAGS "-L${DEPS_LIB_DIR} -L${CMAKE_CURRENT_BINARY_DIR}")
-set(RUBY_C_FLAGS "-pthread -I${DEPS_INCLUDE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/include")
+set(RUBY_C_FLAGS "-fPIC -I${DEPS_INCLUDE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/include")
 
 # Shadow
 # https://github.com/deivid-rodriguez/byebug/issues/825
@@ -340,16 +341,13 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -fdeclspec")
 endif()
 
-set(C_FLAGS_DEST cppflags)
+set(C_FLAGS_DEST cflags)
 
 if(IS_DARWIN)
   string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -I${BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/include -I${BREW_PREFIX}/opt/zlib/include -I${BREW_PREFIX}/include")
   string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -L${BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/lib -L${BREW_PREFIX}/opt/zlib/lib  -L${BREW_PREFIX}/lib")
   set(OPENSSL_RUBY_OPTION "--with-openssl-dir=${BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")
-  set(C_FLAGS_DEST cflags)
 else(IS_DARWIN)
-  string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -static-libgcc")
-
   if(IS_MUSL)
     string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -DENABLE_PATH_CHECK=0")
   endif(IS_MUSL)
@@ -357,7 +355,13 @@ else(IS_DARWIN)
   if(RB_W32)
     string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -DRB_W32=1")
     string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -l:libstdc++.a -L${TLIBD}")
+    set(C_FLAGS_DEST cppflags)
   endif(RB_W32)
+
+  # Ruby 2.7 configure script error
+  if(${RUBY_VER} VERSION_LESS "3.0.0")
+    set(C_FLAGS_DEST cppflags)
+  endif()
 endif(IS_DARWIN)
 
 message(STATUS "Ruby build ${C_FLAGS_DEST}='${RUBY_C_FLAGS}'")
@@ -484,6 +488,9 @@ else (${SETUP_MODE})
     ${DEPS_INCLUDE_DIR}/tebako/tebako-version.h
   )
 
+  #et_target_properties(tebako-fs PROPERTIES POSITION_INDEPENDENT_CODE ON)
+  #target_compile_options(tebako-fs PRIVATE -fPIE)
+
   if(${RUBY_VER} VERSION_LESS "3.3.0" AND "${OSTYPE_TXT}" MATCHES "^msys*")
     target_compile_definitions(tebako-fs PUBLIC RB_W32_PRE_33)
   endif(${RUBY_VER} VERSION_LESS "3.3.0" AND "${OSTYPE_TXT}" MATCHES "^msys*")

data/Rakefile

@@ -33,14 +33,3 @@ RuboCop::RakeTask.new
 RSpec::Core::RakeTask.new(:spec)
 
 task default: %i[rubocop spec]
-
-desc "Generate version.txt"
-task "generate_version_txt" do
-  require_relative "lib/tebako/version"
-  version_without_rc = Tebako::VERSION.gsub(/\.rc\d+/, "")
-  File.write(File.join(__dir__, "version.txt"), "#{version_without_rc}\n")
-  puts "Generating #{File.join(__dir__, "version.txt")}; version = #{version_without_rc}"
-end
-
-task build: :generate_version_txt
-task release: :generate_version_txt

data/common.env

@@ -1,5 +1,5 @@
 BUILD_TYPE=Release
 DEPS=deps
 INCBIN_TAG=348e36b
-DWARFS_WR_TAG=v0.5.8
+DWARFS_WR_TAG=v0.5.9
 RUBY_VER=3.2.5

data/lib/tebako/cli_helpers.rb

@@ -55,7 +55,8 @@ module Tebako
       # So we have to use \"xxx\"
       @cfg_options ||=
         "-DCMAKE_BUILD_TYPE=Release -DRUBY_VER:STRING=\"#{ruby_ver}\" -DRUBY_HASH:STRING=\"#{ruby_hash}\" " \
-        "-DDEPS:STRING=\"#{deps}\" -G \"#{m_files}\" -B \"#{output_folder}\" -S \"#{source}\""
+        "-DDEPS:STRING=\"#{deps}\" -G \"#{m_files}\" -B \"#{output_folder}\" -S \"#{source}\" " \
+        "-DTEBAKO_VERSION:STRING=\"#{Tebako::VERSION}\""
     end
 
     def clean_cache

data/lib/tebako/deploy_helper.rb

@@ -100,7 +100,7 @@ module Tebako
     end
 
     def needs_bundler?
-      @gf_length.positive?
+      @gf_length.positive? && !@ruby_ver.ruby31?
     end
 
     def update_rubygems
@@ -171,14 +171,28 @@ module Tebako
     end
 
     def configure_commands
-      @cmd_suffix = @os_type =~ /msys/ ? ".cmd" : ""
-      @bat_suffix = @os_type =~ /msys/ ? ".bat" : ""
+      if @os_type =~ /msys/
+        configure_commands_msys
+      else
+        configure_commands_not_msys
+      end
 
       @gem_command = File.join(@tbd, "gem#{@cmd_suffix}")
       @bundler_command = File.join(@tbd, "bundle#{@bat_suffix}")
+    end
+
+    def configure_commands_msys
+      @cmd_suffix = ".cmd"
+      @bat_suffix = ".bat"
+      @force_ruby_platform = "true"
+      @nokogiri_option = "--use-system-libraries"
+    end
 
-      @force_ruby_platform = @os_type =~ /msys|linux-musl/ ? "true" : "false"
-      @nokogiri_option = @os_type =~ /msys/ ? "--use-system-libraries" : "--no-use-system-libraries"
+    def configure_commands_not_msys
+      @cmd_suffix = ""
+      @bat_suffix = ""
+      @force_ruby_platform = "false"
+      @nokogiri_option = "--no-use-system-libraries"
     end
 
     def configure_scenario

data/lib/tebako/packager/patch_main.rb

@@ -71,7 +71,6 @@ module Tebako
 
       class << self
         def get_main_c_patch(ruby_ver)
-          puts get_main_c_main_pattern(ruby_ver)
           {
             get_main_c_main_pattern(ruby_ver) => get_main_c_main_subst(ruby_ver),
             "ruby_init();" => MAIN_C_SUBST_RB_MAIN_INNER,

data/lib/tebako/version.rb

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

data/tebako.gemspec

@@ -55,8 +55,6 @@ Gem::Specification.new do |spec|
     end
   end
 
-  spec.files << "version.txt"
-
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = %w[cmake exe ext include lib resources src tools/ci-scripts tools/cmake-scripts tools/includes]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 2024-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -209,7 +209,6 @@ files:
 - tools/tests/setup-libhowardhinnerdate/CMakeLists.txt
 - tools/tests/setup-librachive/CMakeLists.txt
 - tools/tests/setup-libutfcpp/CMakeLists.txt
-- version.txt
 homepage: https://github.com/tamatebako/tebako
 licenses:
 - BSD-2-Clause

data/version.txt

@@ -1 +0,0 @@
-0.8.3