Commit ace33bcf authored by Cyril Russo's avatar Cyril Russo

Reverted the change in the default config.py

Improved the detection of keytool and jarsigner by also searching the PATH environment variable
parent 4f21045c
......@@ -118,9 +118,6 @@ The repository of older versions of applications from the main demo repository.
# keystore.
# repo_pubkey = "..."
# The keytool command to run to get Java's keytool version
keytool = "keytool"
# The keystore to use for release keys when building. This needs to be
# somewhere safe and secure, and backed up! The best way to manage these
# sensitive keys is to use a "smartcard" (aka Hardware Security Module). To
......
......@@ -236,6 +236,18 @@ def fill_config_defaults(thisconfig):
thisconfig['keytool'] = os.path.join(java_home, 'bin', 'keytool')
break
if 'jarsigner' not in thisconfig:
for path in os.environ['PATH'].split(':'):
jarsigner = os.path.join(path, 'jarsigner')
if os.path.exists(jarsigner):
thisconfig['jarsigner'] = jarsigner
else:
continue
keytool = os.path.join(path, 'keytool')
if os.path.exists(keytool):
thisconfig['keytool'] = keytool
break
for k in ['ndk_paths', 'java_paths']:
d = thisconfig[k]
for k2 in d.copy():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment