Mercurial > hg > truffle
comparison mx/commands.py @ 7779:18eea22675ad
mx build now requires a jdk version >= 1.7.0_04. Caused by http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7159016
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Tue, 12 Feb 2013 15:59:46 +0100 |
parents | 2d57a3bd82ab |
children | dbbe8ce3bfa5 |
comparison
equal
deleted
inserted
replaced
7778:6b540bb82312 | 7779:18eea22675ad |
---|---|
1172 version = mx.java().version | 1172 version = mx.java().version |
1173 parts = version.split('.') | 1173 parts = version.split('.') |
1174 assert len(parts) >= 2 | 1174 assert len(parts) >= 2 |
1175 assert parts[0] == '1' | 1175 assert parts[0] == '1' |
1176 major = int(parts[1]) | 1176 major = int(parts[1]) |
1177 if not major >= 7: | 1177 minor = 0 |
1178 mx.abort('Requires Java version 1.7 or greater, got version ' + version) | 1178 update = 0 |
1179 if len(parts) >= 3: | |
1180 minorParts = parts[2].split('_') | |
1181 if len(minorParts) >= 1: | |
1182 minor = int(minorParts[0]) | |
1183 if len(minorParts) >= 2: | |
1184 update = int(minorParts[1]) | |
1185 | |
1186 if (not major >= 7) or (major == 7 and minor == 0 and not update >= 4) : | |
1187 mx.abort('Requires Java version 1.7.0_04 or greater, got version ' + version) | |
1179 | 1188 |
1180 if (_vmSourcesAvailable): | 1189 if (_vmSourcesAvailable): |
1181 if hasattr(opts, 'vm') and opts.vm is not None: | 1190 if hasattr(opts, 'vm') and opts.vm is not None: |
1182 global _vm | 1191 global _vm |
1183 _vm = opts.vm | 1192 _vm = opts.vm |