< prev index next >

common/conf/jib-profiles.js

Print this page

        

*** 222,231 **** --- 222,248 ---- common.configure_args_32bit = ["--with-target-bits=32"], common.configure_args_debug = ["--enable-debug"], common.configure_args_slowdebug = ["--with-debug-level=slowdebug"], common.organization = "jpg.infra.builddeps" + var boot_jdk_revision = "8"; + var boot_jdk_subdirpart = "1.8.0"; + // JDK 8 does not work on sparc M7 cpus, need a newer update when building + // on such hardware. + if (input.build_cpu == "sparcv9") { + var cpu_brand = $EXEC("bash -c \"kstat -m cpu_info | grep brand | head -n1 | awk '{ print \$2 }'\""); + if (cpu_brand.trim() == 'SPARC-M7') { + boot_jdk_revision = "8u20"; + boot_jdk_subdirpart = "1.8.0_20"; + } + } + common.boot_jdk_revision = boot_jdk_revision; + common.boot_jdk_subdirpart = boot_jdk_subdirpart; + common.boot_jdk_home = input.get("boot_jdk", "home_path") + "/jdk" + + common.boot_jdk_subdirpart + + (input.build_os == "macosx" ? ".jdk/Contents/Home" : ""); + return common; }; /** * Generates the profiles part of the configuration.
*** 331,342 **** var testOnlyProfiles = { "run-test": { target_os: input.build_os, target_cpu: input.build_cpu, ! dependencies: [ "jtreg", "gnumake" ], ! labels: "test" } }; profiles = concatObjects(profiles, testOnlyProfiles); // Generate the missing platform attributes --- 348,362 ---- var testOnlyProfiles = { "run-test": { target_os: input.build_os, target_cpu: input.build_cpu, ! dependencies: [ "jtreg", "gnumake", "boot_jdk" ], ! labels: "test", ! environment: { ! "JT_JAVA": common.boot_jdk_home ! } } }; profiles = concatObjects(profiles, testOnlyProfiles); // Generate the missing platform attributes
*** 355,376 **** var getJibProfilesDependencies = function (input, common) { var boot_jdk_platform = input.build_os + "-" + (input.build_cpu == "x86" ? "i586" : input.build_cpu); - var boot_jdk_revision = "8"; - var boot_jdk_subdirpart = "1.8.0"; - // JDK 8 does not work on sparc M7 cpus, need a newer update when building - // on such hardware. - if (input.build_cpu == "sparcv9") { - var cpu_brand = $EXEC("bash -c \"kstat -m cpu_info | grep brand | head -n1 | awk '{ print \$2 }'\""); - if (cpu_brand.trim() == 'SPARC-M7') { - boot_jdk_revision = "8u20"; - boot_jdk_subdirpart = "1.8.0_20"; - } - } - var devkit_platform_revisions = { linux_x64: "gcc4.9.2-OEL6.4+1.0", macosx_x64: "Xcode6.3-MacOSX10.9+1.0", solaris_x64: "SS12u4-Solaris11u1+1.0", solaris_sparcv9: "SS12u4-Solaris11u1+1.0", --- 375,384 ----
*** 384,399 **** var dependencies = { boot_jdk: { server: "javare", module: "jdk", ! revision: boot_jdk_revision, checksum_file: boot_jdk_platform + "/MD5_VALUES", ! file: boot_jdk_platform + "/jdk-" + boot_jdk_revision + "-" + boot_jdk_platform + ".tar.gz", ! configure_args: (input.build_os == "macosx" ! ? "--with-boot-jdk=" + input.get("boot_jdk", "install_path") + "/jdk" + boot_jdk_subdirpart + ".jdk/Contents/Home" ! : "--with-boot-jdk=" + input.get("boot_jdk", "install_path") + "/jdk" + boot_jdk_subdirpart) }, devkit: { organization: common.organization, ext: "tar.gz", --- 392,407 ---- var dependencies = { boot_jdk: { server: "javare", module: "jdk", ! revision: common.boot_jdk_revision, checksum_file: boot_jdk_platform + "/MD5_VALUES", ! file: boot_jdk_platform + "/jdk-" + common.boot_jdk_revision ! + "-" + boot_jdk_platform + ".tar.gz", ! configure_args: "--with-boot-jdk=" + common.boot_jdk_home, ! environment_path: common.boot_jdk_home }, devkit: { organization: common.organization, ext: "tar.gz",
*** 418,428 **** server: "javare", revision: "4.2", build_number: "b03", checksum_file: "MD5_VALUES", file: "jtreg_bin-4.2.zip", ! environment_name: "JT_HOME" }, gnumake: { organization: common.organization, ext: "tar.gz", --- 426,437 ---- server: "javare", revision: "4.2", build_number: "b03", checksum_file: "MD5_VALUES", file: "jtreg_bin-4.2.zip", ! environment_name: "JT_HOME", ! environment_path: input.get("jtreg", "install_path") + "/jtreg/bin" }, gnumake: { organization: common.organization, ext: "tar.gz",
< prev index next >