equal
deleted
inserted
replaced
399 common.boot_jdk_revision = boot_jdk_revision; |
399 common.boot_jdk_revision = boot_jdk_revision; |
400 common.boot_jdk_subdirpart = boot_jdk_subdirpart; |
400 common.boot_jdk_subdirpart = boot_jdk_subdirpart; |
401 common.boot_jdk_home = input.get("boot_jdk", "home_path") + "/jdk" |
401 common.boot_jdk_home = input.get("boot_jdk", "home_path") + "/jdk" |
402 + common.boot_jdk_subdirpart |
402 + common.boot_jdk_subdirpart |
403 + (input.build_os == "macosx" ? ".jdk/Contents/Home" : ""); |
403 + (input.build_os == "macosx" ? ".jdk/Contents/Home" : ""); |
|
404 common.boot_jdk_platform = input.build_os + "-" |
|
405 + (input.build_cpu == "x86" ? "i586" : input.build_cpu); |
404 |
406 |
405 return common; |
407 return common; |
406 }; |
408 }; |
407 |
409 |
408 /** |
410 /** |
830 * @param common The common values |
832 * @param common The common values |
831 * @returns {{}} Dependencies part of configuration |
833 * @returns {{}} Dependencies part of configuration |
832 */ |
834 */ |
833 var getJibProfilesDependencies = function (input, common) { |
835 var getJibProfilesDependencies = function (input, common) { |
834 |
836 |
835 var boot_jdk_platform = input.build_os + "-" |
|
836 + (input.build_cpu == "x86" ? "i586" : input.build_cpu); |
|
837 |
|
838 var devkit_platform_revisions = { |
837 var devkit_platform_revisions = { |
839 linux_x64: "gcc4.9.2-OEL6.4+1.1", |
838 linux_x64: "gcc4.9.2-OEL6.4+1.1", |
840 macosx_x64: "Xcode6.3-MacOSX10.9+1.0", |
839 macosx_x64: "Xcode6.3-MacOSX10.9+1.0", |
841 solaris_x64: "SS12u4-Solaris11u1+1.0", |
840 solaris_x64: "SS12u4-Solaris11u1+1.0", |
842 solaris_sparcv9: "SS12u4-Solaris11u1+1.0", |
841 solaris_sparcv9: "SS12u4-Solaris11u1+1.0", |
851 |
850 |
852 boot_jdk: { |
851 boot_jdk: { |
853 server: "javare", |
852 server: "javare", |
854 module: "jdk", |
853 module: "jdk", |
855 revision: common.boot_jdk_revision, |
854 revision: common.boot_jdk_revision, |
856 checksum_file: boot_jdk_platform + "/MD5_VALUES", |
855 checksum_file: common.boot_jdk_platform + "/MD5_VALUES", |
857 file: boot_jdk_platform + "/jdk-" + common.boot_jdk_revision |
856 file: common.boot_jdk_platform + "/jdk-" + common.boot_jdk_revision |
858 + "-" + boot_jdk_platform + ".tar.gz", |
857 + "-" + common.boot_jdk_platform + ".tar.gz", |
859 configure_args: "--with-boot-jdk=" + common.boot_jdk_home, |
858 configure_args: "--with-boot-jdk=" + common.boot_jdk_home, |
860 environment_path: common.boot_jdk_home + "/bin" |
859 environment_path: common.boot_jdk_home + "/bin" |
861 }, |
860 }, |
862 |
861 |
863 devkit: { |
862 devkit: { |