summaryrefslogtreecommitdiff
path: root/.tools/applicator.py
diff options
context:
space:
mode:
Diffstat (limited to '.tools/applicator.py')
-rw-r--r--.tools/applicator.py26
1 files changed, 25 insertions, 1 deletions
diff --git a/.tools/applicator.py b/.tools/applicator.py
index e3c795aea..ea9b5f77b 100644
--- a/.tools/applicator.py
+++ b/.tools/applicator.py
@@ -1,7 +1,7 @@
import subprocess
# Open reapply.patch3
-f=open("./reapply.patch3", "r")
+f=open("reapply.patch3", "r")
subprocess.call("cd ../../server-code", shell=True)
for line in f:
@@ -18,3 +18,27 @@ for line in f:
f.close()
+print "Evol porting finished"
+
+
+###############################################
+# Open reapply.patch4 (HerculesWS Upstream)
+f=open("reapply.patch4", "r")
+subprocess.call("cd ../../server-code", shell=True)
+
+for line in f:
+ if line[0] == "#" or line[0] == "\r" or line[0] == "\n":
+ continue
+ print "Downloading patch "+line.replace("\n", "")
+ subprocess.call("cd ../../server-code ; wget https://github.com/HerculesWS/Hercules/commit/"+line.replace("\n", "")+".diff", shell=True)
+ print "Applying patch..."
+ #subprocess.call("cd ../../server-code ; ls", shell=True)
+ subprocess.call("cd ../../server-code ; git apply --ignore-whitespace --exclude=doc/ --reject "+line.replace("\n", "")+".diff", shell=True)
+ print "Patch applied"
+ subprocess.call("cd ../../server-code ; rm "+line.replace("\n", "")+".diff", shell=True)
+ print "Patch deleted (success)"
+
+
+f.close()
+print "HercWS porting finished"
+