changeset 1948:54575d8783b3 jdk-9+106

8145789: Switch JDK 9 to use Jib in JPRT Reviewed-by: ihse, tbell
author erikj
date Mon, 15 Feb 2016 10:55:36 +0100
parents a2a3930ed7c3
children 53083cbf291b 0a08d245efbc
files make/jprt.properties
diffstat 1 files changed, 59 insertions(+), 52 deletions(-) [+]
line wrap: on
line diff
--- a/make/jprt.properties	Fri Feb 12 11:07:35 2016 +0100
+++ b/make/jprt.properties	Mon Feb 15 10:55:36 2016 +0100
@@ -42,13 +42,63 @@
 
 # Use configure when building
 jprt.build.use.configure=true
+jprt.build.use.jib=true
+jprt.test.use.jib=true
+jprt.jib.launcher=common/bin/jib.sh
 
-# Disable the need for preinstalled Xcode
+# Clear out all the build needs as JIB handles this
+jprt.jdk9.build.needs=
+jprt.macosx.jdk9.build.needs=
+jprt.windows_i586.jdk9.build.needs=
+jprt.windows_x64.jdk9.build.needs=
+jprt.solaris.jdk9.build.needs=
+jprt.linux_i586.jdk9.build.needs=
+jprt.linux_x64.jdk9.build.needs=
+jprt.linux_armv6.jdk9.build.needs=
+jprt.linux_armvh.jdk9.build.needs=
+jprt.linux_arm64.jdk9.build.needs=
+jprt.linux_armsflt.jdk9.build.needs=
+jprt.linux_armvfpsflt.jdk9.build.needs=
+jprt.linux_armvfphflt.jdk9.build.needs=
+jprt.linux_armv6vfphflt.jdk9.build.needs=
+jprt.solaris.client.build.needs=
+jprt.linux.client.build.needs=
+jprt.solaris.jdk9.compiler=
+jprt.linux.jdk9.compiler=
+jprt.jdk9.test.needs=
+
+# Disable the need for preinstalled Visual Studio and Xcode
+jprt.windows.jdk9.compiler=
+jprt.windows.6.2.jdk9.compiler=
+jprt.windows.6.3.jdk9.compiler=
+jprt.windows.jdk9.target.attribute.compilerVS2013.appliesTo.builds=none
 jprt.macosx.jdk9.target.attribute.compilerXcode511.appliesTo.builds=none
 
 # Set up the run flavors (jvm variants)
 jprt.run.flavors=c1,c2,default,${my.additional.run.flavors}
 
+# Setup jib profiles
+jprt.linux_i586.product.build.jib.profile=linux-x86
+jprt.linux_x64.build.jib.profile=linux-x64
+jprt.macosx_x64.build.jib.profile=macosx-x64
+jprt.solaris_sparcv9.build.jib.profile=solaris-sparcv9
+jprt.solaris_x64.build.jib.profile=solaris-x64
+jprt.windows_i586.build.jib.profile=windows-x86
+jprt.windows_x64.build.jib.profile=windows-x64
+
+jprt.linux_i586.fastdebug.build.jib.profile=linux-x86-debug
+jprt.linux_x64.fastdebug.build.jib.profile=linux-x64-debug
+jprt.macosx_x64.fastdebug.build.jib.profile=macosx-x64-debug
+jprt.solaris_sparcv9.fastdebug.build.jib.profile=solaris-sparcv9-debug
+jprt.solaris_x64.fastdebug.build.jib.profile=solaris-x64-debug
+jprt.windows_i586.fastdebug.build.jib.profile=windows-x86-debug
+jprt.windows_x64.fastdebug.build.jib.profile=windows-x64-debug
+
+jprt.solaris_x64.debugOpen.build.jib.profile=solaris-x64-open-debug
+jprt.linux_x64.productOpen.build.jib.profile=linux-x64-open
+
+jprt.test.jib.profile=run-test
+
 # Set make target to use for different build flavors
 jprt.build.flavor.debugOpen.target=jprt_bundle
 jprt.build.flavor.fastdebug.target=jprt_bundle
@@ -58,14 +108,14 @@
 jprt.build.flavor.optimizedOpen.target=jprt_bundle
 
 # Use these configure args to define debug level
-jprt.debug.build.configure.args=--with-debug-level=slowdebug
-jprt.fastdebug.build.configure.args=--with-debug-level=fastdebug --disable-precompiled-headers
-jprt.product.build.configure.args=--with-debug-level=release
+jprt.debug.build.configure.args=
+jprt.fastdebug.build.configure.args=--disable-precompiled-headers
+jprt.product.build.configure.args=
 jprt.optimized.build.configure.args=--with-debug-level=optimized
-jprt.debugOpen.build.configure.args=${jprt.debug.build.configure.args} --enable-openjdk-only
-jprt.fastdebugOpen.build.configure.args=${jprt.fastdebug.build.configure.args} --enable-openjdk-only
-jprt.productOpen.build.configure.args=${jprt.product.build.configure.args} --enable-openjdk-only
-jprt.optimizedOpen.build.configure.args=${jprt.product.build.configure.args} --enable-openjdk-only
+jprt.debugOpen.build.configure.args=${jprt.debug.build.configure.args}
+jprt.fastdebugOpen.build.configure.args=${jprt.fastdebug.build.configure.args}
+jprt.productOpen.build.configure.args=${jprt.product.build.configure.args}
+jprt.optimizedOpen.build.configure.args=${jprt.product.build.configure.args}
 
 
 # hotspot testset has custom build flavors and build targets
@@ -100,54 +150,11 @@
 # Also allows for additional, testset specific configure arguments to be set
 jprt.build.configure.args=						\
     --with-output-sync=recurse						\
-    --with-boot-jdk=$ALT_BOOTDIR					\
     --with-jobs=$ALT_PARALLEL_COMPILE_JOBS				\
-    --with-version-opt=$JPRT_JOB_ID					\
-    MAKE=$JPRT_MAKE                                                     \
+    --with-version-opt=$JPRT_JOB_ID				 	\
     ${my.additional.build.configure.args.${jprt.test.set}}		\
     ${my.custom.build.configure.args}
 
-# i586 is often cross-compiled from 64-bit machines, so need to set target bits explicitly
-jprt.i586.build.configure.args=						\
-    --with-target-bits=32
-
-# i586 platforms have both client and server, but to allow for overriding the exact configuration
-# on a per-build flavor basis the value is set for the individual build flavors
-my.i586.default.build.configure.args=					\
-    --with-jvm-variants=client,server
-jprt.i586.debug.build.configure.args=					\
-    ${my.i586.default.build.configure.args}				\
-    ${jprt.debug.build.configure.args}
-jprt.i586.fastdebug.build.configure.args=				\
-    ${my.i586.default.build.configure.args}				\
-    ${jprt.fastdebug.build.configure.args}
-jprt.i586.product.build.configure.args=					\
-    ${my.i586.default.build.configure.args}				\
-    ${jprt.product.build.configure.args}
-jprt.i586.debugOpen.build.configure.args=				\
-    ${my.i586.default.build.configure.args}				\
-    ${jprt.debugOpen.build.configure.args}
-jprt.i586.fastdebugOpen.build.configure.args=				\
-    ${my.i586.default.build.configure.args}				\
-    ${jprt.fastdebugOpen.build.configure.args}
-jprt.i586.productOpen.build.configure.args=				\
-    ${my.i586.default.build.configure.args}				\
-    ${jprt.productOpen.build.configure.args}
-jprt.linux_i586.build.configure.args=					\
-    --with-devkit=$GCC492_OEL64_HOME					\
-    ${jprt.i586.build.configure.args}
-jprt.linux_x64.build.configure.args=					\
-    --with-devkit=$GCC492_OEL64_HOME
-jprt.macosx_x64.build.configure.args=					\
-    --with-devkit=$XCODE63_MACOSX109_HOME
-jprt.solaris.build.configure.args=					\
-    --with-devkit=$SS124_11u1_HOME
-jprt.windows_i586.build.configure.args=					\
-    --with-devkit=$VS2013SP4_HOME					\
-    ${jprt.i586.build.configure.args}
-jprt.windows_x64.build.configure.args=					\
-    --with-devkit=$VS2013SP4_HOME
-
 ########
 #
 # Build targets and options (default/jdk)