< prev index next >

make/conf/jib-profiles.js

Print this page

        

*** 1,7 **** /* ! * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this --- 1,7 ---- /* ! * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this
*** 198,208 **** data.configuration_configure_arg = "--with-conf-name="; // The make argument to use to specify the name of the configuration data.configuration_make_arg = "CONF_NAME="; // Exclude list to use when Jib creates a source bundle ! data.src_bundle_excludes = "./build webrev* */webrev* */*/webrev* */*/*/webrev* .hg */.hg */*/.hg */*/*/.hg"; // Include list to use when creating a minimal jib source bundle which // contains just the jib configuration files. data.conf_bundle_includes = "*/conf/jib-profiles.* make/autoconf/version-numbers" // Define some common values --- 198,208 ---- data.configuration_configure_arg = "--with-conf-name="; // The make argument to use to specify the name of the configuration data.configuration_make_arg = "CONF_NAME="; // Exclude list to use when Jib creates a source bundle ! data.src_bundle_excludes = "./build .build webrev* */webrev* */*/webrev* */*/*/webrev* .hg */.hg */*/.hg */*/*/.hg"; // Include list to use when creating a minimal jib source bundle which // contains just the jib configuration files. data.conf_bundle_includes = "*/conf/jib-profiles.* make/autoconf/version-numbers" // Define some common values
*** 409,477 **** var profiles = { "linux-x64": { target_os: "linux", target_cpu: "x64", ! dependencies: ["devkit", "graphviz", "pandoc"], configure_args: concat(common.configure_args_64bit, "--enable-full-docs", "--with-zlib=system"), default_make_targets: ["docs-bundles"], }, "linux-x86": { target_os: "linux", target_cpu: "x86", build_cpu: "x64", ! dependencies: ["devkit"], configure_args: concat(common.configure_args_32bit, "--with-jvm-variants=minimal,server", "--with-zlib=system"), }, "macosx-x64": { target_os: "macosx", target_cpu: "x64", ! dependencies: ["devkit", "freetype"], configure_args: concat(common.configure_args_64bit, "--with-zlib=system", "--with-macosx-version-max=10.7.0"), }, "solaris-x64": { target_os: "solaris", target_cpu: "x64", ! dependencies: ["devkit", "cups"], configure_args: concat(common.configure_args_64bit, "--with-zlib=system", "--enable-dtrace"), }, "solaris-sparcv9": { target_os: "solaris", target_cpu: "sparcv9", ! dependencies: ["devkit", "cups"], configure_args: concat(common.configure_args_64bit, "--with-zlib=system", "--enable-dtrace"), }, "windows-x64": { target_os: "windows", target_cpu: "x64", ! dependencies: ["devkit", "freetype"], configure_args: concat(common.configure_args_64bit), }, "windows-x86": { target_os: "windows", target_cpu: "x86", build_cpu: "x64", ! dependencies: ["devkit", "freetype"], configure_args: concat(common.configure_args_32bit), }, "linux-arm64": { target_os: "linux", target_cpu: "aarch64", build_cpu: "x64", ! dependencies: ["devkit", "build_devkit", "cups", "headless_stubs"], configure_args: [ "--with-cpu-port=arm64", "--with-jvm-variants=server", "--openjdk-target=aarch64-linux-gnu", "--enable-headless-only" --- 409,477 ---- var profiles = { "linux-x64": { target_os: "linux", target_cpu: "x64", ! dependencies: ["devkit", "autoconf", "graphviz", "pandoc"], configure_args: concat(common.configure_args_64bit, "--enable-full-docs", "--with-zlib=system"), default_make_targets: ["docs-bundles"], }, "linux-x86": { target_os: "linux", target_cpu: "x86", build_cpu: "x64", ! dependencies: ["devkit", "autoconf"], configure_args: concat(common.configure_args_32bit, "--with-jvm-variants=minimal,server", "--with-zlib=system"), }, "macosx-x64": { target_os: "macosx", target_cpu: "x64", ! dependencies: ["devkit", "autoconf", "freetype"], configure_args: concat(common.configure_args_64bit, "--with-zlib=system", "--with-macosx-version-max=10.7.0"), }, "solaris-x64": { target_os: "solaris", target_cpu: "x64", ! dependencies: ["devkit", "autoconf", "cups"], configure_args: concat(common.configure_args_64bit, "--with-zlib=system", "--enable-dtrace"), }, "solaris-sparcv9": { target_os: "solaris", target_cpu: "sparcv9", ! dependencies: ["devkit", "autoconf", "cups"], configure_args: concat(common.configure_args_64bit, "--with-zlib=system", "--enable-dtrace"), }, "windows-x64": { target_os: "windows", target_cpu: "x64", ! dependencies: ["devkit", "autoconf", "freetype"], configure_args: concat(common.configure_args_64bit), }, "windows-x86": { target_os: "windows", target_cpu: "x86", build_cpu: "x64", ! dependencies: ["devkit", "autoconf", "freetype"], configure_args: concat(common.configure_args_32bit), }, "linux-arm64": { target_os: "linux", target_cpu: "aarch64", build_cpu: "x64", ! dependencies: ["devkit", "autoconf", "build_devkit", "cups", "headless_stubs"], configure_args: [ "--with-cpu-port=arm64", "--with-jvm-variants=server", "--openjdk-target=aarch64-linux-gnu", "--enable-headless-only"
*** 480,490 **** "linux-arm-vfp-hflt": { target_os: "linux", target_cpu: "arm", build_cpu: "x64", ! dependencies: ["devkit", "build_devkit", "cups"], configure_args: [ "--with-jvm-variants=minimal1,client", "--with-x=" + input.get("devkit", "install_path") + "/arm-linux-gnueabihf/libc/usr/X11R6-PI", "--openjdk-target=arm-linux-gnueabihf", "--with-abi-profile=arm-vfp-hflt" --- 480,490 ---- "linux-arm-vfp-hflt": { target_os: "linux", target_cpu: "arm", build_cpu: "x64", ! dependencies: ["devkit", "autoconf", "build_devkit", "cups"], configure_args: [ "--with-jvm-variants=minimal1,client", "--with-x=" + input.get("devkit", "install_path") + "/arm-linux-gnueabihf/libc/usr/X11R6-PI", "--openjdk-target=arm-linux-gnueabihf", "--with-abi-profile=arm-vfp-hflt"
*** 852,861 **** --- 852,872 ---- }, environment_path: makeBinDir }, + autoconf: { + organization: common.organization, + ext: "tar.gz", + revision: "2.69+1.0.1", + module: (input.build_os == "windows" + ? "autoconf-" + input.build_osenv_platform + : "autoconf-" + input.build_platform), + configure_args: "", + environment_path: input.get("autoconf", "install_path") + }, + freetype: { organization: common.organization, ext: "tar.gz", revision: freetype_version, module: "freetype-" + input.target_platform
*** 876,885 **** --- 887,897 ---- revision: "1.17.2+1.0", module: "pandoc-" + input.target_platform, configure_args: "PANDOC=" + input.get("pandoc", "install_path") + "/pandoc/pandoc", environment_path: input.get("pandoc", "install_path") + "/pandoc" }, + // This adds java jib as a dependency for the test artifacts resolver jib: { organization: "com.oracle.java.jib", ext: "zip", classifier: "distribution",
< prev index next >