commit e18fa6e165ff963153a884cf78dc496511133bcd
author Søren Gjesse <sgjesse@google.com> Fri Jun 24 15:14:53 2022 +0200
committer Søren Gjesse <sgjesse@google.com> Mon Jun 27 08:43:45 2022 +0000
tree 51d357db1a06a58270278872a451953662f69912
parent bd19c1bdcbb3537b634a9d6754510692919c6963

Cleanup building the desugared library configurations

* Build both JDK-8 and JDK-11 legacy configurations
* Fix the filtering of the legacy conversions


Make the version check depend on variant

Test: tools/archive.py --dry-run --dry-run-output /tmp/dry

Change-Id: Idf261a5e9516c557c68b5261feda0d88fc28adde

tools/archive.py

diff --git a/tools/archive.py b/tools/archive.py
index d7bf1a9..91affd6 100755
--- a/tools/archive.py
+++ b/tools/archive.py
@@ -161,11 +161,13 @@
     create_maven_release.generate_desugar_configuration_maven_zip(
         utils.DESUGAR_CONFIGURATION_MAVEN_ZIP,
         utils.DESUGAR_CONFIGURATION,
-        utils.DESUGAR_IMPLEMENTATION)
+        utils.DESUGAR_IMPLEMENTATION,
+        utils.LIBRARY_DESUGAR_CONVERSIONS_LEGACY_ZIP)
     create_maven_release.generate_desugar_configuration_maven_zip(
-        utils.DESUGAR_CONFIGURATION_LEGACY_JDK11_MAVEN_ZIP,
+        utils.DESUGAR_CONFIGURATION_JDK11_LEGACY_MAVEN_ZIP,
         utils.DESUGAR_CONFIGURATION_JDK11_LEGACY,
-        utils.DESUGAR_IMPLEMENTATION_JDK11)
+        utils.DESUGAR_IMPLEMENTATION_JDK11,
+        utils.LIBRARY_DESUGAR_CONVERSIONS_LEGACY_ZIP)
 
     version = GetVersion()
     is_main = IsMain(version)
@@ -196,6 +198,8 @@
       utils.MAVEN_ZIP_LIB,
       utils.DESUGAR_CONFIGURATION,
       utils.DESUGAR_CONFIGURATION_MAVEN_ZIP,
+      utils.DESUGAR_CONFIGURATION_JDK11_LEGACY,
+      utils.DESUGAR_CONFIGURATION_JDK11_LEGACY_MAVEN_ZIP,
       utils.GENERATED_LICENSE,
     ]:
       file_name = os.path.basename(file)
@@ -266,6 +270,40 @@
             utils.upload_file_to_cloud_storage(
                 desugar_jdk_libs_configuration_jar, jar_destination)
 
+      # TODO(sgjesse): Refactor this to avoid the duplication of what is above.
+      # Upload desugar_jdk_libs JDK-11 legacyconfiguration to a maven compatible location.
+      if file == utils.DESUGAR_CONFIGURATION_JDK11_LEGACY:
+        jar_basename = 'desugar_jdk_libs_configuration.jar'
+        jar_version_name = 'desugar_jdk_libs_configuration-%s-jdk11-legacy.jar' % version
+        maven_dst = GetUploadDestination(
+            utils.get_maven_path('desugar_jdk_libs_configuration', version),
+                                 jar_version_name, is_main)
+
+        with utils.TempDir() as tmp_dir:
+          desugar_jdk_libs_configuration_jar = os.path.join(tmp_dir,
+                                                            jar_version_name)
+          create_maven_release.generate_jar_with_desugar_configuration(
+              utils.DESUGAR_CONFIGURATION_JDK11_LEGACY,
+              utils.DESUGAR_IMPLEMENTATION_JDK11,
+              utils.LIBRARY_DESUGAR_CONVERSIONS_ZIP,
+              desugar_jdk_libs_configuration_jar)
+
+          if options.dry_run:
+            print('Dry run, not actually creating maven repo for '
+                + 'desugar configuration.')
+            if options.dry_run_output:
+              shutil.copyfile(
+                  desugar_jdk_libs_configuration_jar,
+                  os.path.join(options.dry_run_output, jar_version_name))
+          else:
+            utils.upload_file_to_cloud_storage(
+                desugar_jdk_libs_configuration_jar, maven_dst)
+            print('Maven repo root available at: %s' % GetMavenUrl(is_main))
+            # Also archive the jar as non maven destination for Google3
+            jar_destination = GetUploadDestination(
+                version, jar_basename, is_main)
+            utils.upload_file_to_cloud_storage(
+                desugar_jdk_libs_configuration_jar, jar_destination)
 
 if __name__ == '__main__':
   sys.exit(Main())