Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/make/common/shared/Defs-utils.gmk	Thu Aug 14 22:14:08 2008 -0700
     1.2 +++ b/make/common/shared/Defs-utils.gmk	Tue Sep 09 15:46:54 2008 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
     1.6 +# Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -67,16 +67,6 @@
    1.11    UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
    1.12  endif
    1.13  
    1.14 -# Utilities ant and findbugs
    1.15 -ifndef ANT_HOME
    1.16 -  ANT_HOME = $(JDK_DEVTOOLS_DIR)/share/ant/latest
    1.17 -endif
    1.18 -ANT = $(ANT_HOME)/bin/ant
    1.19 -ifndef FINDBUGS_HOME
    1.20 -  FINDBUGS_HOME = $(JDK_DEVTOOLS_DIR)/share/findbugs/latest
    1.21 -endif
    1.22 -FINDBUGS = $(FINDBUGS_HOME)/bin/findbugs
    1.23 -
    1.24  # Utilities
    1.25  ADB            = $(UTILS_COMMAND_PATH)adb
    1.26  AR             = $(UTILS_CCS_BIN_PATH)ar

     2.1 --- a/make/jprt.config	Thu Aug 14 22:14:08 2008 -0700
     2.2 +++ b/make/jprt.config	Tue Sep 09 15:46:54 2008 -0700
     2.3 @@ -93,23 +93,13 @@
     2.4  jdk_devtools="${slashjava}/devtools"
     2.5  share="${jdk_devtools}/share"
     2.6  
     2.7 -# Needed for langtools, maybe other parts of the build
     2.8 -ANT_HOME="${share}/ant/latest"
     2.9 -export ANT_HOME
    2.10 -FINDBUGS_HOME="${share}/findbugs/latest"
    2.11 -export FINDBUGS_HOME
    2.12 -
    2.13  # The 3 bin directories in common to all platforms
    2.14  sharebin="${share}/bin"
    2.15 -antbin="${ANT_HOME}/bin"
    2.16 -findbugsbin="${FINDBUGS_HOME}/bin"
    2.17  
    2.18  # Check input
    2.19  dirMustExist "${bootdir}"         ALT_BOOTDIR
    2.20  dirMustExist "${slashjava}"       ALT_SLASH_JAVA
    2.21  dirMustExist "${jdk_import}"      ALT_JDK_IMPORT_PATH
    2.22 -dirMustExist "${ANT_HOME}"        ANT_HOME
    2.23 -dirMustExist "${FINDBUGS_HOME}"   FINDBUGS_HOME
    2.24  
    2.25  # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
    2.26  osname=`uname -s`
    2.27 @@ -133,7 +123,7 @@
    2.28      ALT_COMPILER_PATH="${compiler_path}"
    2.29      export ALT_COMPILER_PATH
    2.30      dirMustExist "${compiler_path}" ALT_COMPILER_PATH
    2.31 -    path4sdk=${compiler_path}:${sharebin}:${antbin}:${findbugsbin}
    2.32 +    path4sdk=${compiler_path}:${sharebin}
    2.33  
    2.34      # Add basic solaris system paths
    2.35      path4sdk=${path4sdk}:/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin
    2.36 @@ -170,7 +160,7 @@
    2.37      ALT_COMPILER_PATH="${compiler_path}"
    2.38      export ALT_COMPILER_PATH
    2.39      dirMustExist "${compiler_path}" ALT_COMPILER_PATH
    2.40 -    path4sdk=${compiler_path}:${sharebin}:${antbin}:${findbugsbin}
    2.41 +    path4sdk=${compiler_path}:${sharebin}
    2.42      
    2.43      # Add basic paths
    2.44      path4sdk=${path4sdk}:/usr/bin:/bin:/usr/sbin:/sbin
    2.45 @@ -211,7 +201,7 @@
    2.46  	dosname="${mkshome}/mksnt/dosname -s"
    2.47          # Most unix utilities are in the mksnt directory of ROOTDIR
    2.48          unixcommand_path="${mkshome}/mksnt"
    2.49 -        path4sdk="${sharebin};${antbin};${findbugsbin};${unixcommand_path}"
    2.50 +        path4sdk="${sharebin};${unixcommand_path}"
    2.51          dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH
    2.52  	devtools_path="${jdk_devtools}/win32/bin"
    2.53  	path4sdk="${devtools_path};${path4sdk}"
    2.54 @@ -229,7 +219,7 @@
    2.55  	dosname="/usr/bin/cygpath -a -m -s"
    2.56          # Most unix utilities are in the /usr/bin
    2.57          unixcommand_path="/usr/bin"
    2.58 -        path4sdk="${sharebin};${antbin};${findbugsbin};${unixcommand_path}"
    2.59 +        path4sdk="${sharebin};${unixcommand_path}"
    2.60          dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH
    2.61          # Find GNU make
    2.62          make="${unixcommand_path}/make.exe"