From 68ae32c48c1302c553da8403c710d0ee2375f59b Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 2 Aug 2012 21:14:06 -0700 Subject: [PATCH] Cleaned up commands.patch, removed debug print in fml.py --- commands.patch | 36 +++++++++++++++--------------------- install/fml.py | 2 +- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/commands.patch b/commands.patch index 144a133b42..636fb44422 100644 --- a/commands.patch +++ b/commands.patch @@ -1,22 +1,16 @@ --- commands.py +++ commands.py -@@ -22,6 +22,7 @@ - import errno - import shlex - import platform -+import pprint - from hashlib import md5 # pylint: disable-msg=E0611 - from contextlib import closing - from textwrap import TextWrapper -@@ -502,6 +503,7 @@ - self.binclienttmp = os.path.normpath(config.get('OUTPUT', 'BinClientTemp')) - self.binservertmp = os.path.normpath(config.get('OUTPUT', 'BinServerTemp')) - self.srcclient = os.path.normpath(config.get('OUTPUT', 'SrcClient')) +@@ -582,6 +582,9 @@ + self.has_astyle_cfg = False + if os.path.isfile(self.astyleconf): + self.has_astyle_cfg = True ++ ++ #FML Entries + self.srcshared = os.path.normpath(os.path.join(self.dirsrc, 'common')) - self.srcserver = os.path.normpath(config.get('OUTPUT', 'SrcServer')) - self.testclient = config.get('OUTPUT', 'TestClient') - self.testserver = config.get('OUTPUT', 'TestServer') -@@ -1039,6 +1041,7 @@ + + def creatergcfg(self, reobf=False, keep_lvt=False, keep_generics=False, rg_update=False): + """Create the files necessary for RetroGuard""" +@@ -1039,6 +1042,7 @@ all_files = True append_pattern = False pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=append_pattern, all_files=all_files) @@ -24,7 +18,7 @@ dirs = ' '.join(pkglist) classpath = os.pathsep.join(cplk[side]) forkcmd = self.cmdrecomp.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side], -@@ -1238,6 +1241,11 @@ +@@ -1238,6 +1242,11 @@ # HINT: We pathwalk the sources for path, _, filelist in os.walk(pathsrclk[side], followlinks=True): @@ -36,7 +30,7 @@ for cur_file in fnmatch.filter(filelist, '*.java'): updatefile(os.path.normpath(os.path.join(path, cur_file))) return True -@@ -1320,12 +1328,14 @@ +@@ -1320,12 +1329,14 @@ pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver} strip_comments(pathsrclk[side]) @@ -51,7 +45,7 @@ def process_javadoc(self, side): """Add CSV descriptions to methods and fields as javadoc""" -@@ -1334,6 +1344,21 @@ +@@ -1334,6 +1345,21 @@ if not self.has_doc_csv: self.logger.warning('!! javadoc disabled due to no csvs !!') return False @@ -73,7 +67,7 @@ #HINT: We read the relevant CSVs methodsreader = csv.DictReader(open(self.csvmethods, 'r')) -@@ -1420,6 +1445,7 @@ +@@ -1420,6 +1446,7 @@ # HINT: We create the list of source directories based on the list of packages pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=True) @@ -81,7 +75,7 @@ dirs = ' '.join(pkglist) forkcmd = self.cmdastyle.format(classes=dirs, conffile=self.astyleconf) self.runcmd(forkcmd) -@@ -1592,6 +1618,9 @@ +@@ -1592,6 +1619,9 @@ sys.exit(1) for entry in newfiles: diff --git a/install/fml.py b/install/fml.py index 84d8b04a61..b4e39a7b52 100644 --- a/install/fml.py +++ b/install/fml.py @@ -159,7 +159,7 @@ def setup_fml(fml_dir, mcp_dir): forkcmd = ('%s -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {target}' % self.cmdjavac).format( classpath=os.pathsep.join(['.', os.path.join(mcp_dir, 'lib', '*')]), sourcepath=os.path.join(fml_dir, 'common'), outpath=os.path.join(fml_dir, 'bin'), target=os.path.join(fml_dir, 'transformers', 'cpw', 'mods', 'fml', 'common', 'asm', 'transformers', 'AccessTransformer.java')) - print forkcmd + #print forkcmd self.runcmd(forkcmd) #Run AccessTransformer