keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fix patching

This commit is contained in:
Christian Weeks 2012-03-30 20:43:58 -04:00
parent e5b4d1e953
commit 12c23deee9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fml/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
View File

@ -1,5 +1,5 @@
--- ../vanillamcp/src-reference/minecraft_server/net/minecraft/server/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000
+++ ../vanillamcp/src-work/minecraft_server/net/minecraft/server/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000
--- src-reference/minecraft_server/net/minecraft/server/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000
+++ src-work/minecraft_server/net/minecraft/server/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000
@@ -13,6 +13,9 @@
import java.util.Random;
import java.util.logging.Level;

4
fml/update_patches.py
View File

@ -29,7 +29,7 @@ def main():
print("Creating patches")
base = 'src-reference'
work = 'src-work'
patched_dir=os.path.join(sys.argv[1],work)
patched_dir=os.path.normpath(os.path.join(sys.argv[1],work))
timestamp = re.compile(r'[0-9-]* [0-9:\.]* [+-][0-9]*\r?\n')
for path, _, filelist in os.walk(patched_dir, followlinks=True):
@ -40,7 +40,7 @@ def main():
cmd = 'diff -u %s %s -r --strip-trailing-cr --new-file' % (file_base, file_work)
process = subprocess.Popen(cmdsplit(cmd), cwd=os.path.normpath(sys.argv[1]), stdout=subprocess.PIPE, stderr=subprocess.STDOUT, bufsize=-1)
patch, _ = process.communicate()
patch_dir = os.path.join(sys.argv[2],'patches', path[len(work)+1:])
patch_dir = os.path.join(sys.argv[2],path[len(patched_dir)+1:])
patch_file = os.path.join(patch_dir, cur_file + '.patch')
if len(patch) > 0: