corba/make/jprt.config
changeset 1196 8004ddea3ea2
parent 928 455092274fd1
child 2192 7e916cf3102a
equal deleted inserted replaced
1051:90cf935adb35 1196:8004ddea3ea2
    91 
    91 
    92 # The /java/devtools items
    92 # The /java/devtools items
    93 jdk_devtools="${slashjava}/devtools"
    93 jdk_devtools="${slashjava}/devtools"
    94 share="${jdk_devtools}/share"
    94 share="${jdk_devtools}/share"
    95 
    95 
    96 # Needed for langtools, maybe other parts of the build
       
    97 ANT_HOME="${share}/ant/latest"
       
    98 export ANT_HOME
       
    99 FINDBUGS_HOME="${share}/findbugs/latest"
       
   100 export FINDBUGS_HOME
       
   101 
       
   102 # The 3 bin directories in common to all platforms
    96 # The 3 bin directories in common to all platforms
   103 sharebin="${share}/bin"
    97 sharebin="${share}/bin"
   104 antbin="${ANT_HOME}/bin"
       
   105 findbugsbin="${FINDBUGS_HOME}/bin"
       
   106 
    98 
   107 # Check input
    99 # Check input
   108 dirMustExist "${bootdir}"         ALT_BOOTDIR
   100 dirMustExist "${bootdir}"         ALT_BOOTDIR
   109 dirMustExist "${slashjava}"       ALT_SLASH_JAVA
   101 dirMustExist "${slashjava}"       ALT_SLASH_JAVA
   110 dirMustExist "${jdk_import}"      ALT_JDK_IMPORT_PATH
   102 dirMustExist "${jdk_import}"      ALT_JDK_IMPORT_PATH
   111 dirMustExist "${ANT_HOME}"        ANT_HOME
       
   112 dirMustExist "${FINDBUGS_HOME}"   FINDBUGS_HOME
       
   113 
   103 
   114 # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
   104 # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
   115 osname=`uname -s`
   105 osname=`uname -s`
   116 if [ "${osname}" = SunOS ] ; then
   106 if [ "${osname}" = SunOS ] ; then
   117    
   107    
   131     fi
   121     fi
   132     compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin
   122     compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin
   133     ALT_COMPILER_PATH="${compiler_path}"
   123     ALT_COMPILER_PATH="${compiler_path}"
   134     export ALT_COMPILER_PATH
   124     export ALT_COMPILER_PATH
   135     dirMustExist "${compiler_path}" ALT_COMPILER_PATH
   125     dirMustExist "${compiler_path}" ALT_COMPILER_PATH
   136     path4sdk=${compiler_path}:${sharebin}:${antbin}:${findbugsbin}
   126     path4sdk=${compiler_path}:${sharebin}
   137 
   127 
   138     # Add basic solaris system paths
   128     # Add basic solaris system paths
   139     path4sdk=${path4sdk}:/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin
   129     path4sdk=${path4sdk}:/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin
   140 
   130 
   141     # Get the previous JDK to be used to bootstrap the build
   131     # Get the previous JDK to be used to bootstrap the build
   168     compiler_path=/usr/bin
   158     compiler_path=/usr/bin
   169     compiler_name=usr_bin
   159     compiler_name=usr_bin
   170     ALT_COMPILER_PATH="${compiler_path}"
   160     ALT_COMPILER_PATH="${compiler_path}"
   171     export ALT_COMPILER_PATH
   161     export ALT_COMPILER_PATH
   172     dirMustExist "${compiler_path}" ALT_COMPILER_PATH
   162     dirMustExist "${compiler_path}" ALT_COMPILER_PATH
   173     path4sdk=${compiler_path}:${sharebin}:${antbin}:${findbugsbin}
   163     path4sdk=${compiler_path}:${sharebin}
   174     
   164     
   175     # Add basic paths
   165     # Add basic paths
   176     path4sdk=${path4sdk}:/usr/bin:/bin:/usr/sbin:/sbin
   166     path4sdk=${path4sdk}:/usr/bin:/bin:/usr/sbin:/sbin
   177 
   167 
   178     # Get the previous JDK to be used to bootstrap the build
   168     # Get the previous JDK to be used to bootstrap the build
   209         mkshome=`dosname -s "${ROOTDIR}"`
   199         mkshome=`dosname -s "${ROOTDIR}"`
   210 	# Utility to convert to short pathnames without spaces
   200 	# Utility to convert to short pathnames without spaces
   211 	dosname="${mkshome}/mksnt/dosname -s"
   201 	dosname="${mkshome}/mksnt/dosname -s"
   212         # Most unix utilities are in the mksnt directory of ROOTDIR
   202         # Most unix utilities are in the mksnt directory of ROOTDIR
   213         unixcommand_path="${mkshome}/mksnt"
   203         unixcommand_path="${mkshome}/mksnt"
   214         path4sdk="${sharebin};${antbin};${findbugsbin};${unixcommand_path}"
   204         path4sdk="${sharebin};${unixcommand_path}"
   215         dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH
   205         dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH
   216 	devtools_path="${jdk_devtools}/win32/bin"
   206 	devtools_path="${jdk_devtools}/win32/bin"
   217 	path4sdk="${devtools_path};${path4sdk}"
   207 	path4sdk="${devtools_path};${path4sdk}"
   218 	# Normally this need not be set, but on Windows it's default is C:/UTILS
   208 	# Normally this need not be set, but on Windows it's default is C:/UTILS
   219         ALT_DEVTOOLS_PATH="${devtools_path}"
   209         ALT_DEVTOOLS_PATH="${devtools_path}"
   227         unix_toolset=CYGWIN
   217         unix_toolset=CYGWIN
   228 	# Utility to convert to short pathnames without spaces
   218 	# Utility to convert to short pathnames without spaces
   229 	dosname="/usr/bin/cygpath -a -m -s"
   219 	dosname="/usr/bin/cygpath -a -m -s"
   230         # Most unix utilities are in the /usr/bin
   220         # Most unix utilities are in the /usr/bin
   231         unixcommand_path="/usr/bin"
   221         unixcommand_path="/usr/bin"
   232         path4sdk="${sharebin};${antbin};${findbugsbin};${unixcommand_path}"
   222         path4sdk="${sharebin};${unixcommand_path}"
   233         dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH
   223         dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH
   234         # Find GNU make
   224         # Find GNU make
   235         make="${unixcommand_path}/make.exe"
   225         make="${unixcommand_path}/make.exe"
   236         fileMustExist "${make}" make
   226         fileMustExist "${make}" make
   237     else
   227     else