Klammertext runs natively on Windows; a Windows source-install guide; the bundled sh for @eval :shell
Assembled from klammertext-dev f344a37d0f6e. The commands, the library,
the Standard Klammer Set, the reflection klammerset and the Python
binding build and run natively on Windows (MSYS2 UCRT64 gcc, python.org
Python), and both test tiers pass there. doc/install/windows_source_install.md
is the fifth install guide: a source install parallel to the Linux and
macOS ones, verified by following it on a pristine Windows 11.
Behaviour on every system: paths Klammertext prints use forward slashes;
output is LF; the command line is UTF-8 on Windows; @eval :shell is a
POSIX shell command everywhere -- on Windows it runs the sh Klammertext
ships, BusyBox for Windows (win/busybox/, GPLv2, with its licence and the
source pointer). KLAMMERTEXT_FONTS and KLAMMERTEXT_KLAMMERSETS are lists in
the system's PATH convention (';' on Windows). On Linux and macOS nothing
observable changes.
This commit is contained in:
ack committed
1 parent
f9af1ff869
commit
fe475e774a
55 files changed
+1182
-153
No files matched your search
Vendored
+37
-1
@@ -27,9 +27,20 @@ else
|
||||
COMPILER ?= gcc # gcc | clang
|
||||
endif
|
||||
|
||||
# Python: version- and platform-agnostic, no hardcoded paths.
|
||||
# Python: version- and platform-agnostic, no hardcoded paths. On Windows the
|
||||
# interpreter is python.org's (the one PyPI wheels -- OpenImageIO -- are built
|
||||
# for); it ships no python3-config, so its prefix is asked of the interpreter
|
||||
# itself and its import library named by version (libs/python312.lib).
|
||||
ifneq (,$(filter MINGW% MSYS%,$(UNAME_S)))
|
||||
PYTHON := python
|
||||
PYTHON_PREFIX := $(shell cygpath -m "$$($(PYTHON) -c 'import sys; print(sys.base_prefix)')")
|
||||
PYTHON_INC := -I"$(PYTHON_PREFIX)/Include"
|
||||
PYTHON_LIB := -L"$(PYTHON_PREFIX)/libs" -l$(shell $(PYTHON) -c 'import sys; print("python%d%d" % sys.version_info[:2])')
|
||||
else
|
||||
PYTHON := python3
|
||||
PYTHON_INC := $(shell python3-config --includes)
|
||||
PYTHON_LIB := $(shell python3-config --ldflags --embed)
|
||||
endif
|
||||
|
||||
# Flags common to all platforms.
|
||||
CPPFLAGS = -I$(KLAMMERTEXT_HOME)/mac $(PYTHON_INC)
|
||||
@@ -52,6 +63,29 @@ SHARED = -dynamiclib
|
||||
SONAME = -install_name @rpath/$(notdir $@)
|
||||
ORIGIN := @loader_path
|
||||
EXPORT_DYNAMIC = -Wl,-export_dynamic
|
||||
else ifneq (,$(filter MINGW% MSYS%,$(UNAME_S)))
|
||||
# ---------- Windows (MSYS2, UCRT64 environment; native PE binaries) ----------
|
||||
# uname says MINGW64_NT-... under UCRT64 too. The compilers come from the
|
||||
# environment's PATH (/ucrt64/bin). libdl.a is the mingw-w64-dlfcn shim over
|
||||
# LoadLibrary, linked statically so no libdl.dll travels with the products.
|
||||
# PE has no soname and no rpath; a DLL is found through PATH or
|
||||
# the executable's own directory, and GNU ld's -l search list on PE does not
|
||||
# include ".so", hence the exact-name form below.
|
||||
GCC := g++
|
||||
CLANG := clang++
|
||||
LDFLAGS =
|
||||
LDLIBS = -l:libdl.a $(if $(NOPYTHON),,$(PYTHON_LIB))
|
||||
SHARED = -shared
|
||||
SONAME =
|
||||
ORIGIN := $$ORIGIN
|
||||
EXPORT_DYNAMIC = -Wl,--export-all-symbols
|
||||
KLAMMERTEXT_LIB = -l:libklammertext.so
|
||||
# A Windows program finds a DLL through PATH or its own directory, never an
|
||||
# rpath. So every directory that holds a program or a Python extension also
|
||||
# holds the DLLs it needs: libklammertext.so and the three gcc runtime DLLs
|
||||
# the toolchain links (from the compiler's own bin/). com/ and kpy/ copy them.
|
||||
GCC_BIN := $(dir $(shell cygpath -m "$$(command -v g++)"))
|
||||
GCC_RUNTIME_DLLS := libstdc++-6.dll libgcc_s_seh-1.dll libwinpthread-1.dll
|
||||
else
|
||||
# ---------- Linux ----------
|
||||
GCC := /usr/bin/g++
|
||||
@@ -63,6 +97,8 @@ SONAME = -Wl,-soname,$(notdir $@)
|
||||
ORIGIN := $$ORIGIN
|
||||
EXPORT_DYNAMIC = -rdynamic
|
||||
endif
|
||||
# How a link line names libklammertext (set above for Windows).
|
||||
KLAMMERTEXT_LIB ?= -lklammertext
|
||||
|
||||
# Resolve the compiler choice (gcc by default; clang with COMPILER=clang).
|
||||
CXX := $(if $(filter clang,$(COMPILER)),$(CLANG),$(GCC))
|
||||
Vendored
+23
-3
@@ -20,6 +20,19 @@ export KLAMMERTEXT_HOME="$(cd "$(dirname "$_kt_self")/.." && pwd)"
|
||||
unset _kt_self
|
||||
|
||||
_kt_uname="$(uname -s)"
|
||||
# Windows under MSYS2: the commands are native programs and never understand
|
||||
# MSYS's /c/... spelling, so KLAMMERTEXT_HOME and TMPDIR reach them in Windows
|
||||
# form (C:/..., cygpath -m). bash's own PATH keeps the POSIX form -- a colon
|
||||
# inside a PATH entry splits it. Python (python.org's) is the user's to put on
|
||||
# PATH; an MSYS2 login shell does not inherit the Windows PATH by default.
|
||||
_kt_home_posix="$KLAMMERTEXT_HOME"
|
||||
case "$_kt_uname" in
|
||||
MINGW*|MSYS*)
|
||||
export KLAMMERTEXT_HOME="$(cygpath -m "$KLAMMERTEXT_HOME")"
|
||||
export TMPDIR="$(cygpath -m "${TMPDIR:-/tmp}")"
|
||||
export PYTHON="${PYTHON:-python}" # python.org installs no python3
|
||||
;;
|
||||
esac
|
||||
|
||||
# --- KLAMMERTEXT_TEXLIVE_BIN: newest installed TeX Live under ~/external -------
|
||||
# Klammertext's TeX Live installs are named by 4-digit year (2024, 2025, 2026).
|
||||
@@ -27,20 +40,27 @@ _kt_uname="$(uname -s)"
|
||||
# are never selected; sort -V then picks the newest year.
|
||||
if [ "$_kt_uname" = "Darwin" ]; then
|
||||
_kt_arch="universal-darwin"
|
||||
elif case "$_kt_uname" in MINGW*|MSYS*) true;; *) false;; esac; then
|
||||
_kt_arch="windows" # TeX Live's bin/windows
|
||||
else
|
||||
_kt_arch="$(uname -m)-linux" # e.g. x86_64-linux
|
||||
fi
|
||||
# Use `find` with a -path pattern, NOT a shell glob: on macOS/zsh an unmatched
|
||||
# glob (no texlive installed) is a hard "no matches found" error, whereas find
|
||||
# just returns nothing. The -path pattern keeps the 4-digit-year restriction.
|
||||
_kt_tl="$(find "$HOME/external/texlive" -maxdepth 3 -type d \
|
||||
# Windows: a user installs under the Windows home, %USERPROFILE%\external
|
||||
# (MSYS2's $HOME is C:\msys64\home\<user>, which no Windows guide would name).
|
||||
_kt_tlroot="$HOME/external/texlive"
|
||||
case "$_kt_uname" in MINGW*|MSYS*) _kt_tlroot="$(cygpath -u "$USERPROFILE")/external/texlive";; esac
|
||||
_kt_tl="$(find "$_kt_tlroot" -maxdepth 3 -type d \
|
||||
-path "*/[0-9][0-9][0-9][0-9]/bin/$_kt_arch" 2>/dev/null \
|
||||
| sort -V | tail -1)"
|
||||
[ -n "$_kt_tl" ] && export KLAMMERTEXT_TEXLIVE_BIN="$_kt_tl"
|
||||
unset _kt_tl _kt_arch
|
||||
unset _kt_tl _kt_arch _kt_tlroot
|
||||
|
||||
# --- PATH (TeX Live appended only if one was found) ---------------------------
|
||||
export PATH="$KLAMMERTEXT_HOME/bin:$KLAMMERTEXT_HOME/tst${KLAMMERTEXT_TEXLIVE_BIN:+:$KLAMMERTEXT_TEXLIVE_BIN}:$PATH"
|
||||
export PATH="$_kt_home_posix/bin:$_kt_home_posix/tst${KLAMMERTEXT_TEXLIVE_BIN:+:$KLAMMERTEXT_TEXLIVE_BIN}:$PATH"
|
||||
unset _kt_home_posix
|
||||
|
||||
# --- The Python binding (kpy/) -----------------------------------------------
|
||||
# "import klammertext" with no setup, as the container image already arranges
|
||||
|
||||
Reference in new issue
Block a user