From f677c7126355f0e2eb3d180adf12b4aca314a4c3 Mon Sep 17 00:00:00 2001 From: cribolouf Date: Mon, 17 Jul 2017 05:26:43 -0400 Subject: Optimize and Streamline Extractor.bat --- contrib/extractor.bat | 47 ++++++++++++++++++----------------------------- 1 file changed, 18 insertions(+), 29 deletions(-) (limited to 'contrib/extractor.bat') diff --git a/contrib/extractor.bat b/contrib/extractor.bat index 31aa8114cdc..22161e491e7 100644 --- a/contrib/extractor.bat +++ b/contrib/extractor.bat @@ -1,5 +1,6 @@ @ECHO OFF CLS + :MENU ECHO. ECHO ............................................... @@ -27,42 +28,30 @@ IF %M%==1 GOTO MAPS IF %M%==2 GOTO VMAPS IF %M%==3 GOTO MMAPS IF %M%==4 GOTO ALL -IF %M%==5 GOTO EOF +IF %M%==5 GOTO :EOF + :MAPS -start mapextractor.exe -ECHO Wait until mapextractor.exe closes before continuing. -pause +start /b /w mapextractor.exe GOTO MENU + :VMAPS -md vmaps -start vmap4extractor.exe -ECHO Wait until vmap4extractor.exe closes before continuing. -pause -start vmap4assembler.exe Buildings vmaps -ECHO Wait until vmap4assembler.exe closes before continuing. -pause +start /b /w vmap4extractor.exe +start /b /w vmap4assembler.exe Buildings vmaps rmdir Buildings /s /q GOTO MENU + :MMAPS -md mmaps -start mmaps_generator.exe -pause +ECHO This may take a few hours to complete. Please be patient. +PAUSE +start /b /w mmaps_generator.exe GOTO MENU + :ALL -start mapextractor.exe -ECHO Wait until mapextractor.exe closes before continuing. -pause -md vmaps -start vmap4extractor.exe -ECHO Wait until vmap4extractor.exe closes before continuing. -pause -start vmap4assembler.exe Buildings vmaps -ECHO Wait until vmap4assembler.exe closes before continuing. -pause +ECHO This may take a few hours to complete. Please be patient. +PAUSE +start /b /w mapextractor.exe +start /b /w vmap4extractor.exe +start /b /w vmap4assembler.exe rmdir Buildings /s /q -md mmaps -start mmaps_generator.exe --threads %NUMBER_OF_PROCESSORS% -ECHO Wait until mmaps_generator.exe closes before continuing (may take hours). -pause +start /b /w mmaps_generator.exe GOTO MENU -:EOF -- cgit v1.2.3