Index: scripts/internal/embed_srcserver_info.bat =================================================================== diff -u -N -r0dad97fd1b1e4c79c037b3b638181c2214c0d8f8 -rc9cbe6007b9dc0a844c078b5acc0bc273459076d --- scripts/internal/embed_srcserver_info.bat (.../embed_srcserver_info.bat) (revision 0dad97fd1b1e4c79c037b3b638181c2214c0d8f8) +++ scripts/internal/embed_srcserver_info.bat (.../embed_srcserver_info.bat) (revision c9cbe6007b9dc0a844c078b5acc0bc273459076d) @@ -10,36 +10,39 @@ goto error ) -SET _cmd=call svnindex.cmd /debug /source=%MainProjectDir%\src /source=%MainProjectDir%\src\ictranslate /source=%MainProjectDir%\src\libictranslate /source=%MainProjectDir%\src\rc2lng /source=%MainProjectDir%\src\libicpf /symbols=%MainProjectDir%\bin\release -rem SET _cmd=call svnindex.cmd /debug /source=%MainProjectDir%\src /symbols=%MainProjectDir%\bin\release +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 + echo * Processing source path %%f... -%_cmd% >"%TmpDir%\command.log" -if errorlevel 1 ( - echo ERROR: Error encountered while embedding source server information. - exit /b 1 -) + %_cmd% >"%TmpDir%\command.log" + if errorlevel 1 ( + echo ERROR: Error encountered while embedding source server information. + exit /b 1 + ) -SET IndexRes=Undefined -SET _cmd=type "%TmpDir%\command.log" -for /f %%a in ('%_cmd% ^| find /c "zero source files found"') do set IndexRes=%%a -if NOT "%IndexRes%" == "0" ( - echo Some source server information has not been embedded. See the log below: - type "%TmpDir%\command.log" - 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" ( + 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 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 "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" ( - 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" ( + echo Error encountered when embedding source server information. See the log below: + type "%TmpDir%\command.log" + exit /b 1 + ) ) exit /b 0 Index: scripts/make_existing_release.bat =================================================================== diff -u -N -r1b933145c97b554ccb0cd30288b1ef4090466180 -rc9cbe6007b9dc0a844c078b5acc0bc273459076d --- scripts/make_existing_release.bat (.../make_existing_release.bat) (revision 1b933145c97b554ccb0cd30288b1ef4090466180) +++ scripts/make_existing_release.bat (.../make_existing_release.bat) (revision c9cbe6007b9dc0a844c078b5acc0bc273459076d) @@ -32,7 +32,6 @@ echo --- Preparing source package ---------------------------------------- echo * Retrieving tagged source code... if "%TextVersion%" == "trunk" ( - echo "trunking" svn co "%ReposCH%/trunk" "%MainProjectDir%" >"%TmpDir%\command.log" 2>"%TmpDir%\command-err.log" ) else ( svn co "%ReposCH%/tags/%TextVersion%" "%MainProjectDir%" >"%TmpDir%\command.log" 2>"%TmpDir%\command-err.log"