fix: install depends on release instead of manual pre-build

clean+install in one invocation (make or build.sh/build.bat) wiped the
release build between the pre-build and the install check. install now
has a real release prerequisite so make's own dependency graph handles
rebuilds correctly regardless of target order.
This commit is contained in:
anth64 committed 2026-11-14 15:41:11 +01:00
1 parent f1b9383d52
commit b094b385d5
6 files changed
+4 -20

No files matched your search

+1 -1
View File
@@ -236,7 +236,7 @@ stk_init();
## Project Status ## Project Status
**Current Version:** 1.0.2 **Current Version:** 1.0.3
### What Works ### What Works
- Cross-platform module loading and hot-reloading - Cross-platform module loading and hot-reloading
+1 -2
View File
@@ -72,8 +72,7 @@ test: debug
@echo "=== Building and running stk tests ===" @echo "=== Building and running stk tests ==="
cd ${.CURDIR}/test && ${MAKE} -f bmake.mk cd ${.CURDIR}/test && ${MAKE} -f bmake.mk
install: install: release
@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 -d ${LIBDIR} ${INCDIR}/stk
install -m 755 ${.CURDIR}/${BIN_DIR}/release/${FULL_LIB} ${LIBDIR}/ install -m 755 ${.CURDIR}/${BIN_DIR}/release/${FULL_LIB} ${LIBDIR}/
install -m 644 ${.CURDIR}/${BIN_DIR}/release/${STATIC_LIB} ${LIBDIR}/ install -m 644 ${.CURDIR}/${BIN_DIR}/release/${STATIC_LIB} ${LIBDIR}/
-10
View File
@@ -1,14 +1,4 @@
@echo off @echo off
setlocal 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 %* make -f gmake.mk %*
-4
View File
@@ -25,10 +25,6 @@ for arg in "$@"; do
done done
if [ "$HAS_INSTALL" = "1" ] || [ "$HAS_UNINSTALL" = "1" ]; then if [ "$HAS_INSTALL" = "1" ] || [ "$HAS_UNINSTALL" = "1" ]; then
if [ "$HAS_INSTALL" = "1" ]; then
make -f "$MK_FILE" release
fi
if [ "$IS_WIN" = "1" ] || [ "$(id -u)" = "0" ]; then if [ "$IS_WIN" = "1" ] || [ "$(id -u)" = "0" ]; then
PRIV="" PRIV=""
elif command -v doas > /dev/null 2>&1; then elif command -v doas > /dev/null 2>&1; then
+1 -2
View File
@@ -99,8 +99,7 @@ test: debug
@$(MAKE) -C test -f gmake.mk @$(MAKE) -C test -f gmake.mk
ifneq ($(OS),Windows_NT) ifneq ($(OS),Windows_NT)
install: install: release
@test -f $(BIN_DIR)/release/$(FULL_LIB) || { echo "Run 'make -f gmake.mk release' before installing."; exit 1; }
install -d $(LIBDIR) $(INCDIR)/stk install -d $(LIBDIR) $(INCDIR)/stk
install -m 755 $(BIN_DIR)/release/$(FULL_LIB) $(LIBDIR)/ install -m 755 $(BIN_DIR)/release/$(FULL_LIB) $(LIBDIR)/
install -m 644 $(BIN_DIR)/release/$(STATIC_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_MAJOR 1
#define STK_VERSION_MINOR 0 #define STK_VERSION_MINOR 0
#define STK_VERSION_PATCH 2 #define STK_VERSION_PATCH 3
#define STK_STRINGIFY_HELPER(x) #x #define STK_STRINGIFY_HELPER(x) #x
#define STK_STRINGIFY(x) STK_STRINGIFY_HELPER(x) #define STK_STRINGIFY(x) STK_STRINGIFY_HELPER(x)