Index: build/svn_insert_version.cmd =================================================================== diff -u --- build/svn_insert_version.cmd (revision 0) +++ build/svn_insert_version.cmd (revision a62ac2f5e47629bd1edb626c8e3b01190381b6ff) @@ -0,0 +1,92 @@ +rem This script is used for adding the svn revision to the properties of +rem a .Net assembly. +rem It has to be positioned in the present dir, where the solution is, +rem because the this script (the pre-build-events in the .Net projects) +rem refer to $(SolutionDir) + +setlocal enabledelayedexpansion +@ECHO off + +SET ORG_DIR=%CD% + +SET argcount=0 +FOR %%x IN (%*) DO SET /A argcount+=1 + +IF %argcount%==0 ( + ECHO "invalid arguments: [path] (infile) (outfile)" + ECHO "usage: replace SVNREV text with revision number, SVNROOT with repository" + ECHO "path: execute at specific location" + ECHO "[optional] infile: file to read, defaults to AssemblyInfo.cs.svn" + ECHO "[optional] outfile: file to create, defaults to AssemblyInfo.cs" + GOTO EOF +) + +ECHO "%argcount% arguments received" + +IF %argcount%==1 ( + ECHO "setting default in and out files." + SET INTEXTFILE=AssemblyInfo.cs.svn + SET OUTTEXTFILE=AssemblyInfo.cs +) ELSE ( + ECHO "setting custom in and out files." + SET INTEXTFILE=%2 + SET OUTTEXTFILE=%3 +) +SET TEMPTEXTFILE= %OUTTEXTFILE%.temp + +CD %1 + +ECHO "executing in directory %1" + +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 "^URL" && SET ROOT_BUF=%%A + ECHO %%A | findstr /I /C:"Repository Root" && SET AFTER_BUF=%%A +) + +IF NOT DEFINED REV_BUF ( + SET SVN_REV=0 + SET SVN_ROOT= +) ELSE ( + SET SVN_REV=%REV_BUF:~10% + SET SVN_ROOT=%ROOT_BUF:~5% + SET "FIND=*%AFTER_BUF:~17% + CALL SET SVN_ROOT=%%SVN_ROOT:!FIND!=%% +) + +ECHO "using rev %SVN_REV% and root %SVN_ROOT%" + +REM SUBSTITUTE THE VERSION NUMBER IN TEMPLATE +SET SEARCHTEXT=SVNREV +SET SEARCHROOT=SVNROOT +SET OUTPUTLINE= + +IF EXIST %TEMPTEXTFILE% ( + ECHO "removing %TEMPTEXTFILE%" + DEL %TEMPTEXTFILE% +) + +FOR /f "tokens=1,* delims=�" %%A IN ( '"type %INTEXTFILE%"') DO ( + SET string=%%A + SET modified=!string:%SEARCHTEXT%=%SVN_REV%! + SET modified=!modified:%SEARCHROOT%=%SVN_ROOT%! + ECHO !modified! >> %TEMPTEXTFILE% +) + +REM COMPARE TEMP FILE WITH OUTFILE +FC /A /L %TEMPTEXTFILE% %OUTTEXTFILE% + +REM IF THEY ARE IDENTICAL +IF %ERRORLEVEL% == 0 ( + DEL %TEMPTEXTFILE% + CD %ORG_DIR% + EXIT +) +REM IF DIFFERENT +MOVE /Y %TEMPTEXTFILE% %OUTTEXTFILE% + +CD %ORG_DIR% + +:EOF Index: src/Common/Wti.Base/Wti.Base.csproj =================================================================== diff -u -r2ff69dfc67c77d80c1ed2f4f1f9bc0172e28e518 -ra62ac2f5e47629bd1edb626c8e3b01190381b6ff --- src/Common/Wti.Base/Wti.Base.csproj (.../Wti.Base.csproj) (revision 2ff69dfc67c77d80c1ed2f4f1f9bc0172e28e518) +++ src/Common/Wti.Base/Wti.Base.csproj (.../Wti.Base.csproj) (revision a62ac2f5e47629bd1edb626c8e3b01190381b6ff) @@ -15,17 +15,18 @@ true bin\Debug\ - 4 + 4 DEBUG;TRACE full x86 prompt MinimumRecommendedRules.ruleset - + + bin\Release\ - 4 + 4 TRACE true pdbonly @@ -36,7 +37,7 @@ - cmd /c $(SolutionDir)\svn_insert_version.cmd $(SolutionDir)\src GlobalAssembly.cs.svn GlobalAssembly.cs + cmd /c $(SolutionDir)\build\svn_insert_version.cmd $(SolutionDir)\src GlobalAssembly.cs.svn GlobalAssembly.cs Fisheye: Tag a62ac2f5e47629bd1edb626c8e3b01190381b6ff refers to a dead (removed) revision in file `svn_insert_version.cmd'. Fisheye: No comparison available. Pass `N' to diff?