use jarsigner and keytool from same JDK as is being set in JAVA7_HOME

[fdroidserver.git] / fdroidserver / common.py

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index a20aa59b478822ced8a95353ea62bc29fe4e9d55..c30d3b4e07ed7d6492a47351f1959d5e83b395be 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -62,10 +62,7 @@ default_config = {
         'r10e': "$ANDROID_NDK",
     },
     'build_tools': "23.0.2",
-    'java_paths': {
-        '1.7': "/usr/lib/jvm/java-7-openjdk",
-        '1.8': None,
-    },
+    'java_paths': None,
     'ant': "ant",
     'mvn3': "mvn",
     'gradle': 'gradle',
@@ -131,6 +128,40 @@ def fill_config_defaults(thisconfig):
             thisconfig[k] = exp
             thisconfig[k + '_orig'] = v
 
+    # find all installed JDKs for keytool, jarsigner, and JAVA[6-9]_HOME env vars
+    if thisconfig['java_paths'] is None:
+        thisconfig['java_paths'] = dict()
+        for d in sorted(glob.glob('/usr/lib/jvm/j*[6-9]*')
+                        + glob.glob('/usr/java/jdk1.[6-9]*')
+                        + glob.glob('/System/Library/Java/JavaVirtualMachines/1.[6-9].0.jdk')
+                        + glob.glob('/Library/Java/JavaVirtualMachines/*jdk*[6-9]*')):
+            if os.path.islink(d):
+                continue
+            j = os.path.basename(d)
+            # the last one found will be the canonical one, so order appropriately
+            for regex in (r'1\.([6-9])\.0\.jdk',  # OSX
+                          r'jdk1\.([6-9])\.0_[0-9]+.jdk',  # OSX and Oracle tarball
+                          r'jdk([6-9])-openjdk',  # Arch
+                          r'java-1\.([6-9])\.0-.*',  # RedHat
+                          r'java-([6-9])-oracle',  # Debian WebUpd8
+                          r'jdk-([6-9])-oracle-.*',  # Debian make-jpkg
+                          r'java-([6-9])-openjdk-[^c][^o][^m].*'):  # Debian
+                m = re.match(regex, j)
+                if m:
+                    osxhome = os.path.join(d, 'Contents', 'Home')
+                    if os.path.exists(osxhome):
+                        thisconfig['java_paths'][m.group(1)] = osxhome
+                    else:
+                        thisconfig['java_paths'][m.group(1)] = d
+
+    for java_version in ('7', '8', '9'):
+        java_home = thisconfig['java_paths'][java_version]
+        jarsigner = os.path.join(java_home, 'bin', 'jarsigner')
+        if os.path.exists(jarsigner):
+            thisconfig['jarsigner'] = jarsigner
+            thisconfig['keytool'] = os.path.join(java_home, 'bin', 'keytool')
+            break  # Java7 is preferred, so quit if found
+
     for k in ['ndk_paths', 'java_paths']:
         d = thisconfig[k]
         for k2 in d.copy():
@@ -194,10 +225,8 @@ def read_config(opts, config_file='config.py'):
     for n in ['ANDROID_HOME', 'ANDROID_SDK']:
         env[n] = config['sdk_path']
 
-    for v in ['7', '8']:
-        cpath = config['java_paths']['1.%s' % v]
-        if cpath:
-            env['JAVA%s_HOME' % v] = cpath
+    for k, v in config['java_paths'].items():
+        env['JAVA%s_HOME' % k] = v
 
     for k in ["keystorepass", "keypass"]:
         if k in config:
@@ -1789,7 +1818,7 @@ def verify_apks(signed_apk, unsigned_apk, tmp_dir):
         for meta_inf_file in meta_inf_files:
             unsigned_apk_as_zip.write(os.path.join(tmp_dir, meta_inf_file), arcname=meta_inf_file)
 
-    if subprocess.call(['jarsigner', '-verify', unsigned_apk]) != 0:
+    if subprocess.call([config['jarsigner'], '-verify', unsigned_apk]) != 0:
         logging.info("...NOT verified - {0}".format(signed_apk))
         return compare_apks(signed_apk, unsigned_apk, tmp_dir)
     logging.info("...successfully verified")
@@ -1891,7 +1920,7 @@ def genkeystore(localconfig):
 
     write_password_file("keystorepass", localconfig['keystorepass'])
     write_password_file("keypass", localconfig['keypass'])
-    p = FDroidPopen(['keytool', '-genkey',
+    p = FDroidPopen([config['keytool'], '-genkey',
                      '-keystore', localconfig['keystore'],
                      '-alias', localconfig['repo_keyalias'],
                      '-keyalg', 'RSA', '-keysize', '4096',
@@ -1905,7 +1934,7 @@ def genkeystore(localconfig):
         raise BuildException("Failed to generate key", p.output)
     os.chmod(localconfig['keystore'], 0o0600)
     # now show the lovely key that was just generated
-    p = FDroidPopen(['keytool', '-list', '-v',
+    p = FDroidPopen([config['keytool'], '-list', '-v',
                      '-keystore', localconfig['keystore'],
                      '-alias', localconfig['repo_keyalias'],
                      '-storepass:file', config['keystorepassfile']])