Patch commands.py to support side '2' as common, as well as fix a few small errors in the update_patches and fml scripts.
This commit is contained in:
parent
fc8c2ac6e4
commit
ae79c79447
|
@ -18,6 +18,30 @@
|
||||||
dirs = ' '.join(pkglist)
|
dirs = ' '.join(pkglist)
|
||||||
classpath = os.pathsep.join(cplk[side])
|
classpath = os.pathsep.join(cplk[side])
|
||||||
forkcmd = self.cmdrecomp.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side],
|
forkcmd = self.cmdrecomp.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side],
|
||||||
|
@@ -1195,20 +1199,20 @@
|
||||||
|
with open(self.csvmethods, 'rb') as fh:
|
||||||
|
methodsreader = csv.DictReader(fh)
|
||||||
|
for row in methodsreader:
|
||||||
|
- if int(row['side']) == side:
|
||||||
|
+ if int(row['side']) == side or int(row['side']) == 2:
|
||||||
|
if row['name'] != row['searge']:
|
||||||
|
names['methods'][row['searge']] = row['name']
|
||||||
|
with open(self.csvfields, 'rb') as fh:
|
||||||
|
fieldsreader = csv.DictReader(fh)
|
||||||
|
for row in fieldsreader:
|
||||||
|
- if int(row['side']) == side:
|
||||||
|
+ if int(row['side']) == side or int(row['side']) == 2:
|
||||||
|
if row['name'] != row['searge']:
|
||||||
|
names['fields'][row['searge']] = row['name']
|
||||||
|
if self.has_param_csv:
|
||||||
|
with open(self.csvparams, 'rb') as fh:
|
||||||
|
paramsreader = csv.DictReader(fh)
|
||||||
|
for row in paramsreader:
|
||||||
|
- if int(row['side']) == side:
|
||||||
|
+ if int(row['side']) == side or int(row['side']) == 2:
|
||||||
|
names['params'][row['param']] = row['name']
|
||||||
|
|
||||||
|
regexps = {
|
||||||
@@ -1238,6 +1242,11 @@
|
@@ -1238,6 +1242,11 @@
|
||||||
|
|
||||||
# HINT: We pathwalk the sources
|
# HINT: We pathwalk the sources
|
||||||
|
@ -56,17 +80,33 @@
|
||||||
+ if side == CLIENT:
|
+ if side == CLIENT:
|
||||||
+ tmp = self.srcclient
|
+ tmp = self.srcclient
|
||||||
+ self.srcclient = self.srcshared
|
+ self.srcclient = self.srcshared
|
||||||
+ process_javadoc(self, side)
|
+ self.process_javadoc(side)
|
||||||
+ self.srcclient = tmp
|
+ self.srcclient = tmp
|
||||||
+ else:
|
+ else:
|
||||||
+ tmp = self.srcserver
|
+ tmp = self.srcserver
|
||||||
+ self.srcserver = self.srcshared
|
+ self.srcserver = self.srcshared
|
||||||
+ process_javadoc(self, side)
|
+ self.process_javadoc(side)
|
||||||
+ self.srcserver = tmp
|
+ self.srcserver = tmp
|
||||||
+
|
+
|
||||||
|
|
||||||
#HINT: We read the relevant CSVs
|
#HINT: We read the relevant CSVs
|
||||||
methodsreader = csv.DictReader(open(self.csvmethods, 'r'))
|
methodsreader = csv.DictReader(open(self.csvmethods, 'r'))
|
||||||
|
@@ -1342,13 +1368,13 @@
|
||||||
|
methods = {}
|
||||||
|
for row in methodsreader:
|
||||||
|
#HINT: Only include methods that have a non-empty description
|
||||||
|
- if int(row['side']) == side and row['desc']:
|
||||||
|
+ if (int(row['side']) == side or int(row['side']) == 2) and row['desc']:
|
||||||
|
methods[row['searge']] = row['desc'].replace('*/', '* /')
|
||||||
|
|
||||||
|
fields = {}
|
||||||
|
for row in fieldsreader:
|
||||||
|
#HINT: Only include fields that have a non-empty description
|
||||||
|
- if int(row['side']) == side and row['desc']:
|
||||||
|
+ if (int(row['side']) == side or int(row['side']) == 2) and row['desc']:
|
||||||
|
fields[row['searge']] = row['desc'].replace('*/', '* /')
|
||||||
|
|
||||||
|
regexps = {
|
||||||
@@ -1420,6 +1446,7 @@
|
@@ -1420,6 +1446,7 @@
|
||||||
|
|
||||||
# HINT: We create the list of source directories based on the list of packages
|
# HINT: We create the list of source directories based on the list of packages
|
||||||
|
|
|
@ -248,9 +248,6 @@ def merge_client_server(mcp_dir):
|
||||||
os.remove(f_server)
|
os.remove(f_server)
|
||||||
|
|
||||||
def apply_fml_patches(fml_dir, mcp_dir, src_dir, copy_files=True):
|
def apply_fml_patches(fml_dir, mcp_dir, src_dir, copy_files=True):
|
||||||
sys.path.append(mcp_dir)
|
|
||||||
from runtime.updatemd5 import updatemd5
|
|
||||||
|
|
||||||
has_client = os.path.isdir(os.path.join(src_dir, 'minecraft'))
|
has_client = os.path.isdir(os.path.join(src_dir, 'minecraft'))
|
||||||
has_server = os.path.isdir(os.path.join(src_dir, 'minecraft_server'))
|
has_server = os.path.isdir(os.path.join(src_dir, 'minecraft_server'))
|
||||||
|
|
||||||
|
|
|
@ -63,7 +63,7 @@ def main():
|
||||||
|
|
||||||
cleanDirs(patchd)
|
cleanDirs(patchd)
|
||||||
|
|
||||||
backup = os.path.join(fml_dir, 'commands.py.bck')
|
backup = os.path.join(mcp, 'runtime', 'commands.py.bck')
|
||||||
runtime = os.path.join(mcp, 'runtime', 'commands.py')
|
runtime = os.path.join(mcp, 'runtime', 'commands.py')
|
||||||
patch_file = os.path.join(fml_dir, 'commands.patch')
|
patch_file = os.path.join(fml_dir, 'commands.patch')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue