openscad-cpp-evaluator 0.4.0__tar.gz → 0.4.1__tar.gz

{openscad_cpp_evaluator-0.4.0 → openscad_cpp_evaluator-0.4.1}/CMakeLists.txt

@@ -147,21 +147,22 @@ FetchContent_MakeAvailable(stb)
 FetchContent_Declare(cpp_linenoise GIT_REPOSITORY https://github.com/yhirose/cpp-linenoise.git GIT_TAG master GIT_SHALLOW TRUE)
 FetchContent_MakeAvailable(cpp_linenoise)
 
-# Bakes an absolute path to the bundled default font (resources/fonts/) into
-# a generated header, so StbFontProvider's default constructor doesn't need
-# a runtime-configurable resource search path.
-#
-# ponytail: fine for this repo's own tests/CLI (always built from this
-# source tree) but not how a packaged/installed build should ship a font --
-# a real install needs either the resource file copied alongside the
-# installed binary or the font bytes embedded directly into the binary
-# (e.g. via a generated byte-array header). Upgrade when packaging is
-# actually needed; not worth building now for a resource this project only
-# consumes from its own build tree so far.
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/openscad_cpp_evaluator/bundled_font_path.hpp.in
-  ${CMAKE_CURRENT_BINARY_DIR}/generated/openscad_cpp_evaluator/bundled_font_path.hpp
+# Embeds the bundled default font's (resources/fonts/) raw bytes into a
+# generated header (kBundledFontData/kBundledFontDataSize), so
+# StbFontProvider's default constructor needs no runtime file path at all --
+# a real installed/packaged build (e.g. the PyPI wheel) has no guarantee the
+# source tree's resources/fonts/ is present or at any predictable path
+# alongside the installed shared library.
+set(BUNDLED_FONT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/resources/fonts/LiberationSans-Regular.ttf)
+set(BUNDLED_FONT_HEADER ${CMAKE_CURRENT_BINARY_DIR}/generated/openscad_cpp_evaluator/bundled_font_data.hpp)
+add_custom_command(
+  OUTPUT ${BUNDLED_FONT_HEADER}
+  COMMAND ${CMAKE_COMMAND} -DIN_FILE=${BUNDLED_FONT_SRC} -DOUT_FILE=${BUNDLED_FONT_HEADER}
+          -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/embed_font.cmake
+  DEPENDS ${BUNDLED_FONT_SRC} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/embed_font.cmake
+  COMMENT "Embedding bundled font bytes into bundled_font_data.hpp"
 )
+add_custom_target(generate_bundled_font DEPENDS ${BUNDLED_FONT_HEADER})
 
 option(BUILD_TESTING "Build tests" ON)
 option(BUILD_EXAMPLES "Build the examples/ programs (e.g. minimal_debugger)" ON)

{openscad_cpp_evaluator-0.4.0 → openscad_cpp_evaluator-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openscad_cpp_evaluator
-Version: 0.4.0
+Version: 0.4.1
 Summary: C++ OpenSCAD evaluator with Python bindings
 Author: NeuSCAD Contributors
 License-Expression: MIT

openscad_cpp_evaluator-0.4.1/cmake/embed_font.cmake

@@ -0,0 +1,28 @@
+# Reads IN_FILE (binary) and writes OUT_FILE: a C++ header exposing its
+# bytes as a static array (kBundledFontData/kBundledFontDataSize). Run via
+# `cmake -DIN_FILE=... -DOUT_FILE=... -P embed_font.cmake` as a build-time
+# add_custom_command, not configure_file -- a font baked in as bytes has no
+# runtime file path to go stale once the shared library is installed
+# somewhere other than its own build tree (see this script's own call site
+# in the top-level CMakeLists.txt for the packaging bug this replaces).
+if(NOT DEFINED IN_FILE OR NOT DEFINED OUT_FILE)
+    message(FATAL_ERROR "embed_font.cmake requires -DIN_FILE=... -DOUT_FILE=...")
+endif()
+
+file(READ "${IN_FILE}" _hex HEX)
+string(LENGTH "${_hex}" _hexLen)
+math(EXPR _byteCount "${_hexLen} / 2")
+string(REGEX REPLACE "([0-9a-f][0-9a-f])" "0x\\1," _bytesCsv "${_hex}")
+
+file(WRITE "${OUT_FILE}"
+"// Auto-generated by cmake/embed_font.cmake from ${IN_FILE} -- do not edit.
+#pragma once
+#include <cstddef>
+
+namespace oscadeval {
+inline constexpr unsigned char kBundledFontData[] = {
+${_bytesCsv}
+};
+inline constexpr std::size_t kBundledFontDataSize = ${_byteCount};
+} // namespace oscadeval
+")

{openscad_cpp_evaluator-0.4.0 → openscad_cpp_evaluator-0.4.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "openscad_cpp_evaluator"
-version = "0.4.0"
+version = "0.4.1"
 description = "C++ OpenSCAD evaluator with Python bindings"
 readme = "README.md"
 requires-python = ">=3.12"

{openscad_cpp_evaluator-0.4.0 → openscad_cpp_evaluator-0.4.1}/src/CMakeLists.txt

@@ -47,6 +47,8 @@ target_include_directories(openscad_cpp_evaluator PUBLIC
 )
 target_include_directories(openscad_cpp_evaluator PRIVATE ${stb_SOURCE_DIR} ${CMAKE_BINARY_DIR}/generated)
 
+add_dependencies(openscad_cpp_evaluator generate_bundled_font)
+
 target_link_libraries(openscad_cpp_evaluator PUBLIC openscad_cpp_parser manifold Boost::polygon)
 target_link_libraries(openscad_cpp_evaluator PRIVATE linenoise)
 target_compile_options(openscad_cpp_evaluator PRIVATE

{openscad_cpp_evaluator-0.4.0 → openscad_cpp_evaluator-0.4.1}/src/text/stb_font_provider.cpp

@@ -1,11 +1,10 @@
 #include "openscad_cpp_evaluator/stb_font_provider.hpp"
 
-#include "openscad_cpp_evaluator/bundled_font_path.hpp"
+#include "openscad_cpp_evaluator/bundled_font_data.hpp"
 
 #define STB_TRUETYPE_IMPLEMENTATION
 #include <stb_truetype.h>
 
-#include <fstream>
 #include <stdexcept>
 
 namespace oscadeval {
@@ -82,16 +81,14 @@ struct StbFontProvider::Impl {
 };
 
 StbFontProvider::StbFontProvider() : impl_(std::make_unique<Impl>()) {
-    std::ifstream in(kBundledFontPath, std::ios::binary);
-    if (!in) throw std::runtime_error(std::string("could not open bundled font '") + kBundledFontPath + "'");
-    in.seekg(0, std::ios::end);
-    const auto size = in.tellg();
-    in.seekg(0);
-    impl_->data.resize(static_cast<size_t>(size));
-    in.read(reinterpret_cast<char*>(impl_->data.data()), size);
+    // Embedded at build time (cmake/embed_font.cmake) -- no runtime file
+    // path to resolve, so this works identically whether running from this
+    // repo's own build tree or a packaged/installed wheel on another
+    // machine entirely.
+    impl_->data.assign(kBundledFontData, kBundledFontData + kBundledFontDataSize);
 
     if (!stbtt_InitFont(&impl_->info, impl_->data.data(), 0)) {
-        throw std::runtime_error(std::string("failed to parse bundled font '") + kBundledFontPath + "'");
+        throw std::runtime_error("failed to parse bundled font");
     }
     impl_->family = fontNameString(impl_->info, 1);
     impl_->style = fontNameString(impl_->info, 2);

openscad_cpp_evaluator-0.4.0/include/openscad_cpp_evaluator/bundled_font_path.hpp.in

@@ -1,6 +0,0 @@
-#pragma once
-
-// Generated by CMake (configure_file) -- see CMakeLists.txt.
-namespace oscadeval {
-inline constexpr const char* kBundledFontPath = "@CMAKE_CURRENT_SOURCE_DIR@/resources/fonts/LiberationSans-Regular.ttf";
-} // namespace oscadeval