Use Mecurial EOL Extension

--HG--
branch : stable

diff --git a/.hgeol b/.hgeol
new file mode 100644 (file)
index 0000000..bec975d
--- /dev/null
+++ b/.hgeol
@@ -0,0 +1,9 @@
+[patterns]\r
+Externals/** = BIN\r
+Testing/** = BIN\r
+**.txt = NATIVE\r
+**.cmd = NATIVE\r
+**.bat = NATIVE\r
+**COPYING = NATIVE\r
+**.flt = NATIVE\r
+**.tmpl = NATIVE\r

diff --git a/BuildBin.cmd b/BuildBin.cmd
index e7aa86e..c27d6ec 100644 (file)
--- a/BuildBin.cmd
+++ b/BuildBin.cmd
@@ -1,34 +1,28 @@
-cd /d "%~dp0"\r
-\r
-del /s Build\*.exe\r
-del /s BuildTmp\*.res\r
-\r
-call SetVersion.cmd\r
-cscript /nologo ExpandEnvironmenStrings.vbs Version.in > Version.h\r
-\r
-rem Filters\r
-mkdir Build\Filters 2> NUL\r
-for %%i in (Filters\*.flt Filters\*.tmpl Filters\*.txt) do (\r
-  cscript convertlf2crlf.vbs "%%i" Build\Filters\%%~nxi"\r
-)\r
-\r
-setlocal\r
-call "%VS120COMNTOOLS%vsvars32.bat"\r
-MSBuild WinMerge.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="Win32" || pause\r
-MSBuild WinMerge.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="x64" || pause\r
-endlocal\r
-\r
-if exist "%SIGNBAT_PATH%" (\r
-  call "%SIGNBAT_PATH%" Build\MergeUnicodeRelease\WinMergeU.exe\r
-  call "%SIGNBAT_PATH%" Build\MergeUnicodeRelease\MergeLang.dll\r
-  call "%SIGNBAT_PATH%" Build\x64\MergeUnicodeRelease\WinMergeU.exe\r
-  call "%SIGNBAT_PATH%" Build\x64\MergeUnicodeRelease\MergeLang.dll\r
-)\r
-\r
-for %%i in ("%ProgramFiles(x86)%" "%ProgramFiles%") do (\r
-  if exist "%%~i\Inno Setup 5\iscc.exe" (\r
-    "%%~i\Inno Setup 5\iscc.exe" "Installer\innosetup\WinMerge.iss" || pause\r
-    "%%~i\Inno Setup 5\iscc.exe" "Installer\innosetup\WinMergeX64.iss" || pause\r
-  )\r
-)\r
-\r
+cd /d "%~dp0"
+
+del /s Build\*.exe
+del /s BuildTmp\*.res
+
+call SetVersion.cmd
+cscript /nologo ExpandEnvironmenStrings.vbs Version.in > Version.h
+
+setlocal
+call "%VS120COMNTOOLS%vsvars32.bat"
+MSBuild WinMerge.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="Win32" || pause
+MSBuild WinMerge.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="x64" || pause
+endlocal
+
+if exist "%SIGNBAT_PATH%" (
+  call "%SIGNBAT_PATH%" Build\MergeUnicodeRelease\WinMergeU.exe
+  call "%SIGNBAT_PATH%" Build\MergeUnicodeRelease\MergeLang.dll
+  call "%SIGNBAT_PATH%" Build\x64\MergeUnicodeRelease\WinMergeU.exe
+  call "%SIGNBAT_PATH%" Build\x64\MergeUnicodeRelease\MergeLang.dll
+)
+
+for %%i in ("%ProgramFiles(x86)%" "%ProgramFiles%") do (
+  if exist "%%~i\Inno Setup 5\iscc.exe" (
+    "%%~i\Inno Setup 5\iscc.exe" "Installer\innosetup\WinMerge.iss" || pause
+    "%%~i\Inno Setup 5\iscc.exe" "Installer\innosetup\WinMergeX64.iss" || pause
+  )
+)
+

diff --git a/BuildManual.cmd b/BuildManual.cmd
index 1752501..0b90df0 100644 (file)
--- a/BuildManual.cmd
+++ b/BuildManual.cmd
@@ -1,11 +1,4 @@
 mkdir Build\Docs 2> NUL
-for %%i in (Docs\Users\*.txt Src\COPYING) do (
-  cscript convertlf2crlf.vbs "%%i" Build\Docs\%%~nxi"
-)
-
-for %%i in (Translations\Docs\Readme\Readme-Japanese.txt) do (
-  cscript convertlf2crlf.vbs "%%i" Build\Docs\%%~nxi"
-)
 
 cd Docs\Users\Manual\build
 call build_htmlhelp.bat

diff --git a/ConvertLF2CRLF.vbs b/ConvertLF2CRLF.vbs
deleted file mode 100644 (file)
index d30fb91..0000000
--- a/ConvertLF2CRLF.vbs
+++ /dev/null
@@ -1,10 +0,0 @@
-Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
-
-Dim src: Set src = fso.OpenTextFile(WScript.Arguments.Unnamed(0), 1)
-Dim txt: txt = src.ReadAll
-src.Close
-
-Dim dst: Set dst = fso.CreateTextFile(WScript.Arguments.Unnamed(1), True)
-dst.Write Replace(Replace(txt, vbCrLf, vbLf), vbLf, vbCrLf)
-dst.Close
-