< prev index next >

make/conf/jib-profiles.js

Print this page

        

*** 56,67 **** --- 56,69 ---- * * input.profile * input.build_id * input.target_os * input.target_cpu + * input.target_libc * input.build_os * input.build_cpu + * input.build_libc * input.target_platform * input.build_platform * // The build_osenv_* variables describe the unix layer on Windows systems, * // i.e. Cygwin, which may also be 32 or 64 bit. * input.build_osenv
*** 98,114 **** * <profile-name>: { * // Name of os the profile is built to run on * target_os; <string> * // Name of cpu the profile is built to run on * target_cpu; <string> ! * // Combination of target_os and target_cpu for convenience * target_platform; <string> * // Name of os the profile is built on * build_os; <string> * // Name of cpu the profile is built on * build_cpu; <string> ! * // Combination of build_os and build_cpu for convenience * build_platform; <string> * * // List of dependencies needed to build this profile * dependencies: <Array of strings> * --- 100,120 ---- * <profile-name>: { * // Name of os the profile is built to run on * target_os; <string> * // Name of cpu the profile is built to run on * target_cpu; <string> ! * // Optional libc string if non standard ! * target_libc; <string> ! * // Optional combination of target_os and target_cpu for convenience * target_platform; <string> * // Name of os the profile is built on * build_os; <string> * // Name of cpu the profile is built on * build_cpu; <string> ! * // Optional libc string if non standard ! * build_libc; <string> ! * // Optional combination of build_os and build_cpu for convenience * build_platform; <string> * * // List of dependencies needed to build this profile * dependencies: <Array of strings> *
*** 190,200 **** // 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 = ""; ! data.product = "jdk"; data.version = getVersion(); // The base directory for the build output. JIB will assume that the // actual build directory will be <output_basedir>/<configuration> data.output_basedir = "build"; --- 196,206 ---- // 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 = ""; ! data.product = "jdk-portola"; data.version = getVersion(); // The base directory for the build output. JIB will assume that the // actual build directory will be <output_basedir>/<configuration> data.output_basedir = "build";
*** 237,247 **** common.build_id = getBuildId(input); common.build_number = input.build_number != null ? input.build_number : "0"; // List of the main profile names used for iteration common.main_profile_names = [ ! "linux-x64", "linux-x86", "macosx-x64", "solaris-x64", "solaris-sparcv9", "windows-x64", "windows-x86", "linux-aarch64", "linux-arm32", "linux-ppc64le", "linux-s390x" ]; // These are the base setttings for all the main build profiles. --- 243,253 ---- common.build_id = getBuildId(input); common.build_number = input.build_number != null ? input.build_number : "0"; // List of the main profile names used for iteration common.main_profile_names = [ ! "linux-x64", "linux-x64-musl", "linux-x86", "macosx-x64", "solaris-x64", "solaris-sparcv9", "windows-x64", "windows-x86", "linux-aarch64", "linux-arm32", "linux-ppc64le", "linux-s390x" ]; // These are the base setttings for all the main build profiles.
*** 394,403 **** --- 400,417 ---- (isWsl(input) ? [ "--host=x86_64-unknown-linux-gnu", "--build=x86_64-unknown-linux-gnu" ] : [])), default_make_targets: ["docs-bundles"], }, + "linux-x64-musl": { + target_os: "linux", + target_cpu: "x64", + target_libc: "musl", + configure_args: concat(common.configure_args_64bit, + "--with-zlib=system"), + }, + "linux-x86": { target_os: "linux", target_cpu: "x86", build_cpu: "x64", dependencies: ["devkit"],
*** 630,639 **** --- 644,657 ---- // tar.gz. var artifactData = { "linux-x64": { platform: "linux-x64", }, + "linux-x64-musl": { + platform: "linux-x64-musl", + demo_ext: "tar.gz" + }, "linux-x86": { platform: "linux-x86", }, "macosx-x64": { platform: "osx-x64",
*** 964,974 **** && input.build_platform != devkit_platform) { devkit_cross_prefix = input.build_platform + "-to-"; } var boot_jdk_platform = (input.build_os == "macosx" ? "osx" : input.build_os) ! + "-" + input.build_cpu; var boot_jdk_ext = (input.build_os == "windows" ? ".zip" : ".tar.gz") // If running in WSL and building for Windows, it will look like Linux, // but we need a Windows boot JDK. if (isWsl(input) && input.target_os == "windows") { boot_jdk_platform = "windows-" + input.build_cpu; --- 982,993 ---- && input.build_platform != devkit_platform) { devkit_cross_prefix = input.build_platform + "-to-"; } var boot_jdk_platform = (input.build_os == "macosx" ? "osx" : input.build_os) ! + "-" + input.build_cpu + ! (input.build_libc ? "-" + input.build_libc : ""); var boot_jdk_ext = (input.build_os == "windows" ? ".zip" : ".tar.gz") // If running in WSL and building for Windows, it will look like Linux, // but we need a Windows boot JDK. if (isWsl(input) && input.target_os == "windows") { boot_jdk_platform = "windows-" + input.build_cpu;
*** 981,991 **** var dependencies = { boot_jdk: { server: "jpg", ! product: "jdk", version: common.boot_jdk_version, build_number: common.boot_jdk_build_number, file: "bundles/" + boot_jdk_platform + "/jdk-" + common.boot_jdk_version + "_" + boot_jdk_platform + "_bin" + boot_jdk_ext, configure_args: "--with-boot-jdk=" + common.boot_jdk_home, --- 1000,1010 ---- var dependencies = { boot_jdk: { server: "jpg", ! product: input.build_libc == "musl" ? "jdk-portola" : "jdk", version: common.boot_jdk_version, build_number: common.boot_jdk_build_number, file: "bundles/" + boot_jdk_platform + "/jdk-" + common.boot_jdk_version + "_" + boot_jdk_platform + "_bin" + boot_jdk_ext, configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
< prev index next >