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

Backed out changeset f88b59de4952 (bug 1352599)

Browse Source
This commit is contained in:
Sebastian Hengst 2017-10-12 23:40:36 +02:00
parent 49ce6f44af
commit aaf2517be0
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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