Index: scripts/internal/embed_srcserver_info.bat
===================================================================
diff -u -N -r03340b954ead8138d669ee4f8df7124dc84c5612 -r718a83fb4e17e7d6160fdbf11b154e2068278586
--- scripts/internal/embed_srcserver_info.bat	(.../embed_srcserver_info.bat)	(revision 03340b954ead8138d669ee4f8df7124dc84c5612)
+++ scripts/internal/embed_srcserver_info.bat	(.../embed_srcserver_info.bat)	(revision 718a83fb4e17e7d6160fdbf11b154e2068278586)
@@ -7,7 +7,7 @@
 	goto end
 )
 
-SET MainProjectDir=%1
+SET MainProjectDir=%~1
 
 call config.bat
 if errorlevel 1 (
@@ -19,41 +19,39 @@
 	goto error
 )
 
-for %%f in (%MainProjectDir%\src %MainProjectDir%\src\ictranslate %MainProjectDir%\src\libictranslate %MainProjectDir%\src\libicpf) do (
-	echo    * Processing source path %%f...
-	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. See the log below:
-		type "%TmpDir%\command.log"
-		exit /b 1
-	)
+SET _command=call svnindex.cmd /debug /source=%MainProjectDir%\src\ictranslate;%MainProjectDir%\src\libictranslate;%MainProjectDir%\src\libicpf;%MainProjectDir%\src /symbols=%MainProjectDir%\bin\release
+!_command! >"%TmpDir%\command.log"
+if errorlevel 1 (
+	echo ERROR: Error encountered while embedding source server information. 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 _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
-	)
+rem We expect all pdbs to be modified (currently 12 of them - 6/architecture)
+SET IndexRes=Undefined
+SET _command=type "%TmpDir%\command.log" 
+for /f %%a in ('!_command! ^| find /c "wrote"') do set IndexRes=%%a
+if NOT "!IndexRes!" == "12" (
+	echo Some source server information has not been embedded. See the log below:
+	type "%TmpDir%\command.log"
+	exit /b 1
+)
 
-	echo       ...embedded information in !IndexRes! files.
+echo       ...embedded information in !IndexRes! files.
+SET _command=type "%TmpDir%\command.log" 
+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 ('!_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 ('!_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
-	)
+SET _command=type "%TmpDir%\command.log" 
+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
 )
 
 exit /b 0