Subversion Repositories vaca_plus

Rev

Rev 67 | Rev 75 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 67 Rev 68
Line 59... Line 59...
59 
if exist vacation\ set addonhrpdir=%cd%
 59 
if exist vacation\ set addonhrpdir=%cd%
60 
if exist vaca_plus\ goto addondircheck
 60 
if exist vaca_plus\ goto addondircheck
61 
if "%debug%"=="1" echo DEBUG: Vaca+ Directory: "%addondir%".
 61 
if "%debug%"=="1" echo DEBUG: Vaca+ Directory: "%addondir%".
62 
if "%debug%"=="1" echo DEBUG: VacaHRP Directory: "%addonhrpdir%".
 62 
if "%debug%"=="1" echo DEBUG: VacaHRP Directory: "%addonhrpdir%".
63 
 
 63 
 
- 
 
 64 
set kextract=%addondir%\utils\windows\win32\kextract.exe
- 
 
 65 
if "%debug%"=="1" set kextract=%addondir%\utils\windows\win32\kextract.debug.exe
- 
 
 66 
set kgroup=%addondir%\utils\windows\win32\kgroup.exe
- 
 
 67 
if "%debug%"=="1" set kgroup=%addondir%\utils\windows\win32\kgroup.debug.exe
- 
 
 68 
set unpackssi=%addondir%\utils\windows\win32\unpackssi.exe
- 
 
 69 
if "%debug%"=="1" set unpackssi=%addondir%\utils\windows\win32\unpackssi.debug.exe
- 
 
 70 
set bspatch=%addondir%\utils\windows\win32\bspatch.exe
- 
 
 71 
set sha1sum=%addondir%\utils\windows\win32\sha1sum.exe
- 
 
 72 
 
64 
if "%vacagrpname%"=="" set vacagrpname=vacation.grp
 73 
if "%vacagrpname%"=="" set vacagrpname=vacation.grp
65 
if not exist "%exedir%\%vacagrpname%" if not exist "%addondir%\%vacagrpname%" if exist "%exedir%\vaca15.grp" set vacagrpname=vaca15.grp
 74 
if not exist "%exedir%\%vacagrpname%" if not exist "%addondir%\%vacagrpname%" if exist "%exedir%\vaca15.grp" set vacagrpname=vaca15.grp
66 
if not exist "%exedir%\%vacagrpname%" if not exist "%addondir%\%vacagrpname%" if exist "%addondir%\vaca15.grp" set vacagrpname=vaca15.grp
 75 
if not exist "%exedir%\%vacagrpname%" if not exist "%addondir%\%vacagrpname%" if exist "%addondir%\vaca15.grp" set vacagrpname=vaca15.grp
67 
if not exist "%exedir%\%vacagrpname%" if not exist "%addondir%\%vacagrpname%" if exist "%exedir%\vacapp.grp" set vacagrpname=vacapp.grp
 76 
if not exist "%exedir%\%vacagrpname%" if not exist "%addondir%\%vacagrpname%" if exist "%exedir%\vacapp.grp" set vacagrpname=vacapp.grp
68 
if not exist "%exedir%\%vacagrpname%" if not exist "%addondir%\%vacagrpname%" if exist "%addondir%\vacapp.grp" set vacagrpname=vacapp.grp
 77 
if not exist "%exedir%\%vacagrpname%" if not exist "%addondir%\%vacagrpname%" if exist "%addondir%\vacapp.grp" set vacagrpname=vacapp.grp
Line 227... Line 236...
227 
echo.
 236 
echo.
228 
pause
 237 
pause
229 
mkdir vaca15ssi
 238 
mkdir vaca15ssi
230 
chdir vaca15ssi
 239 
chdir vaca15ssi
231 
if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
 240 
if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
232 
"%addondir%\utils\windows\win32\unpackssi.exe" ..\VACA15.SSI
 241 
"%unpackssi%" ..\VACA15.SSI
233 
if exist VACATION.PRG move /y VACATION.PRG ..\vacation.grp
 242 
if exist VACATION.PRG move /y VACATION.PRG ..\vacation.grp
234 
chdir ..
 243 
chdir ..
235 
if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
 244 
if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
236 
if exist vacation.grp (
 245 
if exist vacation.grp (
237 
rmdir /s /q vaca15ssi
 246 
rmdir /s /q vaca15ssi
Line 251... Line 260...
251 
echo.
 260 
echo.
252 
pause
 261 
pause
253 
mkdir vacappssi
 262 
mkdir vacappssi
254 
chdir vacappssi
 263 
chdir vacappssi
255 
if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
 264 
if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
256 
"%addondir%\utils\windows\win32\unpackssi.exe" ..\VACAPP.SSI
 265 
"%unpackssi%" ..\VACAPP.SSI
257 
if exist VACATION.PRG move /y VACATION.PRG ..\vacation.grp
 266 
if exist VACATION.PRG move /y VACATION.PRG ..\vacation.grp
258 
chdir ..
 267 
chdir ..
259 
if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
 268 
if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
260 
if exist vacation.grp (
 269 
if exist vacation.grp (
261 
rmdir /s /q vacappssi
 270 
rmdir /s /q vacappssi
Line 275... Line 284...
275 
echo.
 284 
echo.
276 
pause
 285 
pause
277 
mkdir vaca13ssi
 286 
mkdir vaca13ssi
278 
chdir vaca13ssi
 287 
chdir vaca13ssi
279 
if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
 288 
if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
280 
"%addondir%\utils\windows\win32\unpackssi.exe" ..\VACA13.SSI
 289 
"%unpackssi%" ..\VACA13.SSI
281 
ren *.TRA *.ART
 290 
ren *.TRA *.ART
282 
ren *.PCS *.SCP
 291 
ren *.PCS *.SCP
283 
ren VACA1.MAP vaca1.map
 292 
ren VACA1.MAP vaca1.map
284 
ren VACA2.MAP vaca2.map
 293 
ren VACA2.MAP vaca2.map
285 
ren VACA3.MAP vaca3.map
 294 
ren VACA3.MAP vaca3.map
Line 299... Line 308...
299 
ren *.OMD *.DMO
 308 
ren *.OMD *.DMO
300 
ren GAME.CON VACAGAME.CON
 309 
ren GAME.CON VACAGAME.CON
301 
ren USER.CON VACAUSER.CON
 310 
ren USER.CON VACAUSER.CON
302 
ren DEFS.CON VACADEFS.CON
 311 
ren DEFS.CON VACADEFS.CON
303 
ren DUKETEAM.ANM RADLOGO.ANM
 312 
ren DUKETEAM.ANM RADLOGO.ANM
304 
"%addondir%\utils\windows\win32\kgroup.exe" vacation.grp *.ART *.SCP *.map *.MID *.ANM *.VOC *.DMO CARIB.EXE
 313 
"%kgroup%" vacation.grp *.ART *.SCP *.map *.MID *.ANM *.VOC *.DMO CARIB.EXE
305 
if exist vacation.grp move /y vacation.grp ..\vacation.grp
 314 
if exist vacation.grp move /y vacation.grp ..\vacation.grp
306 
move /y *.map ..\
 315 
move /y *.map ..\
307 
chdir ..
 316 
chdir ..
308 
if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
 317 
if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
309 
if exist vacation.grp (
 318 
if exist vacation.grp (
Line 325... Line 334...
325 
call :grpchecksum
 334 
call :grpchecksum
326 
call :grpchecksum_results
 335 
call :grpchecksum_results
327 
goto novacagrp_return
 336 
goto novacagrp_return
328 
 
 337 
 
329 
:grpchecksum
 338 
:grpchecksum
330 
if not exist "%addondir%\utils\windows\win32\sha1sum.exe" (
 339 
if not exist "%sha1sum%" (
331 
echo "%addondir%\utils\windows\win32\sha1sum.exe" not found.
 340 
echo "%sha1sum%" not found.
332 
goto :eof
 341 
goto :eof
333 
)
 342 
)
334 
pushd .
 343 
pushd .
335 
if exist "%addondir%\%vacagrpname%" chdir /d %addondir%
 344 
if exist "%addondir%\%vacagrpname%" chdir /d %addondir%
336 
if exist "%exedir%\%vacagrpname%" chdir /d %exedir%
 345 
if exist "%exedir%\%vacagrpname%" chdir /d %exedir%
337 
echo ea0a9a77b9aee6edce76afa19eaea3a810fb2390 *%vacagrpname% | "%addondir%\utils\windows\win32\sha1sum.exe" --status --check -
 346 
echo ea0a9a77b9aee6edce76afa19eaea3a810fb2390 *%vacagrpname% | "%sha1sum%" --status --check -
338 
if "%ERRORLEVEL%"=="0" set version=full && popd && goto :eof
 347 
if "%ERRORLEVEL%"=="0" set version=full && popd && goto :eof
339 
if "%ERRORLEVEL%"=="1" set version=unknown
 348 
if "%ERRORLEVEL%"=="1" set version=unknown
340 
popd
 349 
popd
341 
goto :eof
 350 
goto :eof
342 
 
 351 
 
Line 376... Line 385...
376 
if not exist vacadm3.patch goto nopatch
 385 
if not exist vacadm3.patch goto nopatch
377 
if not exist vacadm4.patch goto nopatch
 386 
if not exist vacadm4.patch goto nopatch
378 
mkdir vaca_preserve
 387 
mkdir vaca_preserve
379 
if exist vaca*.map move /y vaca*.map vaca_preserve\
 388 
if exist vaca*.map move /y vaca*.map vaca_preserve\
380 
if exist "%exedir%\vaca*.map" move /y "%exedir%\vaca*.map" vaca_preserve\
 389 
if exist "%exedir%\vaca*.map" move /y "%exedir%\vaca*.map" vaca_preserve\
381 
"%addondir%\utils\windows\win32\kextract.exe" vacation.grp VACA*.MAP
 390 
"%kextract%" vacation.grp VACA*.MAP
382 
ren VACA1.MAP vaca1.map
 391 
ren VACA1.MAP vaca1.map
383 
ren VACA2.MAP vaca2.map
 392 
ren VACA2.MAP vaca2.map
384 
ren VACA3.MAP vaca3.map
 393 
ren VACA3.MAP vaca3.map
385 
ren VACA4.MAP vaca4.map
 394 
ren VACA4.MAP vaca4.map
386 
ren VACA5.MAP vaca5.map
 395 
ren VACA5.MAP vaca5.map
Line 396... Line 405...
396 
echo.
 405 
echo.
397 
echo Map patching will now begin.
 406 
echo Map patching will now begin.
398 
echo.
 407 
echo.
399 
pause
 408 
pause
400 
echo
 409 
echo
401 
"%addondir%\utils\windows\win32\bspatch.exe" vaca1.map vaca1.map vaca1.patch
 410 
"%bspatch%" vaca1.map vaca1.map vaca1.patch
402 
"%addondir%\utils\windows\win32\bspatch.exe" vaca2.map vaca2.map vaca2.patch
 411 
"%bspatch%" vaca2.map vaca2.map vaca2.patch
403 
"%addondir%\utils\windows\win32\bspatch.exe" vaca3.map vaca3.map vaca3.patch
 412 
"%bspatch%" vaca3.map vaca3.map vaca3.patch
404 
"%addondir%\utils\windows\win32\bspatch.exe" vaca4.map vaca4.map vaca4.patch
 413 
"%bspatch%" vaca4.map vaca4.map vaca4.patch
405 
"%addondir%\utils\windows\win32\bspatch.exe" vaca5.map vaca5.map vaca5.patch
 414 
"%bspatch%" vaca5.map vaca5.map vaca5.patch
406 
"%addondir%\utils\windows\win32\bspatch.exe" vaca6.map vaca6.map vaca6.patch
 415 
"%bspatch%" vaca6.map vaca6.map vaca6.patch
407 
"%addondir%\utils\windows\win32\bspatch.exe" vaca7.map vaca7.map vaca7.patch
 416 
"%bspatch%" vaca7.map vaca7.map vaca7.patch
408 
"%addondir%\utils\windows\win32\bspatch.exe" vacasl.map vacasl.map vacasl.patch
 417 
"%bspatch%" vacasl.map vacasl.map vacasl.patch
409 
"%addondir%\utils\windows\win32\bspatch.exe" vacadm1.map vacadm1.map vacadm1.patch
 418 
"%bspatch%" vacadm1.map vacadm1.map vacadm1.patch
410 
"%addondir%\utils\windows\win32\bspatch.exe" vacadm2.map vacadm2.map vacadm2.patch
 419 
"%bspatch%" vacadm2.map vacadm2.map vacadm2.patch
411 
"%addondir%\utils\windows\win32\bspatch.exe" vacadm3.map vacadm3.map vacadm3.patch
 420 
"%bspatch%" vacadm3.map vacadm3.map vacadm3.patch
412 
"%addondir%\utils\windows\win32\bspatch.exe" vacadm4.map vacadm4.map vacadm4.patch
 421 
"%bspatch%" vacadm4.map vacadm4.map vacadm4.patch
413 
if exist vacapatch*.h266 del /f /q vacapatch*.h266
 422 
if exist vacapatch*.h266 del /f /q vacapatch*.h266
414 
if exist vacaflag*.h266 del /f /q vacaflag*.h266
 423 
if exist vacaflag*.h266 del /f /q vacaflag*.h266
415 
echo Do not delete this file! You will be forced to reinstall Vaca+ and repatch the maps. >vacaflag_%addonver%.h266
 424 
echo Do not delete this file! You will be forced to reinstall Vaca+ and repatch the maps. >vacaflag_%addonver%.h266
416 
attrib +r vacaflag_%addonver%.h266
 425 
attrib +r vacaflag_%addonver%.h266
417 
echo.
 426 
echo.
Line 479... Line 488...
479 
if exist VBeachBather.con goto confound
 488 
if exist VBeachBather.con goto confound
480 
if exist VDragon.con goto confound
 489 
if exist VDragon.con goto confound
481 
if exist VSeagull.con goto confound
 490 
if exist VSeagull.con goto confound
482 
:confound_done
 491 
:confound_done
483 
chdir /d "%exedir%"
 492 
chdir /d "%exedir%"
484 
if not exist GAME.CON "%addondir%\utils\windows\win32\kextract.exe" DUKE3D.GRP GAME.CON
 493 
if not exist GAME.CON "%kextract%" DUKE3D.GRP GAME.CON
485 
if not exist DEFS.CON "%addondir%\utils\windows\win32\kextract.exe" DUKE3D.GRP DEFS.CON
 494 
if not exist DEFS.CON "%kextract%" DUKE3D.GRP DEFS.CON
486 
if not exist USER.CON "%addondir%\utils\windows\win32\kextract.exe" DUKE3D.GRP USER.CON
 495 
if not exist USER.CON "%kextract%" DUKE3D.GRP USER.CON
487 
chdir /d "%addondir%"
 496 
chdir /d "%addondir%"
488 
echo.
 497 
echo.
489 
pause
 498 
pause
490 
goto restart
 499 
goto restart
491 
 
 500 
 
492 
:checksum
 501 
:checksum
493 
if not exist "%addondir%\utils\windows\win32\sha1sum.exe" (
 502 
if not exist "%sha1sum%" (
494 
echo "%addondir%\utils\windows\win32\sha1sum.exe" not found.
 503 
echo "%sha1sum%" not found.
495 
goto :eof
 504 
goto :eof
496 
)
 505 
)
497 
if not exist "%~2" goto :eof
 506 
if not exist "%~2" goto :eof
498 
echo %~1 *%~2 | "%addondir%\utils\windows\win32\sha1sum.exe" --status --check -
 507 
echo %~1 *%~2 | "%sha1sum%" --status --check -
499 
if "%ERRORLEVEL%"=="0" (
 508 
if "%ERRORLEVEL%"=="0" (
500 
ren "%~2" "VacaOld_%addonver%_%~nx2"
 509 
ren "%~2" "VacaOld_%addonver%_%~nx2"
501 
echo %~3 %~nx2
 510 
echo %~3 %~nx2
502 
)
 511 
)
503 
goto :eof
 512 
goto :eof