6746424: Remove build dependency on findbugs and FINDBUGS_HOME
authorohair
Tue, 09 Sep 2008 15:46:54 -0700
changeset 1196 8004ddea3ea2
parent 1051 90cf935adb35
child 1197 d4350a8e64e9
6746424: Remove build dependency on findbugs and FINDBUGS_HOME Reviewed-by: tbell
corba/make/common/shared/Defs-utils.gmk
corba/make/jprt.config
--- a/corba/make/common/shared/Defs-utils.gmk	Wed Jul 05 16:40:31 2017 +0200
+++ b/corba/make/common/shared/Defs-utils.gmk	Tue Sep 09 15:46:54 2008 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-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
@@ -67,16 +67,6 @@
   UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
 endif
 
-# Utilities ant and findbugs
-ifndef ANT_HOME
-  ANT_HOME = $(JDK_DEVTOOLS_DIR)/share/ant/latest
-endif
-ANT = $(ANT_HOME)/bin/ant
-ifndef FINDBUGS_HOME
-  FINDBUGS_HOME = $(JDK_DEVTOOLS_DIR)/share/findbugs/latest
-endif
-FINDBUGS = $(FINDBUGS_HOME)/bin/findbugs
-
 # Utilities
 ADB            = $(UTILS_COMMAND_PATH)adb
 AR             = $(UTILS_CCS_BIN_PATH)ar
--- a/corba/make/jprt.config	Wed Jul 05 16:40:31 2017 +0200
+++ b/corba/make/jprt.config	Tue Sep 09 15:46:54 2008 -0700
@@ -93,23 +93,13 @@
 jdk_devtools="${slashjava}/devtools"
 share="${jdk_devtools}/share"
 
-# 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
 
 # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
 osname=`uname -s`
@@ -133,7 +123,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}
 
     # Add basic solaris system paths
     path4sdk=${path4sdk}:/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin
@@ -170,7 +160,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}
     
     # Add basic paths
     path4sdk=${path4sdk}:/usr/bin:/bin:/usr/sbin:/sbin
@@ -211,7 +201,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};${unixcommand_path}"
         dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH
 	devtools_path="${jdk_devtools}/win32/bin"
 	path4sdk="${devtools_path};${path4sdk}"
@@ -229,7 +219,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};${unixcommand_path}"
         dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH
         # Find GNU make
         make="${unixcommand_path}/make.exe"