From c7db47d528101b0e36430d2d5666b0850a75b1e1 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Tue, 2 Aug 2011 03:54:59 +0000 Subject: [PATCH] Improved the setup scripts. --- lfcr.py | 8 ++++++++ setup.bat | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 lfcr.py diff --git a/lfcr.py b/lfcr.py new file mode 100644 index 0000000000..d6ad3ee6c6 --- /dev/null +++ b/lfcr.py @@ -0,0 +1,8 @@ +#! /usr/bin/env python + +import sys, re, os +data = open(sys.argv[1], "rb").read() +newdata = re.sub("\r?\n", "\r\n", data) +f = open(sys.argv[2], "wb") +f.write(newdata) +f.close() \ No newline at end of file diff --git a/setup.bat b/setup.bat index b22e394ce7..82cea28133 100755 --- a/setup.bat +++ b/setup.bat @@ -1,5 +1,3 @@ -set CYGWIN=E:\cygwin\bin - cd .. rmdir /S /Q src @@ -10,7 +8,8 @@ rmdir /S /Q src_work ) ELSE ( cmd /C decompile.bat cd src -%CYGWIN%\patch -u -p2 < ..\forge\modLoaderMP.patch +..\runtime\bin\python\python_mcp forge\lfcr.py ..\forge\modLoaderMP.patch ..\forge\modLoaderMP-win.patch +..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\modLoaderMP.patch cd .. cmd /C recompile.bat cmd /C updatemd5.bat @@ -21,5 +20,6 @@ mkdir src_work xcopy /Y /E src\* src_base xcopy /Y /E src\* src_work cd src_work -%CYGWIN%\patch -u -p2 < ..\forge\minecraft.patch +..\runtime\bin\python\python_mcp forge\lfcr.py ..\forge\minecraft.patch ..\forge\minecraft-win.patch +..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\minecraft-win.patch pause