tebako 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dcc229108a9b5326a4bcb8b0b5759309a1ab5f6811e5a8ab7fd2137ea962039
-  data.tar.gz: 0efd3f0bbaac72b4baf9e7f738d530a98643657e0d8a40fa9700e06943575d82
+  metadata.gz: 4f1af67f13e230840eb812871c10cfc25332cc2479f70ca3653bb57b395705ff
+  data.tar.gz: ae23b253616c15efdbf92fdb539626b1854a31281ad92802aa9484cf50985cc6
 SHA512:
-  metadata.gz: d182cfef39a103bd9c5b4cd2aaf2dd230bd10c4383d172920948a55f6994673fc53783fe07305fbc27219d2888ff9f3e92ab0d701fd47436ad7510e7f50f4958
-  data.tar.gz: 1a7bc54186bdece6993acedce77d40e20ab032a01b1d0243d33e39082cfb3ca36704517ca8725dbf8064706d191690942f8ee3f821ae7881bd52d38cdc2af97d
+  metadata.gz: d9c722d8e2bf9544337520357fa9a5ec72896ded55f82f9c501e428f2707fae727bf9ffae837ab16e7a7ebe419266f069b74dbf5435ef4135312460a77a9e8b8
+  data.tar.gz: 94f7c668de8aaaecd3ec2ac0e80fb98a0fccfa997a8803f4bfbebb15225bb3cf55493590d715e774f0cbb952a06faaf425250d53fc953a50dfe83539c3977397

data/Brewfile

@@ -2,7 +2,6 @@
 
 brew "zlib"
 brew "ncurses"
-brew "libevent"
 brew "libsodium"
 brew "lz4"
 brew "xz"
@@ -14,10 +13,6 @@ brew "bison"
 brew "flex"
 brew "binutils"
 brew "libffi"
-brew "double-conversion"
-brew "boost"
 brew "jemalloc"
-brew "fmt"
-brew "glog"
 brew "gnu-sed"
 brew "bash"

data/CMakeLists.txt

@@ -91,7 +91,10 @@ set(IS_MSYS OFF)
 set(IS_DARWIN OFF)
 set(RB_W32 OFF)
 set(RUBY_WITHOUT_EXT "dbm,win32,win32ole,-test-/*")
-set(DWARFS_PRELOAD OFF)
+option(DWARFS_PRELOAD "Deploy the prebuilt libtfs package from the GitHub release (OFF builds libtfs from source with the vcpkg toolchain)" ON)
+if(DEFINED ENV{DWARFS_PRELOAD})
+  set(DWARFS_PRELOAD $ENV{DWARFS_PRELOAD} CACHE BOOL "Deploy the prebuilt libtfs package from the GitHub release" FORCE)
+endif()
 set(WITH_PATCHELF OFF)
 
 if("${OSTYPE_TXT}" MATCHES "^linux-gnu.*")
@@ -103,7 +106,6 @@ elseif("${OSTYPE_TXT}" MATCHES "^linux-musl.*")
   set(IS_MUSL ON)
 elseif("${OSTYPE_TXT}" MATCHES "^msys*" OR "${OSTYPE_TXT}" MATCHES "^cygwin*")
   set(IS_MSYS ON)
-  # set(DWARFS_PRELOAD ON)
   set(RB_W32 ON)
   set(RUBY_WITHOUT_EXT "dbm,syslog,pty,gdbm,readline,-test-/*")
 elseif("${OSTYPE_TXT}" MATCHES "^darwin.*")
@@ -168,18 +170,49 @@ set(RUBY_STASH_DIR ${DEPS}/stash_${RUBY_VER})
 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.8" "7bf8e5b4432f35b65f6034f614067c2018995c1bebaf935e8cdddc1a3e045c01")
-#
-#  string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*" "\\1;\\2;\\3" LIBDWARFS_WR_VER_COMPONENTS ${LIBDWARFS_WR_VER})
-#
-#  list(GET LIBDWARFS_WR_VER_COMPONENTS 0 LIBDWARFS_WR_VER_MAJOR)
-#  list(GET LIBDWARFS_WR_VER_COMPONENTS 1 LIBDWARFS_WR_VER_MINOR)
-#  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.11.0")
-#endif(DWARFS_PRELOAD)
+# libtfs (former libdwarfs-wr): DWARFS_WR_TAG selects the libtfs git tag for
+# the source build and the matching GitHub release for the prebuilt package
+# NOTE: the env override in def_ext_prj_g (tebako-tools) is currently broken
+# (`if (DEFINED ENV{${TAG})` is missing a closing brace, so the test never
+# fires); this default is the operative tag selection.
+def_ext_prj_g(DWARFS_WR "v0.12.8")
+
+# Provisions libtfs (prebuilt package or vcpkg toolchain for the source
+# build), the prebuilt mkdwarfs, and -- for the prebuilt path -- the
+# transitive static dependencies the libtfs package does not ship.
+# Sets LIBTFS_* variables summarized below.
+include(${CMAKE_SOURCE_DIR}/cmake/tebako-libtfs.cmake)
+
+# incbin (graphitemaster/incbin): single-header asset embedding used by
+# include/tebako/tebako-fs.h and the codegen templates. It was deployed into
+# ${DEPS_INCLUDE_DIR} by the libdwarfs-wr package; libtfs does not carry it,
+# so tebako provisions it directly. The pin matches common.env INCBIN_TAG
+# (which reaches this file only when the tebako-tools env override works --
+# see the DWARFS_WR note above).
+def_ext_prj_g(INCBIN "6e576cae5ab5810f25e2631f2e0b80cbe7dc8cbf")
+set(INCBIN_HEADER "${DEPS_INCLUDE_DIR}/incbin/incbin.h")
+set(INCBIN_SHA256 "70995329299ec55d414ad6df6929ddcfe0a43a40102cf6c05ff3c74ddd2765cb")
+set(__INCBIN_DOWNLOAD ON)
+if(EXISTS "${INCBIN_HEADER}")
+  file(SHA256 "${INCBIN_HEADER}" __INCBIN_CURRENT)
+  if(__INCBIN_CURRENT STREQUAL INCBIN_SHA256)
+    set(__INCBIN_DOWNLOAD OFF)
+  endif()
+endif()
+if(__INCBIN_DOWNLOAD)
+  message(STATUS "incbin: fetching incbin.h @ ${INCBIN_TAG}")
+  file(MAKE_DIRECTORY "${DEPS_INCLUDE_DIR}/incbin")
+  file(DOWNLOAD "https://raw.githubusercontent.com/graphitemaster/incbin/${INCBIN_TAG}/incbin.h"
+       "${INCBIN_HEADER}" EXPECTED_HASH "SHA256=${INCBIN_SHA256}"
+       STATUS __INCBIN_STATUS)
+  list(GET __INCBIN_STATUS 0 __INCBIN_CODE)
+  list(GET __INCBIN_STATUS 1 __INCBIN_MSG)
+  if(NOT __INCBIN_CODE EQUAL 0)
+    file(REMOVE "${INCBIN_HEADER}")
+    message(FATAL_ERROR "incbin: failed to download incbin.h: ${__INCBIN_MSG}")
+  endif()
+  message(STATUS "incbin: SHA256 verified (${INCBIN_SHA256})")
+endif()
 
 def_ext_prj_g(PATCHELF "65e14792061c298f1d2bc44becd48a10cbf0bc81")
 
@@ -192,10 +225,17 @@ message("Configuration summary:")
 message(STATUS "ruby: v${RUBY_VER} at ${RUBY_SOURCE_DIR}")
 
 if(DWARFS_PRELOAD)
-  message(STATUS "dwarfs with tebako wrapper: deploying v${LIBDWARFS_WR_VER} to ${LIBDWARFS_WR_SOURCE_DIR}")
+  message(STATUS "libtfs: v${LIBTFS_VERSION} prebuilt package (${LIBTFS_PLATFORM}) at ${LIBTFS_LIB_DIR}")
 else(DWARFS_PRELOAD)
-  message(STATUS "dwarfs with tebako wrapper: @${DWARFS_WR_TAG} at ${DWARFS_WR_SOURCE_DIR}")
+  message(STATUS "libtfs: source build @${DWARFS_WR_TAG} at ${DWARFS_WR_SOURCE_DIR}")
 endif(DWARFS_PRELOAD)
+message(STATUS "libtfs headers: ${LIBTFS_INCLUDE_DIR}")
+message(STATUS "mkdwarfs: ${LIBTFS_MKDWARFS}")
+if(LIBTFS_VCPKG_TRIPLET_DIR)
+  message(STATUS "libtfs transitive dependencies (vcpkg): ${LIBTFS_VCPKG_TRIPLET_DIR}")
+else()
+  message(STATUS "libtfs transitive dependencies (vcpkg): ${LIBTFS_VCPKG_INSTALLED_DIR}/<triplet> (resolved during the libtfs build)")
+endif()
 
 # ...................................................................
 # Filesystem locations
@@ -241,43 +281,30 @@ message(STATUS "Removing GLIBC_PRIVATE reference: ${WITH_PATCHELF}")
 message(STATUS "Not building Ruby extensions: ${RUBY_WITHOUT_EXT}")
 
 # ...................................................................
-# DwarFS with tebako wrapper
+# DwarFS-based tebako filesystem library (libtfs)
 
 # ...................................................................
-# The libraries that are build by DwarFS project
-# libdwarfs libfolly libfsst libxxhash libmetadata_thrift libthrift_light
-# These forward-declarations and BUILD_BYPRODICTS are required to support 'Ninja'
+# The libraries provided by libtfs (prebuilt package or source build):
+# libtfs.a plus its pure-C dirent helper. These forward-declarations and
+# BUILD_BYPRODUCTS are required to support 'Ninja'
 # Otherwise add_dependencies would be enough for 'Unix makefiles' generator
 
-set(__LIBDWARFS_WR "${DEPS_LIB_DIR}/libdwarfs-wr.a")
-set(__LIBDWARFS "${DEPS_LIB_DIR}/libdwarfs.a")
-set(__LIBFOLLY "${DEPS_LIB_DIR}/libfolly.a")
-set(__LIBFSST "${DEPS_LIB_DIR}/libfsst.a")
-set(__LIBT_METADATA "${DEPS_LIB_DIR}/libmetadata_thrift.a")
-set(__LIBT_LIGHT "${DEPS_LIB_DIR}/libthrift_light.a")
-set(__LIBXXHASH "${DEPS_LIB_DIR}/libxxhash.a")
-set(__LIBZSTD "${DEPS_LIB_DIR}/libzstd.a")
-set(__LIBARCHIVE "${DEPS_LIB_DIR}/libarchive.a")
+set(__LIBTFS "${DEPS_LIB_DIR}/libtfs.a")
+set(__LIBTFS_HELPER "${DEPS_LIB_DIR}/libtebako_dirent_helper_c.a")
 
 if(DWARFS_PRELOAD)
-  ExternalProject_Add(${LIBDWARFS_WR_PRJ}
-    PREFIX ${DEPS}
-    URL https://github.com/tamatebako/libdwarfs/releases/download/v${LIBDWARFS_WR_VER}/libdwarfs-wr-${LIBDWARFS_WR_VER_M}-mingw-ucrt64.7z
-    URL_HASH SHA256=${LIBDWARFS_WR_HASH}
-    DOWNLOAD_NO_PROGRESS true
-    SOURCE_DIR ${LIBDWARFS_WR_SOURCE_DIR}
-    UPDATE_COMMAND ""
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS}
-            COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDWARFS_WR_SOURCE_DIR} ${DEPS}
-    TEST_COMMAND ""
+  # Everything for the prebuilt path (download, SHA256 verification,
+  # deployment to ${DEPS}, vcpkg transitive dependencies) was done at
+  # configure time by cmake/tebako-libtfs.cmake; the target only keeps the
+  # dependency graph (ruby, setup) intact.
+  add_custom_target(${DWARFS_WR_PRJ}
+    COMMAND ${CMAKE_COMMAND} -E echo "libtfs v${LIBTFS_VERSION} prebuilt package [${LIBTFS_PLATFORM}] deployed to ${DEPS}"
   )
 else(DWARFS_PRELOAD)
   ExternalProject_Add(${DWARFS_WR_PRJ}
     GIT_SHALLOW true
     PREFIX ${DEPS}
-    GIT_REPOSITORY https://github.com/tamatebako/libdwarfs.git
+    GIT_REPOSITORY https://github.com/tamatebako/libtfs.git
     GIT_TAG ${DWARFS_WR_TAG}
     SOURCE_DIR ${DWARFS_WR_SOURCE_DIR}
     BINARY_DIR ${DWARFS_WR_BINARY_DIR}
@@ -288,13 +315,20 @@ else(DWARFS_PRELOAD)
                -DWITH_TESTS:BOOL=OFF
                -DWITH_ASAN:BOOL=OFF
                -DWITH_COVERAGE:BOOL=OFF
-               -DTEBAKO_BUILD_SCOPE=MKD
+               -DWITH_LEGACY_TEBAKO_API:BOOL=ON
+               # SquashFS adapter stays off in tebako builds (LGPL; tebako
+               # packages use the dwarfs/zip backends only)
+               -DWITH_SQUASHFS:BOOL=OFF
+               -DMKDWARFS=${DEPS_BIN_DIR}/mkdwarfs
+               -DTEBAKO_BUILD_SCOPE=LIB
                -DOPENSSL_VERSION=${OPENSSL_VER}
                -DRB_W32=${RB_W32}
+               -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake
+               -DVCPKG_INSTALLED_DIR=${LIBTFS_VCPKG_INSTALLED_DIR}
+               ${LIBTFS_VCPKG_EP_TRIPLET_ARG}
                -GNinja
-    BUILD_BYPRODUCTS ${__LIBDWARFS_WR}
-                     ${__LIBDWARFS} ${__LIBFSST} ${__LIBFOLLY} ${__LIBT_METADATA}
-                     ${__LIBT_LIGHT} ${__LIBXXHASH} ${__LIBZSTD} ${__LIBARCHIVE}
+    BUILD_BYPRODUCTS ${__LIBTFS}
+                     ${__LIBTFS_HELPER}
   )
 endif(DWARFS_PRELOAD)
 
@@ -319,7 +353,21 @@ endif(IS_GNU)
 # Ruby
 
 set(RUBY_L_FLAGS "-L${DEPS_LIB_DIR} -L${CMAKE_CURRENT_BINARY_DIR}")
+if(LIBTFS_VCPKG_TRIPLET_DIR)
+  # Transitive static deps of libtfs (dwarfs reader set, flatbuffers, zip,
+  # codecs) live in the vcpkg install tree; referenced as -l:lib<name>.a in
+  # the patched ruby MAINLIBS (lib/tebako/packager/patch_libraries.rb)
+  string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -L${LIBTFS_VCPKG_TRIPLET_DIR}/lib")
+endif(LIBTFS_VCPKG_TRIPLET_DIR)
 set(RUBY_C_FLAGS "-fPIC -I${DEPS_INCLUDE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/include -Wno-incompatible-pointer-types")
+if(LIBTFS_VCPKG_TRIPLET_DIR)
+  # The transitive deps' headers (deployed from the libtfs-deps package or
+  # installed by vcpkg) live in the triplet include dir. Baked into rbconfig
+  # via the ruby build, this -I lets mkmf-driven gem native extensions
+  # (e.g. the brotli gem) resolve headers like <brotli/encode.h> when the
+  # packaged build runs gem install.
+  string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -I${LIBTFS_VCPKG_TRIPLET_DIR}/include")
+endif(LIBTFS_VCPKG_TRIPLET_DIR)
 
 if(${RUBY_VER} VERSION_LESS "3.2.0" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "15.0.0" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
   string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -std=gnu17")