3 Commits
Author SHA1 Message Date
anth64 0cc9e897c1 fix: build.bat builds release before install
Matches build.sh: running install without release already built
previously just failed or installed stale artifacts.
2026-11-10 18:59:25 +01:00
anth64 ee5e46b050 fix: skip doas/sudo escalation for install under MSYS2
Neither doas nor sudo exist there and id -u never reports root,
so install/uninstall always hit the no-root error. IS_WIN is now
computed once alongside MK_FILE and reused for the priv check.
2026-11-10 18:47:12 +01:00
anth64 9462006028 fix: support MSYS2 builds on gmake
uname -s under MSYS2 never reports Windows_NT, so build.sh picked
bmake.mk and gmake.mk's platform branches silently fell through to
the Linux path (.so + -ldl), breaking the link. Detect MINGW/MSYS/
UCRT/CLANG uname prefixes in build.sh and route to gmake.mk; export
UNAME_S once so make doesn't call uname again. gmake.mk, test/gmake.mk,
and module_template/gmake.mk now derive Windows-vs-Unix from uname
instead of $(OS), with the cmd.exe/batch command path reserved for
environments without a POSIX shell (MSYS2 keeps mkdir -p/rm -rf).
2026-11-09 22:54:56 +01:00
7 changed files with 18 additions and 33 deletions

No files matched your search

-13
View File
@@ -7,19 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
## [1.0.4] - 2026-11-19
### Fixed
- `build.sh`: `install`/`uninstall` now only escalate the final install step; other targets (`clean`, etc.) and the release build run as the invoking user, so `build clean install` no longer leaves root-owned `obj/`/`bin/` that break later non-root builds
## [1.0.3] - 2026-11-14
### Fixed
- `gmake.mk`/`bmake.mk`: `install` now depends on `release` instead of a manual pre-check, so `clean install` (and `clean` anywhere earlier in the same invocation) no longer wipes the release build out from under `install`
- `build.sh`/`build.bat`: removed the now-redundant manual `release` pre-build, since `make` handles it via the dependency above
## [1.0.2] - 2026-11-10
### Fixed
- `build.sh`: install/uninstall no longer requires `doas`/`sudo` under MSYS2, where neither exists and `id -u` never reports root
- `build.bat`: now builds `release` before `install`, no separate manual build step needed
+1 -1
View File
@@ -236,7 +236,7 @@ stk_init();
## Project Status
**Current Version:** 1.0.4
**Current Version:** 1.0.1
### What Works
- Cross-platform module loading and hot-reloading
+2 -1
View File
@@ -72,7 +72,8 @@ test: debug
@echo "=== Building and running stk tests ==="
cd ${.CURDIR}/test && ${MAKE} -f bmake.mk
install: release
install:
@test -f ${.CURDIR}/${BIN_DIR}/release/${FULL_LIB} || { echo "Run 'make -f bmake.mk release' before installing."; exit 1; }
install -d ${LIBDIR} ${INCDIR}/stk
install -m 755 ${.CURDIR}/${BIN_DIR}/release/${FULL_LIB} ${LIBDIR}/
install -m 644 ${.CURDIR}/${BIN_DIR}/release/${STATIC_LIB} ${LIBDIR}/
+10
View File
@@ -1,4 +1,14 @@
@echo off
setlocal
set HAS_INSTALL=0
for %%a in (%*) do (
if "%%a"=="install" set HAS_INSTALL=1
)
if "%HAS_INSTALL%"=="1" (
make -f gmake.mk release
if errorlevel 1 exit /b 1
)
make -f gmake.mk %*
+2 -16
View File
@@ -25,22 +25,8 @@ for arg in "$@"; do
done
if [ "$HAS_INSTALL" = "1" ] || [ "$HAS_UNINSTALL" = "1" ]; then
# build as the invoking user; only install/uninstall step runs privileged,
# so obj/ and bin/ never end up root-owned
BUILD_ARGS=""
PRIV_ARGS=""
for arg in "$@"; do
case "$arg" in
install|uninstall) PRIV_ARGS="$PRIV_ARGS $arg" ;;
*) BUILD_ARGS="$BUILD_ARGS $arg" ;;
esac
done
if [ -n "$BUILD_ARGS" ]; then
make -f "$MK_FILE" $BUILD_ARGS || exit 1
fi
if [ "$HAS_INSTALL" = "1" ]; then
make -f "$MK_FILE" release || exit 1
make -f "$MK_FILE" release
fi
if [ "$IS_WIN" = "1" ] || [ "$(id -u)" = "0" ]; then
@@ -54,7 +40,7 @@ if [ "$HAS_INSTALL" = "1" ] || [ "$HAS_UNINSTALL" = "1" ]; then
exit 1
fi
$PRIV make -f "$MK_FILE" $PRIV_ARGS
$PRIV make -f "$MK_FILE" "$@"
else
make -f "$MK_FILE" "$@"
fi
+2 -1
View File
@@ -99,7 +99,8 @@ test: debug
@$(MAKE) -C test -f gmake.mk
ifneq ($(OS),Windows_NT)
install: release
install:
@test -f $(BIN_DIR)/release/$(FULL_LIB) || { echo "Run 'make -f gmake.mk release' before installing."; exit 1; }
install -d $(LIBDIR) $(INCDIR)/stk
install -m 755 $(BIN_DIR)/release/$(FULL_LIB) $(LIBDIR)/
install -m 644 $(BIN_DIR)/release/$(STATIC_LIB) $(LIBDIR)/
+1 -1
View File
@@ -3,7 +3,7 @@
#define STK_VERSION_MAJOR 1
#define STK_VERSION_MINOR 0
#define STK_VERSION_PATCH 4
#define STK_VERSION_PATCH 0
#define STK_STRINGIFY_HELPER(x) #x
#define STK_STRINGIFY(x) STK_STRINGIFY_HELPER(x)