From 1a1abeec2a8bccf9b2935d36b59545342431bcca Mon Sep 17 00:00:00 2001 From: Antz Date: Mon, 4 Jan 2016 12:42:47 +0000 Subject: [PATCH] [Tools] Merged Vmaps extractor/assembler, updated scripts --- src/tools/Extractor_Binaries/ExtractResources.sh | 4 ---- src/tools/Extractor_Binaries/make_vmaps.bat | 15 --------------- src/tools/Extractor_projects | 2 +- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/tools/Extractor_Binaries/ExtractResources.sh b/src/tools/Extractor_Binaries/ExtractResources.sh index 078e7b35..3ef0c2c0 100644 --- a/src/tools/Extractor_Binaries/ExtractResources.sh +++ b/src/tools/Extractor_Binaries/ExtractResources.sh @@ -201,10 +201,6 @@ then echo "`date`: Start extraction of vmaps..." | tee -a $LOG_FILE ./vmap-extractor | tee -a $DETAIL_LOG_FILE echo "`date`: Extracting of vmaps finished" | tee -a $LOG_FILE - mkdir ./vmaps - echo "`date`: Start assembling of vmaps..." | tee -a $LOG_FILE - ./vmap-assembler Buildings vmaps | tee -a $DETAIL_LOG_FILE - echo "`date`: Assembling of vmaps finished" | tee -a $LOG_FILE echo | tee -a $LOG_FILE echo | tee -a $DETAIL_LOG_FILE diff --git a/src/tools/Extractor_Binaries/make_vmaps.bat b/src/tools/Extractor_Binaries/make_vmaps.bat index 94443a1b..681e8ae0 100644 --- a/src/tools/Extractor_Binaries/make_vmaps.bat +++ b/src/tools/Extractor_Binaries/make_vmaps.bat @@ -19,21 +19,6 @@ cls echo. echo. echo. -IF NOT %ERRORLEVEL% LEQ 1 (echo The vmap extract tool finalized with errors. -echo Hit Enter to continue . . . -pause>nul) -cls -echo. -echo. -echo. -echo Vmaps extracted check log.txt for errors, now it's time to assemble the vmaps press any key to continue . . . -pause>nul -md vmaps -vmap-assembler.exe buildings vmaps -cls -echo. -echo. -echo. IF NOT %ERRORLEVEL% LEQ 1 (echo The vmap assembler tool finalized with errors. echo Hit Enter to continue . . . pause>nul) diff --git a/src/tools/Extractor_projects b/src/tools/Extractor_projects index 52e10cf7..8f492dbb 160000 --- a/src/tools/Extractor_projects +++ b/src/tools/Extractor_projects @@ -1 +1 @@ -Subproject commit 52e10cf7ad9393df1158a48b1500a125c8ff6e71 +Subproject commit 8f492dbbd39ddd79af2ce254f7dbf76b8564bf7a