Update mc_versions data and commands patch and eclipse workspace

This commit is contained in:
Christian 2013-09-18 17:54:01 -04:00
parent 3768ca1713
commit b721a51bc4
3 changed files with 11 additions and 22 deletions

View file

@ -1,17 +1,6 @@
--- commands.py --- commands.py
+++ commands.py +++ commands.py
@@ -126,8 +126,8 @@ @@ -141,6 +141,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 @@
fieldnames = csvreader.fieldnames fieldnames = csvreader.fieldnames
return set(fieldnames) return set(fieldnames)
@ -20,7 +9,7 @@
class Commands(object): class Commands(object):
"""Contains the commands and initialisation for a full mcp run""" """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} binlk = {CLIENT: self.binclient, SERVER: self.binserver}
testlk = {CLIENT: self.testclient, SERVER: self.testserver} 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'))): if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
return False return False
return True return True
@@ -1281,23 +1285,34 @@ @@ -1283,23 +1287,34 @@
pathbinlk = {CLIENT: self.binclient, SERVER: self.binserver} pathbinlk = {CLIENT: self.binclient, SERVER: self.binserver}
pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver} pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog} pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
@ -66,7 +55,7 @@
classpath = os.pathsep.join(cplk[side]) classpath = os.pathsep.join(cplk[side])
forkcmd = self.cmdrecompscala.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side], pkgs=dirs) forkcmd = self.cmdrecompscala.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side], pkgs=dirs)
try: try:
@@ -1317,7 +1332,15 @@ @@ -1319,7 +1334,15 @@
self.logger.error('================================') self.logger.error('================================')
self.logger.error('') self.logger.error('')
raise raise
@ -83,7 +72,7 @@
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],
pkgs=dirs) pkgs=dirs)
@@ -1336,9 +1359,10 @@ @@ -1338,9 +1361,10 @@
self.logger.error('==================') self.logger.error('==================')
self.logger.error('') self.logger.error('')
raise raise
@ -95,7 +84,7 @@
classpath = [os.path.join('..', p) for p in classpath] classpath = [os.path.join('..', p) for p in classpath]
classpath = os.pathsep.join(classpath) classpath = os.pathsep.join(classpath)
os.chdir(self.dirjars) os.chdir(self.dirjars)
@@ -1703,7 +1727,7 @@ @@ -1705,7 +1729,7 @@
self.runcmd(forkcmd) self.runcmd(forkcmd)
return True return True
@ -104,7 +93,7 @@
if not reobf: if not reobf:
md5lk = {CLIENT: self.md5client, SERVER: self.md5server} md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
else: else:
@@ -1718,6 +1742,9 @@ @@ -1720,6 +1744,9 @@
class_path = '' class_path = ''
else: else:
class_path += '/' class_path += '/'
@ -114,7 +103,7 @@
for class_file in fnmatch.filter(filelist, '*.class'): for class_file in fnmatch.filter(filelist, '*.class'):
class_name = class_path + os.path.splitext(class_file)[0] class_name = class_path + os.path.splitext(class_file)[0]
bin_file = os.path.normpath(os.path.join(path, class_file)) bin_file = os.path.normpath(os.path.join(path, class_file))
@@ -1890,6 +1917,9 @@ @@ -1892,6 +1919,9 @@
sys.exit(1) sys.exit(1)
for entry in newfiles: for entry in newfiles:
@ -124,7 +113,7 @@
if entry[3] == 'U': if entry[3] == 'U':
self.logger.info('Retrieving file from server : %s', entry[0]) self.logger.info('Retrieving file from server : %s', entry[0])
cur_file = os.path.normpath(entry[0]) cur_file = os.path.normpath(entry[0])
@@ -1910,6 +1940,9 @@ @@ -1912,6 +1942,9 @@
md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver} md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver} outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
src = {CLIENT: self.srcclient, SERVER: self.srcserver} src = {CLIENT: self.srcclient, SERVER: self.srcserver}

Binary file not shown.

View file

@ -119,5 +119,5 @@ mcp_md5 = ebcecfa00aae07548e67787044410a11
client_md5 = 233effe2110d40a0519cf1489e4ccb1c client_md5 = 233effe2110d40a0519cf1489e4ccb1c
server_md5 = 8ed981ab6030412f586bfe38ff0aaa82 server_md5 = 8ed981ab6030412f586bfe38ff0aaa82
mcp_ver = 8.09 mcp_ver = 8.09
mcp_url = mcp_url = http://mcp.ocean-labs.de/files/archive/mcp809.zip
mcp_md5 = mcp_md5 = 19133b5915dc26a90d84f587172c6692