# HG changeset patch
# User erikj
# Date 1549389213 28800
# Node ID 2336cd378e7fddcb2b8b8a29039a8a0bcf972541
# Parent  c572eb605087e9d694a55b6f7913edf49d3e83ad
8218177: Bump jib format_version to support new devkit archive layout
Reviewed-by: ihse, tbell

diff -r c572eb605087 -r 2336cd378e7f make/conf/jib-profiles.js
--- a/make/conf/jib-profiles.js	Tue Feb 05 10:40:25 2019 -0500
+++ b/make/conf/jib-profiles.js	Tue Feb 05 09:53:33 2019 -0800
@@ -76,6 +76,7 @@
  * install_path
  * download_path
  * download_dir
+ * home_path
  *
  *
  * The output data generated by this configuration file has the following
@@ -185,7 +186,9 @@
     // Identifies the version of this format to the tool reading it.
     // 1.1 signifies that the publish, publish-src and get-src features are usable.
     // 1.2 signifies that artifact uploads should fail on missing artifacts by default.
-    data.format_version = "1.2";
+    // 1.3 input.get(<dep>, "home_path") automatically goes down into a single top
+    //     dir just like default configure_args and environment_path variables.
+    data.format_version = "1.3";
 
     // Organization, product and version are used when uploading/publishing build results
     data.organization = "";
@@ -363,7 +366,7 @@
     };
 
     common.boot_jdk_version = "11";
-    common.boot_jdk_home = input.get("boot_jdk", "home_path") + "/jdk-"
+    common.boot_jdk_home = input.get("boot_jdk", "install_path") + "/jdk-"
         + common.boot_jdk_version
         + (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");
 
@@ -486,7 +489,7 @@
     var testmakeBase = {
         dependencies: [ "ant" ],
         environment: {
-            "ANT_HOME": input.get("ant", "install_path") + "/apache-ant-1.7.1"
+            "ANT_HOME": input.get("ant", "home_path")
         }
     };
     [ "linux-x64", "macosx-x64", "solaris-sparcv9", "solaris-x64", "windows-x64"]
@@ -861,7 +864,7 @@
 var getJibProfilesDependencies = function (input, common) {
 
     var devkit_platform_revisions = {
-        linux_x64: "gcc7.3.0-OEL6.4+1.1",
+        linux_x64: "gcc7.3.0-OEL6.4+1.2",
         macosx_x64: "Xcode9.4-MacOSX10.13+1.0",
         solaris_x64: "SS12u4-Solaris11u1+1.0",
         solaris_sparcv9: "SS12u6-Solaris11u3+1.0",
@@ -1003,8 +1006,7 @@
             classifier: "distribution",
             revision: "3.0-SNAPSHOT",
             environment_name: "JIB_HOME",
-            environment_value: input.get("jib", "install_path")
-                + "/jib-3.0-SNAPSHOT-distribution"
+            environment_value: input.get("jib", "home_path")
         },
 
         ant: {