diff --git a/fml/commands.patch b/fml/commands.patch index 3cf59aa3c8..9b9702de58 100644 --- a/fml/commands.patch +++ b/fml/commands.patch @@ -1,17 +1,6 @@ --- commands.py +++ commands.py -@@ -126,8 +126,8 @@ - - - def truncate(text, length): -- if len(text) > length: -- return text[:length] + '...' -+ #if len(text) > length: -+ # return text[:length] + '...' - return text - - -@@ -139,6 +139,8 @@ +@@ -141,6 +141,8 @@ fieldnames = csvreader.fieldnames return set(fieldnames) @@ -20,7 +9,7 @@ class Commands(object): """Contains the commands and initialisation for a full mcp run""" -@@ -950,6 +952,8 @@ +@@ -952,6 +954,8 @@ binlk = {CLIENT: self.binclient, SERVER: self.binserver} testlk = {CLIENT: self.testclient, SERVER: self.testserver} @@ -29,7 +18,7 @@ if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))): return False return True -@@ -1281,23 +1285,34 @@ +@@ -1283,23 +1287,34 @@ pathbinlk = {CLIENT: self.binclient, SERVER: self.binserver} pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver} pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog} @@ -66,7 +55,7 @@ classpath = os.pathsep.join(cplk[side]) forkcmd = self.cmdrecompscala.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side], pkgs=dirs) try: -@@ -1317,7 +1332,15 @@ +@@ -1319,7 +1334,15 @@ self.logger.error('================================') self.logger.error('') raise @@ -83,7 +72,7 @@ classpath = os.pathsep.join(cplk[side]) forkcmd = self.cmdrecomp.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side], pkgs=dirs) -@@ -1336,9 +1359,10 @@ +@@ -1338,9 +1361,10 @@ self.logger.error('==================') self.logger.error('') raise @@ -95,7 +84,7 @@ classpath = [os.path.join('..', p) for p in classpath] classpath = os.pathsep.join(classpath) os.chdir(self.dirjars) -@@ -1703,7 +1727,7 @@ +@@ -1705,7 +1729,7 @@ self.runcmd(forkcmd) return True @@ -104,7 +93,7 @@ if not reobf: md5lk = {CLIENT: self.md5client, SERVER: self.md5server} else: -@@ -1718,6 +1742,9 @@ +@@ -1720,6 +1744,9 @@ class_path = '' else: class_path += '/' @@ -114,7 +103,7 @@ for class_file in fnmatch.filter(filelist, '*.class'): class_name = class_path + os.path.splitext(class_file)[0] bin_file = os.path.normpath(os.path.join(path, class_file)) -@@ -1890,6 +1917,9 @@ +@@ -1892,6 +1919,9 @@ sys.exit(1) for entry in newfiles: @@ -124,7 +113,7 @@ if entry[3] == 'U': self.logger.info('Retrieving file from server : %s', entry[0]) cur_file = os.path.normpath(entry[0]) -@@ -1910,6 +1940,9 @@ +@@ -1912,6 +1942,9 @@ md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver} outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver} src = {CLIENT: self.srcclient, SERVER: self.srcserver} diff --git a/fml/eclipse-workspace-dev.zip b/fml/eclipse-workspace-dev.zip index 0bdd7624b9..485982d405 100644 Binary files a/fml/eclipse-workspace-dev.zip and b/fml/eclipse-workspace-dev.zip differ diff --git a/fml/mc_versions.cfg b/fml/mc_versions.cfg index 5f78524a5c..fe93b03cf0 100644 --- a/fml/mc_versions.cfg +++ b/fml/mc_versions.cfg @@ -119,5 +119,5 @@ mcp_md5 = ebcecfa00aae07548e67787044410a11 client_md5 = 233effe2110d40a0519cf1489e4ccb1c server_md5 = 8ed981ab6030412f586bfe38ff0aaa82 mcp_ver = 8.09 -mcp_url = -mcp_md5 = +mcp_url = http://mcp.ocean-labs.de/files/archive/mcp809.zip +mcp_md5 = 19133b5915dc26a90d84f587172c6692