PATCH: [ 1386809 ] Move temporaries out of src tree - log plugins

  Plugins\src_VCPP\WatchBeginningOfLog:
   WatchBeginningOfLog.dsp WatchBeginningOfLog.rc
  Plugins\src_VCPP\WatchEndOfLog:
   WatchEndOfLog.dsp WatchEndOfLog.rc
 Plugins\dlls: WatchBeginningOfLog.dll (v1.0.0.2)
   Compiled from current CVS (ANSI) (VC6sp6) Release MinDependency, v1.0.2.0
  WatchEndOfLog.dll (v1.0.0.2)
   Compiled from current CVS (ANSI) (VC6sp6) Release MinDependency, v1.0.2.0

diff --git a/Plugins/dlls/WatchBeginningOfLog.dll b/Plugins/dlls/WatchBeginningOfLog.dll
index 73f2218..b0046e7 100644 (file)
Binary files a/Plugins/dlls/WatchBeginningOfLog.dll and b/Plugins/dlls/WatchBeginningOfLog.dll differ

diff --git a/Plugins/dlls/WatchEndOfLog.dll b/Plugins/dlls/WatchEndOfLog.dll
index 1809e69..f7dbca3 100644 (file)
Binary files a/Plugins/dlls/WatchEndOfLog.dll and b/Plugins/dlls/WatchEndOfLog.dll differ

diff --git a/Plugins/readme.txt b/Plugins/readme.txt
index cd723f0..98b07f0 100644 (file)
--- a/Plugins/readme.txt
+++ b/Plugins/readme.txt
@@ -1,7 +1,18 @@
+2005-12-24 Perry
+ PATCH: [ 1386809 ] Move temporaries out of src tree - log plugins
+  Plugins\src_VCPP\WatchBeginningOfLog: 
+   WatchBeginningOfLog.dsp WatchBeginningOfLog.rc
+  Plugins\src_VCPP\WatchEndOfLog: 
+   WatchEndOfLog.dsp WatchEndOfLog.rc
+ Plugins\dlls: WatchBeginningOfLog.dll (v1.0.0.2)
+   Compiled from current CVS (ANSI) (VC6sp6) Release MinDependency, v1.0.2.0
+  WatchEndOfLog.dll (v1.0.0.2)
+   Compiled from current CVS (ANSI) (VC6sp6) Release MinDependency, v1.0.2.0
+
 2005-12-19 Perry
-  TODO: [ 1379276 ] EditBinaryFiles not added to infrastructure
-   Add EditBinaryFiles to plugins list_of_sources.txt
-   Plugins: list_of_sources.txt
+ TODO: [ 1379276 ] EditBinaryFiles not added to infrastructure
+  Add EditBinaryFiles to plugins list_of_sources.txt
+  Plugins: list_of_sources.txt
 
 2005-12-16 Perry
  PATCH: [ 1379270 ] Fix RCLocalizationHelper to skip numeric handling in strings

diff --git a/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.dsp b/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.dsp
index ab3cf37..5ad8d5d 100644 (file)
--- a/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.dsp
+++ b/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.dsp
@@ -42,8 +42,9 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "..\..\..\BuildTmp\WatchBeginningOfLog\Debug"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\WatchBeginningOfLog\Debug"
+
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
 # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
@@ -54,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\Build\MergeDebug/WatchBeginningOfLog.dll" /pdbtype:sept
 
 !ELSEIF  "$(CFG)" == "WatchBeginningOfLog - Win32 Unicode Debug"
 
@@ -65,8 +66,9 @@ LINK32=xilink6.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugU"
-# PROP Intermediate_Dir "DebugU"
+# PROP Output_Dir "..\..\..\BuildTmp\WatchBeginningOfLog\DebugU"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\WatchBeginningOfLog\DebugU"
+
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
 # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
@@ -77,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\Build\MergeUnicodeDebug/WatchBeginningOfLog.dll" /pdbtype:sept
 
 !ELSEIF  "$(CFG)" == "WatchBeginningOfLog - Win32 Release MinSize"
 
@@ -88,8 +90,9 @@ LINK32=xilink6.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseMinSize"
-# PROP Intermediate_Dir "ReleaseMinSize"
+# PROP Output_Dir "..\..\..\BuildTmp\WatchBeginningOfLog\ReleaseMinSize"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\WatchBeginningOfLog\ReleaseMinSize"
+
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -100,7 +103,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\Build\MergeReleaseMinSize/WatchBeginningOfLog.dll"
 
 !ELSEIF  "$(CFG)" == "WatchBeginningOfLog - Win32 Release MinDependency"
 
@@ -111,8 +114,9 @@ LINK32=xilink6.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseMinDependency"
-# PROP Intermediate_Dir "ReleaseMinDependency"
+# PROP Output_Dir "..\..\..\BuildTmp\WatchBeginningOfLog\ReleaseMinDependency"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\WatchBeginningOfLog\ReleaseMinDependency"
+
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -123,7 +127,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\Build\MergeRelease/WatchBeginningOfLog.dll"
 
 !ELSEIF  "$(CFG)" == "WatchBeginningOfLog - Win32 Unicode Release MinSize"
 
@@ -134,8 +138,9 @@ LINK32=xilink6.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseUMinSize"
-# PROP Intermediate_Dir "ReleaseUMinSize"
+# PROP Output_Dir "..\..\..\BuildTmp\WatchBeginningOfLog\ReleaseUMinSize"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\WatchBeginningOfLog\ReleaseUMinSize"
+
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -146,7 +151,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\Build\MergeUnicodeReleaseMinSize/WatchBeginningOfLog.dll"
 
 !ELSEIF  "$(CFG)" == "WatchBeginningOfLog - Win32 Unicode Release MinDependency"
 
@@ -157,8 +162,9 @@ LINK32=xilink6.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseUMinDependency"
-# PROP Intermediate_Dir "ReleaseUMinDependency"
+# PROP Output_Dir "..\..\..\BuildTmp\WatchBeginningOfLog\ReleaseUMinDependency"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\WatchBeginningOfLog\ReleaseUMinDependency"
+
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -169,7 +175,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\Build\MergeUnicodeRelease/WatchBeginningOfLog.dll"
 
 !ENDIF 
 

diff --git a/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.rc b/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.rc
index 7c6b94f..2ab8910 100644 (file)
--- a/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.rc
+++ b/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION 1,0,0,2
+ PRODUCTVERSION 1,0,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -73,7 +73,7 @@ BEGIN
             VALUE "Comments", "WinMerge plugin\0"
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "WatchBeginningOfLog Module\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
+            VALUE "FileVersion", "1, 0, 0, 2\0"
             VALUE "InternalName", "WatchBeginningOfLog\0"
             VALUE "LegalCopyright", "Copyright 2003-2005\0"
             VALUE "LegalTrademarks", "\0"
@@ -81,7 +81,7 @@ BEGIN
             VALUE "OriginalFilename", "WatchBeginningOfLog.DLL\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "WatchBeginningOfLog Module\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
+            VALUE "ProductVersion", "1, 0, 0, 2\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.dsp b/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.dsp
index c90a70c..8957258 100644 (file)
--- a/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.dsp
+++ b/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.dsp
@@ -42,8 +42,9 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "..\..\..\BuildTmp\WatchEndOfLog\Debug"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\WatchEndOfLog\Debug"
+
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
 # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
@@ -54,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\Build\MergeDebug/WatchEndOfLog.dll" /pdbtype:sept
 
 !ELSEIF  "$(CFG)" == "WatchEndOfLog - Win32 Unicode Debug"
 
@@ -65,8 +66,9 @@ LINK32=xilink6.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugU"
-# PROP Intermediate_Dir "DebugU"
+# PROP Output_Dir "..\..\..\BuildTmp\WatchEndOfLog\DebugU"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\WatchEndOfLog\DebugU"
+
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
 # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
@@ -77,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\Build\MergeUnicodeDebug/WatchEndOfLog.dll" /pdbtype:sept
 
 !ELSEIF  "$(CFG)" == "WatchEndOfLog - Win32 Release MinSize"
 
@@ -88,8 +90,9 @@ LINK32=xilink6.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseMinSize"
-# PROP Intermediate_Dir "ReleaseMinSize"
+# PROP Output_Dir "..\..\..\BuildTmp\WatchEndOfLog\ReleaseMinSize"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\WatchEndOfLog\ReleaseMinSize"
+
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -100,7 +103,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\Build\MergeReleaseMinSize/WatchEndOfLog.dll"
 
 !ELSEIF  "$(CFG)" == "WatchEndOfLog - Win32 Release MinDependency"
 
@@ -111,8 +114,9 @@ LINK32=xilink6.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseMinDependency"
-# PROP Intermediate_Dir "ReleaseMinDependency"
+# PROP Output_Dir "..\..\..\BuildTmp\WatchEndOfLog\ReleaseMinDependency"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\WatchEndOfLog\ReleaseMinDependency"
+
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -123,7 +127,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\Build\MergeRelease/WatchEndOfLog.dll"
 
 !ELSEIF  "$(CFG)" == "WatchEndOfLog - Win32 Unicode Release MinSize"
 
@@ -134,8 +138,9 @@ LINK32=xilink6.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseUMinSize"
-# PROP Intermediate_Dir "ReleaseUMinSize"
+# PROP Output_Dir "..\..\..\BuildTmp\WatchEndOfLog\ReleaseUMinSize"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\WatchEndOfLog\ReleaseUMinSize"
+
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -146,7 +151,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\Build\MergeUnicodeReleaseMinSize/WatchEndOfLog.dll"
 
 !ELSEIF  "$(CFG)" == "WatchEndOfLog - Win32 Unicode Release MinDependency"
 
@@ -157,8 +162,9 @@ LINK32=xilink6.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseUMinDependency"
-# PROP Intermediate_Dir "ReleaseUMinDependency"
+# PROP Output_Dir "..\..\..\BuildTmp\WatchEndOfLog\ReleaseUMinDependency"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\WatchEndOfLog\ReleaseUMinDependency"
+
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -169,7 +175,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\Build\MergeUnicodeRelease/WatchEndOfLog.dll"
 
 !ENDIF 
 

diff --git a/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.rc b/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.rc
index 69125eb..9f00ff6 100644 (file)
--- a/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.rc
+++ b/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION 1,0,0,2
+ PRODUCTVERSION 1,0,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -73,7 +73,7 @@ BEGIN
             VALUE "Comments", "WinMerge plugin\0"
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "WatchEndOfLog Module\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
+            VALUE "FileVersion", "1, 0, 0, 2\0"
             VALUE "InternalName", "WatchEndOfLog\0"
             VALUE "LegalCopyright", "Copyright 2003-2005\0"
             VALUE "LegalTrademarks", "\0"
@@ -81,7 +81,7 @@ BEGIN
             VALUE "OriginalFilename", "WatchEndOfLog.DLL\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "WatchEndOfLog Module\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
+            VALUE "ProductVersion", "1, 0, 0, 2\0"
             VALUE "SpecialBuild", "\0"
         END
     END