From a170539991414bcb5f826ce87e5ca4a8bde32b80 Mon Sep 17 00:00:00 2001 From: "John J. Camilleri" Date: Fri, 2 Nov 2018 08:50:31 +0100 Subject: [PATCH] More improvements to `Make.bat` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fix syntax error in args loop - Building of modules list Maybe it actually works now? 😱 --- Make.bat | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Make.bat b/Make.bat index 5f369a59a..921934ee3 100644 --- a/Make.bat +++ b/Make.bat @@ -18,12 +18,12 @@ set verbose=false REM Check command line options :Loop -if "%1"=="" goto Continue + if '%1'=='' goto Continue if %1==-v set verbose=true if %1==--verbose set verbose=true if %1==--gf set gf=%2 if %1==--dest set dest=%2 -shift + shift goto Loop :Continue @@ -67,13 +67,15 @@ REM Gather all language modules for building set modules= for %%l in (%langs%) do ( for %%m in (%modules_langs%) do ( - for /r %src% %%m in (*%%m%%l.gf) do ( - set modules=!modules! %%m + set patt=%%m%%l.gf + for /r %src% %%n in (!patt!) do ( + if exist %%n set modules=!modules! %%n ) ) for %%m in (%modules_api%) do ( - for /r %src%\api %%m in (*%%m%%l.gf) do ( - set modules=!modules! %%m + set patt=%%m%%l.gf + for /r %src%\api %%n in (!patt!) do ( + if exist %%n set modules=!modules! %%n ) ) )