[Winmerge-svn] SF.net SVN: winmerge: [4660] trunk/Src/Languages
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <jt...@us...> - 2007-10-25 15:20:55
|
Revision: 4660 http://winmerge.svn.sourceforge.net/winmerge/?rev=4660&view=rev Author: jtuc Date: 2007-10-25 08:20:50 -0700 (Thu, 25 Oct 2007) Log Message: ----------- Patch #1804762 continued Modified Paths: -------------- trunk/Src/Languages/CreateMasterPotFile.vbs Added Paths: ----------- trunk/Src/Languages/BuildMergeLangDll.bat Added: trunk/Src/Languages/BuildMergeLangDll.bat =================================================================== --- trunk/Src/Languages/BuildMergeLangDll.bat (rev 0) +++ trunk/Src/Languages/BuildMergeLangDll.bat 2007-10-25 15:20:50 UTC (rev 4660) @@ -0,0 +1,9 @@ +cd +echo %0 +echo $(IntDir) = %1 +echo $(TargetPath) = %2 +cd Languages +cscript CreateMasterPotFile.vbs +cd .. +rc /fo%1\MergeLang.res /i.. Languages\MergeLang.rc +link /DLL /NOENTRY /MACHINE:IX86 /OUT:%2\..\MergeLang.dll %1\MergeLang.res Modified: trunk/Src/Languages/CreateMasterPotFile.vbs =================================================================== --- trunk/Src/Languages/CreateMasterPotFile.vbs 2007-10-24 15:58:09 UTC (rev 4659) +++ trunk/Src/Languages/CreateMasterPotFile.vbs 2007-10-25 15:20:50 UTC (rev 4660) @@ -31,7 +31,7 @@ StartTime = Time - Wscript.Echo "Warning: " & Wscript.ScriptName & " can take few seconds to finish!" + Wscript.Echo "Attention: " & Wscript.ScriptName & " can take few seconds to finish!" Set oStrings = GetStringsFromRcFile("../Merge.rc", oComments, sCodePage) CreateMasterPotFile "English.pot", oStrings, oComments, sCodePage @@ -152,6 +152,7 @@ End If End If End If + If sLine = "#ifndef APSTUDIO_INVOKED" Then Exit Do oLcFile.WriteLine sLcLine Loop oRcFile.Close This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |