Index: scripts/internal/embed_srcserver_info.bat =================================================================== diff -u -N -rc9cbe6007b9dc0a844c078b5acc0bc273459076d -r2bcf2d927fb2138f152beab66f1e3f98d62c3fd5 --- scripts/internal/embed_srcserver_info.bat (.../embed_srcserver_info.bat) (revision c9cbe6007b9dc0a844c078b5acc0bc273459076d) +++ scripts/internal/embed_srcserver_info.bat (.../embed_srcserver_info.bat) (revision 2bcf2d927fb2138f152beab66f1e3f98d62c3fd5) @@ -1,5 +1,7 @@ @echo off +setlocal ENABLEDELAYEDEXPANSION + call config.bat if errorlevel 1 ( exit /b 1 @@ -10,35 +12,36 @@ goto error ) -for %%f in (%MainProjectDir%\src %MainProjectDir%\src\ictranslate %MainProjectDir%\src\libictranslate %MainProjectDir%\src\rc2lng %MainProjectDir%\src\libicpf) do ( - SET _cmd=call svnindex.cmd /debug /source=%%f /symbols=%MainProjectDir%\bin\release +for %%f in (%MainProjectDir%\src %MainProjectDir%\src\ictranslate %MainProjectDir%\src\libictranslate %MainProjectDir%\src\libicpf) do ( echo * Processing source path %%f... - - %_cmd% >"%TmpDir%\command.log" + SET _command=call svnindex.cmd /debug /source=%%f /symbols=%MainProjectDir%\bin\release + !_command! >"%TmpDir%\command.log" if errorlevel 1 ( echo ERROR: Error encountered while embedding source server information. exit /b 1 ) rem We expect at least one embedding to succeed per source path SET IndexRes=Undefined - SET _cmd=type "%TmpDir%\command.log" - for /f %%a in ('%_cmd% ^| find /c "wrote"') do set IndexRes=%%a - if NOT "%IndexRes%" == "0" ( + SET _command=type "%TmpDir%\command.log" + for /f %%a in ('!_command! ^| find /c "wrote"') do set IndexRes=%%a + if "!IndexRes!" == "0" ( echo Some source server information has not been embedded. See the log below: type "%TmpDir%\command.log" exit /b 1 ) - for /f %%a in ('%_cmd% ^| find /c "ERROR"') do set IndexRes=%%a - if NOT "%IndexRes%" == "0" ( + echo ...embedded information in !IndexRes! files. + + for /f %%a in ('!_command! ^| find /c "ERROR"') do set IndexRes=%%a + if NOT "!IndexRes!" == "0" ( echo Error encountered when embedding source server information. See the log below: type "%TmpDir%\command.log" exit /b 1 ) - for /f %%a in ('%_cmd% ^| find /c "WARNING"') do set IndexRes=%%a - if NOT "%IndexRes%" == "0" ( + for /f %%a in ('!_command! ^| find /c "WARNING"') do set IndexRes=%%a + if NOT "!IndexRes!" == "0" ( echo Error encountered when embedding source server information. See the log below: type "%TmpDir%\command.log" exit /b 1 Index: scripts/make_existing_release.bat =================================================================== diff -u -N -rc9cbe6007b9dc0a844c078b5acc0bc273459076d -r2bcf2d927fb2138f152beab66f1e3f98d62c3fd5 --- scripts/make_existing_release.bat (.../make_existing_release.bat) (revision c9cbe6007b9dc0a844c078b5acc0bc273459076d) +++ scripts/make_existing_release.bat (.../make_existing_release.bat) (revision 2bcf2d927fb2138f152beab66f1e3f98d62c3fd5) @@ -12,6 +12,11 @@ SET TextVersion=%1 echo --- Initializing ---------------------------------------------- +call config.bat +if errorlevel 1 ( + exit /b 1 +) + echo * Clearing environment... call internal\clear_env.bat if errorlevel 1 (