fix: drop dead release pre-build from build.sh/build.bat
install already depends on release in gmake.mk/bmake.mk; the manual pre-build in the wrapper scripts was redundant and, combined with a clean target in the same invocation, didn't actually prevent clean from wiping the build before install ran.
This commit is contained in:
1 parent
fb2ea1a1fe
commit
660474c8bd
2 files changed
-14
No files matched your search
@@ -1,16 +1,6 @@
|
|||||||
@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
|
|
||||||
)
|
|
||||||
|
|
||||||
if "%1"=="run" (
|
if "%1"=="run" (
|
||||||
if "%2"=="" (
|
if "%2"=="" (
|
||||||
make -f gmake.mk run MODE=debug
|
make -f gmake.mk run MODE=debug
|
||||||
|
|||||||
@@ -34,10 +34,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 GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR
|
|
||||||
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
|
||||||
|
|||||||
Reference in new issue
Block a user