Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1352599 - Follow-up: Fix Python lint errors. r=Aryx

Browse Source
This commit is contained in:
Nick Alexander 2017-10-12 20:48:22 +02:00
parent 06432fe10f
commit bcdb2e2621
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build/moz.configure/java.configure
View File

@ -67,6 +67,7 @@ def javac_version(javac):
except subprocess.CalledProcessError as e:
die('Failed to get javac version: %s', e.output)
# Proguard detection
# ========================================================
@dependable
@ -74,13 +75,16 @@ def javac_version(javac):
def proguard_jar_default():
# By default, look for proguard.jar in the location to which `mach
# bootstrap` or `mach artifact toolchain` will install Proguard.
mozbuild_state_dir = os.environ.get('MOZBUILD_STATE_PATH',
os.path.expanduser(os.path.join('~', '.mozbuild')))
default = os.path.expanduser(os.path.join('~', '.mozbuild'))
mozbuild_state_dir = os.environ.get('MOZBUILD_STATE_PATH', default)
return os.path.join(mozbuild_state_dir, 'proguard', 'lib', 'proguard.jar')
# Proguard is really required; we provide a good error message when
# validating.
option(env='PROGUARD_JAR', nargs=1, default=proguard_jar_default, help='Path to proguard.jar')
option(env='PROGUARD_JAR', nargs=1, default=proguard_jar_default,
help='Path to proguard.jar')
@depends(java, 'PROGUARD_JAR')
@checking('for proguard.jar version')
@ -90,14 +94,16 @@ option(env='PROGUARD_JAR', nargs=1, default=proguard_jar_default, help='Path to
@imports(_from='exceptions', _import='Exception')
def valid_proguard(java, proguard_jar):
if not proguard_jar or not os.path.isfile(proguard_jar[0]):
die('proguard.jar 5.3.3 or higher is required (looked for %s). '
die('proguard.jar 5.3.3 or higher is required (looked for {}). '
'Run |mach artifact install --from-build proguard-jar| or add '
'`export PROGUARD_JAR=/path/to/proguard.jar` to your mozconfig.' % proguard_jar[0])
'`export PROGUARD_JAR=/path/to/proguard.jar` to your mozconfig.'
.format(proguard_jar[0]))
try:
output = subprocess.check_output([java, '-jar', proguard_jar[0]])
# Exit code zero shouldn't happen.
die('Expected `java -jar {}` to fail (with version in output) but got exit code 0'
die('Expected `java -jar {}` to fail (with version in output) '
'but got exit code 0'
.format(proguard_jar[0]))
except subprocess.CalledProcessError as e:
@ -106,11 +112,12 @@ def valid_proguard(java, proguard_jar):
# Usage: java proguard.ProGuard [options ...]
output = e.output
version = Version(e.output.splitlines()[0].split(' ')[-1])
version = Version(output.splitlines()[0].split(' ')[-1])
if version < '5.3.3':
die('proguard.jar 5.3.3 or higher is required (found %s). '
'Run |mach bootstrap| to upgrade. ' % version)
return proguard_jar[0]
set_config('PROGUARD_JAR', valid_proguard)