# HG changeset patch # User ohair # Date 1221000529 25200 # Node ID 78c43ef52a0a1919b4691ac13a58ce0c9996261a # Parent 90cf935adb353bb0af4b46fb0677e841fd24c000 6746424: Remove build dependency on findbugs and FINDBUGS_HOME Reviewed-by: tbell diff -r 90cf935adb35 -r 78c43ef52a0a make/Defs-internal.gmk --- a/make/Defs-internal.gmk Wed Jul 05 16:40:31 2017 +0200 +++ b/make/Defs-internal.gmk Tue Sep 09 15:48:49 2008 -0700 @@ -257,8 +257,3 @@ COMMON_BUILD_ARGUMENTS += ANT_HOME="$(ANT_HOME)" endif -ifdef FINDBUGS_HOME - COMMON_BUILD_ARGUMENTS += FINDBUGS_HOME="$(FINDBUGS_HOME)" -endif - - diff -r 90cf935adb35 -r 78c43ef52a0a make/README.pre-components --- a/make/README.pre-components Wed Jul 05 16:40:31 2017 +0200 +++ b/make/README.pre-components Tue Sep 09 15:48:49 2008 -0700 @@ -20,7 +20,6 @@ VARIANT If DBG, debug build, if OPT, optimized build TARGET_CLASS_VERSION The classfile version number (currently 5) ANT_HOME Home of ant to use, if provided - FINDBUGS_HOME Home of findbugs to use, if provided QUIET If defined, be quiet VERBOSE If defined, be verbose JDK_VERSION Version being built diff -r 90cf935adb35 -r 78c43ef52a0a make/jprt.config --- a/make/jprt.config Wed Jul 05 16:40:31 2017 +0200 +++ b/make/jprt.config Tue Sep 09 15:48:49 2008 -0700 @@ -1,7 +1,7 @@ #!echo "This is not a shell script" ############################################################################# # -# Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2006-2008 Sun Microsystems, Inc. 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 @@ -100,20 +100,16 @@ # Needed for langtools, maybe other parts of the build ANT_HOME="${share}/ant/latest" export ANT_HOME -FINDBUGS_HOME="${share}/findbugs/latest" -export FINDBUGS_HOME # The 3 bin directories in common to all platforms sharebin="${share}/bin" antbin="${ANT_HOME}/bin" -findbugsbin="${FINDBUGS_HOME}/bin" # Check input dirMustExist "${bootdir}" ALT_BOOTDIR dirMustExist "${slashjava}" ALT_SLASH_JAVA dirMustExist "${jdk_import}" ALT_JDK_IMPORT_PATH dirMustExist "${ANT_HOME}" ANT_HOME -dirMustExist "${FINDBUGS_HOME}" FINDBUGS_HOME # If ALT_PREVIOUS_RELEASE_IMAGE not defined, set it to the bootdir area for # any possible image comparisons. @@ -152,7 +148,7 @@ ALT_COMPILER_PATH="${compiler_path}" export ALT_COMPILER_PATH dirMustExist "${compiler_path}" ALT_COMPILER_PATH - path4sdk=${compiler_path}:${sharebin}:${antbin}:${findbugsbin} + path4sdk=${compiler_path}:${sharebin}:${antbin} # Add basic solaris system paths path4sdk=${path4sdk}:/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin @@ -189,7 +185,7 @@ ALT_COMPILER_PATH="${compiler_path}" export ALT_COMPILER_PATH dirMustExist "${compiler_path}" ALT_COMPILER_PATH - path4sdk=${compiler_path}:${sharebin}:${antbin}:${findbugsbin} + path4sdk=${compiler_path}:${sharebin}:${antbin} # Add basic paths path4sdk=${path4sdk}:/usr/bin:/bin:/usr/sbin:/sbin @@ -237,7 +233,7 @@ dosname="${mkshome}/mksnt/dosname -s" # Most unix utilities are in the mksnt directory of ROOTDIR unixcommand_path="${mkshome}/mksnt" - path4sdk="${sharebin};${antbin};${findbugsbin};${unixcommand_path}" + path4sdk="${sharebin};${antbin};${unixcommand_path}" dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH devtools_path="${jdk_devtools}/win32/bin" path4sdk="${devtools_path};${path4sdk}" @@ -255,7 +251,7 @@ dosname="/usr/bin/cygpath -a -m -s" # Most unix utilities are in the /usr/bin unixcommand_path="/usr/bin" - path4sdk="${sharebin};${antbin};${findbugsbin};${unixcommand_path}" + path4sdk="${sharebin};${antbin};${unixcommand_path}" dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH # Find GNU make make="${unixcommand_path}/make.exe"