tebako 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e86bb510a0ab1997a97f8999ddd73151f99e593c4f19c3174a2f073ef5739c9e
-  data.tar.gz: 54741b66ed07299e8455497f94e619a5fa14bd010214d3f7abee0c90972d1cc9
+  metadata.gz: 690c1fae126210478beca87208f26cc10aaad5b7081f41d7e25bcc994677d201
+  data.tar.gz: 6cce9afe63c5195679c8fb31a2462a52dce5e31be005e4b1187e2c95672cb2f5
 SHA512:
-  metadata.gz: 40915aa707b703d62cdb0b7e1cf798d1a707db3e2b1537df821ef6b16d87b4f057c21b2204e4362aa2582a2f236be78138e7b00db01a1ed56ce40f5e8cd23991
-  data.tar.gz: d3104d718a7001e0a8b89551b774c614daf80e37c2ce720af9c1ef3ece914dc457f3fec6fa0e17a0684e199b651beb04dd95890805ae9e5bf0339d29dd37c42e
+  metadata.gz: e507d6cb7f1cae51c154c10678a14f2954bca20876950979d3c47d9cccbce098e62bfc11f0a1d0514e3de49bf5f51dc5c9acad842a34ea30bddcf1db3a481d70
+  data.tar.gz: cf04ee58de3be8691c9f1e949707f5161d76fd0b056f039c6aa9b5cfd1261978d7458714810e7d5a62c4e73bb4eee536dc2a7a4c42646f9d283dc96c7f6f0ed3

data/CMakeLists.txt

@@ -116,13 +116,9 @@ set(IS_MUSL OFF)
 set(IS_MSYS OFF)
 set(IS_DARWIN OFF)
 set(RB_W32 OFF)
-set(RUBY_WITHOUT_EXT "dbm,win32,win32ole,'-test-'")
+set(RUBY_WITHOUT_EXT "dbm,win32,win32ole,-test-/*")
 set(RUBY_NAME "ruby")
-set(RUBY_SUFFIX "")
 set(EXE_SUFFIX "")
-set(CMD_SUFFIX "")
-set(BAT_SUFFIX "")
-set(RUBY_MAKEFILE "")
 set(DWARFS_PRELOAD OFF)
 
 if("${OSTYPE_TXT}" MATCHES "^linux-musl.*")
@@ -131,12 +127,8 @@ elseif("${OSTYPE_TXT}" MATCHES "^msys*")
   set(IS_MSYS ON)
   # set(DWARFS_PRELOAD ON)
   set(RB_W32 ON)
-  set(RUBY_WITHOUT_EXT "dbm,syslog,pty,gdbm,readline,'-test-'")
-  #set(RUBY_SUFFIX "w")
+  set(RUBY_WITHOUT_EXT "dbm,syslog,pty,gdbm,readline,-test-/*")
   set(EXE_SUFFIX ".exe")
-  set(CMD_SUFFIX ".cmd")
-  set(BAT_SUFFIX ".bat")
-  #set(RUBY_MAKEFILE "--file=GNUmakefile")
 elseif("${OSTYPE_TXT}" MATCHES "^darwin.*")
   set(IS_DARWIN ON)
   if(${RUBY_VER} VERSION_LESS "3.1.0")
@@ -202,7 +194,7 @@ string(SUBSTRING ${RUBY_VER} 0 3 RUBY_VER_BASE)
 string(CONCAT RUBY_API_VER ${RUBY_VER_BASE} ".0")
 
 if(DWARFS_PRELOAD)
-  def_ext_prj_t(LIBDWARFS_WR "0.5.1" "7bf8e5b4432f35b65f6034f614067c2018995c1bebaf935e8cdddc1a3e045c01")
+  def_ext_prj_t(LIBDWARFS_WR "0.5.5" "7bf8e5b4432f35b65f6034f614067c2018995c1bebaf935e8cdddc1a3e045c01")
 
   string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*" "\\1;\\2;\\3" LIBDWARFS_WR_VER_COMPONENTS ${LIBDWARFS_WR_VER})
 
@@ -211,7 +203,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.4")
+  def_ext_prj_g(DWARFS_WR "v0.5.5")
 endif(DWARFS_PRELOAD)
 
 set(LIBYAML_RUBY_OPTION "")
@@ -385,8 +377,8 @@ ExternalProject_Add(${RUBY_PRJ}
                                                         ${C_FLAGS_DEST}=\"${RUBY_C_FLAGS}\"   \
                                                         LDFLAGS=\"${RUBY_L_FLAGS}\""
   COMMAND          ruby ${EXE}/tebako-packager pass1a ${RUBY_SOURCE_DIR}
-  BUILD_COMMAND    make ${RUBY_MAKEFILE} -j${NCORES}
-  INSTALL_COMMAND  make ${RUBY_MAKEFILE} install
+  BUILD_COMMAND    make -j${NCORES}
+  INSTALL_COMMAND  make install -j${NCORES}
   COMMAND          ${GNU_BASH} -c "ruby ${EXE}/tebako-packager pass2 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${DEPS_LIB_DIR} ${DATA_SRC_DIR} ${RUBY_STASH_DIR} ${RUBY_VER}"
 )
 
@@ -462,7 +454,6 @@ else (${SETUP_MODE})
   )
 
   add_custom_target(packaged_filesystem
-    COMMAND ruby ${EXE}/tebako-packager strip ${OSTYPE_TXT} ${DATA_SRC_DIR}
     COMMAND ${GNU_BASH} -c "chmod +x ${DEPS_BIN_DIR}/mkdwarfs${EXE_SUFFIX}"
     # No progress below is critical since in reporting mode mkdwarfs tries to work directly with terminal
     # and it creates issues for stderr redirects (&2 > 1) used by Ninja and our test srcipts
@@ -484,25 +475,25 @@ else (${SETUP_MODE})
     ${DEPS_INCLUDE_DIR}/tebako/tebako-version.h
   )
 
+  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*")
+
   add_dependencies(tebako-fs packaged_filesystem)
 
   if (${RUBY_VER} VERSION_LESS "3.0.0")
-    add_custom_target(patched_ruby
-      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make ${RUBY_MAKEFILE} -j${NCORES}
-    )
+    add_custom_target(tebako
+      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make -j${NCORES}
+      COMMAND ruby ${EXE}/tebako-packager finalize ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${APP_NAME}
+      )
   else()
-    add_custom_target(patched_ruby
-      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make ruby ${RUBY_MAKEFILE} -j${NCORES}
-      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make ${RUBY_MAKEFILE} -j${NCORES}
-    )
+    add_custom_target(tebako
+      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make ruby -j${NCORES}
+      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make -j${NCORES}
+      COMMAND ruby ${EXE}/tebako-packager finalize ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${APP_NAME}
+      )
   endif()
 
-  add_dependencies(patched_ruby setup tebako-fs)
-
-  add_custom_target(tebako ALL
-    COMMAND ${CMAKE_COMMAND} -E copy ${RUBY_SOURCE_DIR}/ruby${RUBY_SUFFIX}${EXE_SUFFIX} ${APP_NAME}${EXE_SUFFIX}
-    COMMAND ${CMAKE_COMMAND} -E echo "Tebako packaging has completed"
-    DEPENDS patched_ruby
-  )
+  add_dependencies(tebako setup tebako-fs)
 
 endif(${SETUP_MODE})