Index: DamFailureMechanisms/damMacroStability/trunk/utils/svn_insert_version.cmd =================================================================== diff -u -r878 -r2237 --- DamFailureMechanisms/damMacroStability/trunk/utils/svn_insert_version.cmd (.../svn_insert_version.cmd) (revision 878) +++ DamFailureMechanisms/damMacroStability/trunk/utils/svn_insert_version.cmd (.../svn_insert_version.cmd) (revision 2237) @@ -2,9 +2,7 @@ @ECHO off ECHO "svn_insert_version.cmd started" -REM REMEMBER ORIGINAL WORKING FOLDER AND GO TO THE SOURCES DIRECTORY SET ORG_DIR=%CD% -cd ..\.. SET argcount=0 FOR %%x IN (%*) DO SET /A argcount+=1 @@ -30,6 +28,8 @@ SET OUTTEXTFILE=%3 ) +CD %1 + ECHO "parsing svn info in directory %CD%" REM GET THE SVN VERSION NUMBER AND REVISION PATH @@ -52,7 +52,6 @@ ECHO "using rev %SVN_REV% and root %SVN_ROOT%" REM SUBSTITUTE THE VERSION NUMBER IN TEMPLATE -CD %1 ECHO "modifying %OUTTEXTFILE% in directory %1" SET SEARCHTEXT=SVNREV SET SEARCHROOT=SVNROOT @@ -66,7 +65,7 @@ ECHO "writing new %OUTTEXTFILE%" REM This command can process version files which contain special character "!" -call powershell -Command "(gc %INTEXTFILE%) -replace '%SEARCHTEXT%', '%SVN_REV%' | Out-File -encoding ASCII %OUTTEXTFILE% +call powershell -Command "(gc %INTEXTFILE%) -replace '%SEARCHTEXT%', '%SVN_REV%' | Out-File -encoding UTF8 %OUTTEXTFILE% ) Index: DamClients/DamUI/trunk/utils/svn_insert_version.cmd =================================================================== diff -u -r888 -r2237 --- DamClients/DamUI/trunk/utils/svn_insert_version.cmd (.../svn_insert_version.cmd) (revision 888) +++ DamClients/DamUI/trunk/utils/svn_insert_version.cmd (.../svn_insert_version.cmd) (revision 2237) @@ -34,7 +34,7 @@ REM GET THE SVN VERSION NUMBER AND REVISION PATH FOR /f "tokens=1,* delims=�" %%A IN ('svn info') DO ( - ECHO %%A | findstr /I "^Revision" && SET REV_BUF=%%A + ECHO %%A | findstr /I /C:"Last Changed Rev" && SET REV_BUF=%%A ECHO %%A | findstr /I "^URL" && SET ROOT_BUF=%%A ECHO %%A | findstr /I /C:"Repository Root" && SET AFTER_BUF=%%A ) @@ -43,7 +43,7 @@ SET SVN_REV=0 SET SVN_ROOT= ) ELSE ( - SET SVN_REV=%REV_BUF:~10% + SET SVN_REV=%REV_BUF:~18% SET SVN_ROOT=%ROOT_BUF:~5% SET "FIND=*%AFTER_BUF:~17% CALL SET SVN_ROOT=%%SVN_ROOT:!FIND!=%% Index: DamEngine/trunk/utils/svn_insert_version.cmd =================================================================== diff -u -r877 -r2237 --- DamEngine/trunk/utils/svn_insert_version.cmd (.../svn_insert_version.cmd) (revision 877) +++ DamEngine/trunk/utils/svn_insert_version.cmd (.../svn_insert_version.cmd) (revision 2237) @@ -34,7 +34,7 @@ REM GET THE SVN VERSION NUMBER AND REVISION PATH FOR /f "tokens=1,* delims=�" %%A IN ('svn info') DO ( - ECHO %%A | findstr /I "^Revision" && SET REV_BUF=%%A + ECHO %%A | findstr /I /C:"Last Changed Rev" && SET REV_BUF=%%A ECHO %%A | findstr /I "^URL" && SET ROOT_BUF=%%A ECHO %%A | findstr /I /C:"Repository Root" && SET AFTER_BUF=%%A ) @@ -43,7 +43,7 @@ SET SVN_REV=0 SET SVN_ROOT= ) ELSE ( - SET SVN_REV=%REV_BUF:~10% + SET SVN_REV=%REV_BUF:~18% SET SVN_ROOT=%ROOT_BUF:~5% SET "FIND=*%AFTER_BUF:~17% CALL SET SVN_ROOT=%%SVN_ROOT:!FIND!=%% Index: DamClients/DamLive/trunk/utils/svn_insert_version.cmd =================================================================== diff -u -r1527 -r2237 --- DamClients/DamLive/trunk/utils/svn_insert_version.cmd (.../svn_insert_version.cmd) (revision 1527) +++ DamClients/DamLive/trunk/utils/svn_insert_version.cmd (.../svn_insert_version.cmd) (revision 2237) @@ -34,7 +34,7 @@ REM GET THE SVN VERSION NUMBER AND REVISION PATH FOR /f "tokens=1,* delims=�" %%A IN ('svn info') DO ( - ECHO %%A | findstr /I "^Revision" && SET REV_BUF=%%A + ECHO %%A | findstr /I /C:"Last Changed Rev" && SET REV_BUF=%%A ECHO %%A | findstr /I "^URL" && SET ROOT_BUF=%%A ECHO %%A | findstr /I /C:"Repository Root" && SET AFTER_BUF=%%A ) @@ -43,7 +43,7 @@ SET SVN_REV=0 SET SVN_ROOT= ) ELSE ( - SET SVN_REV=%REV_BUF:~10% + SET SVN_REV=%REV_BUF:~18% SET SVN_ROOT=%ROOT_BUF:~5% SET "FIND=*%AFTER_BUF:~17% CALL SET SVN_ROOT=%%SVN_ROOT:!FIND!=%% Index: DamFailureMechanisms/damPiping/trunk/utils/svn_insert_version.cmd =================================================================== diff -u -r878 -r2237 --- DamFailureMechanisms/damPiping/trunk/utils/svn_insert_version.cmd (.../svn_insert_version.cmd) (revision 878) +++ DamFailureMechanisms/damPiping/trunk/utils/svn_insert_version.cmd (.../svn_insert_version.cmd) (revision 2237) @@ -2,9 +2,7 @@ @ECHO off ECHO "svn_insert_version.cmd started" -REM REMEMBER ORIGINAL WORKING FOLDER AND GO TO THE SOURCES DIRECTORY SET ORG_DIR=%CD% -cd ..\.. SET argcount=0 FOR %%x IN (%*) DO SET /A argcount+=1 @@ -30,6 +28,8 @@ SET OUTTEXTFILE=%3 ) +CD %1 + ECHO "parsing svn info in directory %CD%" REM GET THE SVN VERSION NUMBER AND REVISION PATH @@ -52,7 +52,6 @@ ECHO "using rev %SVN_REV% and root %SVN_ROOT%" REM SUBSTITUTE THE VERSION NUMBER IN TEMPLATE -CD %1 ECHO "modifying %OUTTEXTFILE% in directory %1" SET SEARCHTEXT=SVNREV SET SEARCHROOT=SVNROOT @@ -66,7 +65,7 @@ ECHO "writing new %OUTTEXTFILE%" REM This command can process version files which contain special character "!" -call powershell -Command "(gc %INTEXTFILE%) -replace '%SEARCHTEXT%', '%SVN_REV%' | Out-File -encoding ASCII %OUTTEXTFILE% +call powershell -Command "(gc %INTEXTFILE%) -replace '%SEARCHTEXT%', '%SVN_REV%' | Out-File -encoding UTF8 %OUTTEXTFILE% )