Cleaned up the AT config updater, should work for any setup of the MCP workspace now.

This commit is contained in:
LexManos committed 2012-11-17 19:08:47 -08:00
1 parent fa567014a5
commit 2dc3f0ddef
1 file changed
+65 -44
+65 -44
View File
@@ -1,80 +1,101 @@
import os, os.path, sys import os, os.path, sys
import urllib, zipfile
import shutil, glob, fnmatch import shutil, glob, fnmatch
import subprocess, logging, re, shlex import csv, re
import csv
print(os.getcwd())
sys.path.append('install')
from fml import gen_merged_srg
ctorsigre = re.compile('<init>\((.*)\)') ctorsigre = re.compile('<init>\((.*)\)')
ctorparamre = re.compile('(([ZBCSIJFD]|L([\w\/]+);))') ctorparamre = re.compile('(([ZBCSIJFD]|L([\w\/]+);))')
common = gen_merged_srg('..',None)
rev_common = {t:{v.split(' ')[0]:k for k, v in m.items()} for t,m in common.items()}
if len(sys.argv) < 2: def get_merged_info():
print('Give me a file to process please') mcp_dir = os.path.join(os.getcwd(), '..')
sys.exit(1) joined = os.path.join(mcp_dir, 'conf', 'joined.srg')
print(sys.argv, len(sys.argv)) values = {'PK:': {}, 'CL:': {}, 'FD:': {}, 'MD:': {}}
if sys.argv[1]=='mcp_merge.cfg': if not os.path.isfile(joined):
print('Fixing mcp_merge.cfg') sys.path.append('install')
with open('mcp_merge.cfg-new','w') as nf: from fml import gen_merged_srg
with open(sys.argv[1]) as f: values = gen_merged_srg(mcp_dir, None)
else:
with open(joined, 'r') as fh:
for line in fh:
pts = line.rstrip('\r\n').split(' ')
if pts[0] == 'MD:':
values[pts[0]][pts[1] + ' ' + pts[2]] = pts[3] + ' ' + pts[4]
else:
values[pts[0]][pts[1]] = pts[2]
return {t:{v.split(' ')[0]:k for k, v in m.items()} for t,m in values.items()}
def process_file(file, srg):
name = os.path.basename(file)
print 'Processing: ' + name
if name == 'mcp_merge.cfg':
with open(file + '-new','w') as nf:
with open(file) as f:
for line in f: for line in f:
parts = line.split('#') parts = line.split('#')
target = parts[1].strip() target = parts[1].strip()
newpart = parts[0][0]+rev_common['CL:'][target]+" #"+target+'\n' newpart = '%s%s #%s\n' % (parts[0][0], srg['CL:'][target], target)
nf.write(newpart) nf.write(newpart)
sys.exit(0) else:
elif len(sys.argv)==2: with open(file + '-new', 'w') as nf:
with open(sys.argv[1]+'-new','w') as nf: with open(file) as f:
with open(sys.argv[1]) as f:
for line in f: for line in f:
parts = line.split('#') parts = line.split('#')
if len(parts[1]) < 4: if len(parts[1]) < 4:
nf.write(line) nf.write(line)
continue continue
typ = parts[1][0:3] typ = parts[1][0:3]
if not rev_common.has_key(typ):
if not srg.has_key(typ):
nf.write(line) nf.write(line)
continue continue
name = parts[1][3:].strip() name = parts[1][3:].strip()
name = (name if name.startswith('net/minecraft/') else 'net/minecraft/src/' + name)
action = parts[0].split(' ') action = parts[0].split(' ')
if name.endswith('/*'): if name.endswith('/*'):
targ = rev_common['CL:']['net/minecraft/src/'+name[:-2]] targ = srg['CL:'][name[:-2]]
if typ == 'MD:': wildcard = ('.*()' if typ == 'MD:' else '.*')
wildcard = '.*()'
else: newline = '%s %s%s #%s' % (action[0], targ, wildcard, '#'.join(parts[1:]))
wildcard = '.*'
newline = action[0]+' '+targ+wildcard+' #'+'#'.join(parts[1:])
nf.write(newline) nf.write(newline)
elif name.find('/<init>') >= 0: elif name.find('/<init>') >= 0:
targ = rev_common['CL:']['net/minecraft/src/'+name[:name.find('/<init>')]] targ = srg['CL:'][name[:name.find('/<init>')]]
args = '<init>(' args = '<init>('
armatch = ctorsigre.search(name).group(1) armatch = ctorsigre.search(name).group(1)
for bit in ctorparamre.findall(armatch): for bit in ctorparamre.findall(armatch):
if len(bit[2])>0 and rev_common['CL:'].has_key(bit[2]): if len(bit[2]) > 0 and srg['CL:'].has_key(bit[2]):
cl = 'L'+rev_common['CL:'][bit[2]]+';' cl = 'L' + srg['CL:'][bit[2]] + ';'
else: else:
cl = bit[1] cl = bit[1]
args += cl args += cl
args += ')V' args += ')V'
print(line.strip()) newline = ('%s %s.%s #%s' % (action[0], targ, args, '#'.join(parts[1:])))
newline = action[0]+' '+targ+'.'+args+' #'+'#'.join(parts[1:])
print(newline.strip())
nf.write(newline) nf.write(newline)
else: else:
targ = rev_common[typ]['net/minecraft/src/'+name] targ = srg[typ][name]
newline = action[0]+' '+targ.replace('/','.',1).replace(' ','',1)+' #'+'#'.join(parts[1:]) args = targ.replace('/', '.', 1).replace(' ', '', 1)
newline = ('%s %s #%s' % (action[0], args, '#'.join(parts[1:])))
nf.write(newline) nf.write(newline)
else:
typ = sys.argv[1]
name = sys.argv[2]
name = name.replace('.','/')
if typ.startswith('-'):
print(rev_common[typ[1:]][name])
else:
print(common[typ][name])
def main():
srg = get_merged_info()
for arg in sys.argv:
path = os.path.join(os.getcwd(), arg)
if arg.endswith('_at.cfg') or arg == 'mcp_merge.cfg':
process_file(path, srg)
elif os.path.isdir(path):
for file in os.listdir(path):
if file.endswith('_at.cfg'):
process_file(os.path.join(path, file), srg)
if __name__ == '__main__':
main()