diff --git a/.gitignore b/.gitignore index fc14ddc..bf57c9e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ /*.log /user_config.cmd /VIDE -/game_compiling -/game_hammer +/game_compil* +/game_hamm* /compilepal /bin /extras/hammerlua/lua/winapiffi diff --git a/LAUNCH propperall.cmd b/LAUNCH propperall.cmd index 6ed56e9..7fd4fe7 100644 --- a/LAUNCH propperall.cmd +++ b/LAUNCH propperall.cmd @@ -35,14 +35,30 @@ :found @cd /d "%mapfolder%\propper" +@echo Directory: %cd% @echo. +@bash --help > nul +@if ERRORLEVEL 1 @goto nobash + +@echo running propperall.sh +@bash propperall.sh +@if ERRORLEVEL 1 @goto failed + +@goto :proppered + +:nobash +@echo bash not found, running vanilla (slow, no error detection) @for /r %%i in (*.vmf) do @( @echo Processing "%%i" Log: "%%i.log" "%VBSPNAME%" "%%i" 1>"%%i.log" @if ERRORLEVEL 1 goto failed ) +:proppered +@for /r %%i in (*.tmp) do @( + attrib +h "%%i" +) -@echo "====== Copying files also for hammer usage =======" +@echo ====== Copying files also for hammer usage ======= ROBOCOPY "%GameDir%\materials\models\mspropp" "%PROPPER_TARGET%\materials\models\mspropp" /MOV /s /NFL /NDL /NJS /NJH /NP /is /it ROBOCOPY "%GameDir%\models\props\metastruct" "%PROPPER_TARGET%\models\props\metastruct" /MOV /s /NFL /NDL /NJS /NJH /NP /is /it @@ -65,7 +81,6 @@ ROBOCOPY "%GameDir%\models\props\metastruct" "%PROPPER_TARGET%\models\props\meta @echo ====== FINISHED ======= @echo ======================= -@echo Press ENTER to continue. @pause > nul @goto gtfo diff --git a/propperall.sh b/propperall.sh new file mode 100644 index 0000000..c43a696 --- /dev/null +++ b/propperall.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +echo "> propperall.sh 0.1" +skipped=0 +compiled=0 + +for f in *.vmf; do + + + if cmp -s "$f" ".$f.tmp"; then + #echo "Skipping $f" + skipped=$((skipped+1)) + continue + fi + + echo Processing "$f" Log: "$f.log" + "$VBSPNAME" "$f" > "$f.log" + if [ $? -ne 0 ] || ! grep -q Completed "$f.log"; then + echo "" + echo "Failed: $f" + echo "" + cat "$f.log" + echo "" + echo "SKIPPING OTHER MODELS UNTIL THIS IS FIXED" + echo "" + exit 1 + break + fi + cp "$f" ".$f.tmp" + + compiled=$((compiled+1)) +done + +if [ $skipped -ge 0 ]; then + echo "Skipped $skipped VMFs" +fi +echo "Compiled $compiled VMFs"