From f6f73b8e7de547584dba9a0543c525b048a4ee8c Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Mon, 8 Jul 2002 15:53:38 +0000
Subject: [PATCH] Updates for R3.14.0beta2.

---
 startup/Site.cshrc   |  83 +++++++++++++++++++++++++++------
 startup/Site.profile | 108 ++++++++++++++++++++++++++++++++++++-------
 2 files changed, 159 insertions(+), 32 deletions(-)

diff --git a/startup/Site.cshrc b/startup/Site.cshrc
index cdeb8a238..7b60920be 100755
--- a/startup/Site.cshrc
+++ b/startup/Site.cshrc
@@ -3,6 +3,11 @@
 #
 #  sites should modify these definitions
 
+# Location of epics base
+if ( ! $?EPICS_BASE ) then
+	setenv EPICS_BASE /usr/local/epics/base
+endif
+
 # Location of epics extensions
 if ( ! $?EPICS_EXTENSIONS ) then
 	setenv EPICS_EXTENSIONS /usr/local/epics/extensions
@@ -30,28 +35,68 @@ endif
 
 # Needed only by ar extension (archiver)
 setenv EPICS_AR_PORT 7002
+
+# Needed for java extensions
+if ( $?CLASSPATH ) then
+   setenv CLASSPATH "${CLASSPATH}:${EPICS_EXTENSIONS}/javalib"
+else
+   setenv CLASSPATH "${EPICS_EXTENSIONS}/javalib"
+endif
+
+# Allow private versions of extensions without a bin subdir
+if ( $?EPICS_EXTENSIONS_PVT ) then
+    set path = ( $path $EPICS_EXTENSIONS_PVT)
+endif
+
 ##################################################################
 
 # Start of set R3.14 environment variables
 
 if ( -e /usr/local/etc/setup/EpicsHostArch.pl ) then
-   setenv EPICS_HOST_ARCH `/usr/local/etc/setup/EpicsHostArch`
+   setenv EPICS_HOST_ARCH `/usr/local/etc/setup/EpicsHostArch.pl`
 else
-   setenv EPICS_HOST_ARCH `/usr/local/epics/startup/EpicsHostArch`
+   setenv EPICS_HOST_ARCH `/usr/local/epics/startup/EpicsHostArch.pl`
 endif
 
+# Allow private versions of base
+if ( $?EPICS_BASE_PVT ) then
+   if ( -e $EPICS_BASE_PVT/bin/$EPICS_HOST_ARCH ) then
+      set path = ( $path $EPICS_BASE_PVT/bin/$EPICS_HOST_ARCH)
+   endif
+   if ( -e $EPICS_BASE_PVT/lib/$EPICS_HOST_ARCH ) then
+      if ( $?LD_LIBRARY_PATH ) then
+         setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_BASE_PVT}/lib/${EPICS_HOST_ARCH}"
+      else
+         setenv LD_LIBRARY_PATH "${EPICS_BASE_PVT}/lib/${EPICS_HOST_ARCH}"
+      endif
+   endif
+endif
+
+set path = ( $path $EPICS_BASE/bin/$EPICS_HOST_ARCH )
+
 # Allow private versions of extensions
 if ( $?EPICS_EXTENSIONS_PVT ) then
-	set path = ( $path $EPICS_EXTENSIONS_PVT/bin/$EPICS_HOST_ARCH)
-	# Needed if shared extension libraries are built
-	if ( $?LD_LIBRARY_PATH ) then
-		setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS_PVT}/lib/${EPICS_HOST_ARCH}"
-	else
-		setenv LD_LIBRARY_PATH "${EPICS_EXTENSIONS_PVT}/lib/${EPICS_HOST_ARCH}"
-	endif
+   if ( -e $EPICS_EXTENSIONS_PVT/bin/$EPICS_HOST_ARCH ) then
+      set path = ( $path $EPICS_EXTENSIONS_PVT/bin/$EPICS_HOST_ARCH)
+   endif
+   if ( -e $EPICS_EXTENSIONS_PVT/lib/$EPICS_HOST_ARCH ) then
+      if ( $?LD_LIBRARY_PATH ) then
+         setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS_PVT}/lib/${EPICS_HOST_ARCH}"
+      else
+         setenv LD_LIBRARY_PATH "${EPICS_EXTENSIONS_PVT}/lib/${EPICS_HOST_ARCH}"
+      endif
+   endif
 endif
 
 set path = ( $path $EPICS_EXTENSIONS/bin/$EPICS_HOST_ARCH )
+
+# Needed if shared base libraries are built
+if ( $?LD_LIBRARY_PATH ) then
+   setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_BASE}/lib/${EPICS_HOST_ARCH}"
+else
+   setenv LD_LIBRARY_PATH "${EPICS_BASE}/lib/${EPICS_HOST_ARCH}"
+endif
+
 # Needed if shared extension libraries are built
 if ( $?LD_LIBRARY_PATH ) then
    setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS}/lib/${EPICS_HOST_ARCH}"
@@ -69,17 +114,25 @@ endif
 # EPICS_TS_MIN_WEST the local time difference from GMT.
 setenv EPICS_TS_MIN_WEST 360
 
-if ( -e /usr/local/etc/setup/HostArch ) then
-   setenv HOST_ARCH `/usr/local/etc/setup/HostArch`
+if ( -e /usr/local/etc/setup/HostArch.pl ) then
+   setenv HOST_ARCH `/usr/local/etc/setup/HostArch.pl`
 else
-   setenv HOST_ARCH `/usr/local/epics/startup/HostArch`
+   setenv HOST_ARCH `/usr/local/epics/startup/HostArch.pl`
 endif
 
 # Allow private versions of extensions
 if ( $?EPICS_EXTENSIONS_PVT ) then
-	set path = ( $path $EPICS_EXTENSIONS_PVT/bin/$HOST_ARCH )
-	# Needed if shared extension libraries are built
-	setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS_PVT}/lib/${HOST_ARCH}"
+   if ( -e $EPICS_EXTENSIONS_PVT/bin/$HOST_ARCH ) then
+      set path = ( $path $EPICS_EXTENSIONS_PVT/bin/$HOST_ARCH)
+   endif
+   # Needed if shared extension libraries are built
+   if ( -e $EPICS_EXTENSIONS_PVT/lib/$HOST_ARCH ) then
+      if ( $?LD_LIBRARY_PATH ) then
+         setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS_PVT}/lib/${HOST_ARCH}"
+      else
+         setenv LD_LIBRARY_PATH "${EPICS_EXTENSIONS_PVT}/lib/${HOST_ARCH}"
+      endif
+   endif
 endif
 
 set path = ( $path $EPICS_EXTENSIONS/bin/$HOST_ARCH )
diff --git a/startup/Site.profile b/startup/Site.profile
index 7bc21a9a9..b83f1e2db 100755
--- a/startup/Site.profile
+++ b/startup/Site.profile
@@ -3,6 +3,12 @@
 #
 #  sites should modify these definitions
 
+# Location of epics base
+if [ -z "${EPICS_BASE}" ] ; then
+	EPICS_BASE=/usr/local/epics/extensions
+	export EPICS_BASE
+fi
+
 # Location of epics extensions
 if [ -z "${EPICS_EXTENSIONS}" ] ; then
 	EPICS_EXTENSIONS=/usr/local/epics/extensions
@@ -36,23 +42,65 @@ fi
 #EPICS_AR_PORT=7002
 #export EPICS_AR_PORT
 
+# Needed for java extensions
+if [ -z "${CLASSPATH}" ] ; then
+	CLASSPATH="${EPICS_EXTENSIONS}/javalib"
+else
+	CLASSPATH="${CLASSPATH}:${EPICS_EXTENSIONS}/javalib"
+fi
+
+# Allow private versions of extensions without a bin subdir
+if [ -n "${EPICS_EXTENSIONS_PVT}" ] ; then
+	PATH="${PATH}:${EPICS_EXTENSIONS_PVT}"
+fi
+
+#---------------------------------------------------------------
 # Start of set R3.14 environment variables
 
-EPICS_HOST_ARCH=`/usr/local/epics/startup/EpicsHostArch`
+EPICS_HOST_ARCH=`/usr/local/epics/startup/EpicsHostArch.pl`
 export EPICS_HOST_ARCH
 
-# Allow private versions of extensions
-if [ -n "${EPICS_EXTENSIONS_PVT}" ] ; then
-	PATH="${PATH}:${EPICS_EXTENSIONS_PVT}/bin/${EPICS_HOST_ARCH}"
+# Allow private versions of base
+if [ -n "${EPICS_BASE_PVT}" ] ; then
+	if [ -d $EPICS_BASE_PVT/bin/$EPICS_HOST_ARCH ]; then
+		PATH="${PATH}:${EPICS_BASE_PVT}/bin/${EPICS_HOST_ARCH}"
+	fi
 	# Needed if shared extension libraries are built
-	if [ -z "${LD_LIBRARY_PATH}" ] ; then
-		LD_LIBRARY_PATH="${EPICS_EXTENSIONS_PVT}/lib/${EPICS_HOST_ARCH}"
-	else
-		LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS_PVT}/lib/${EPICS_HOST_ARCH}"
+	if [ -d $EPICS_BASE_PVT/lib/$EPICS_HOST_ARCH ]; then
+		if [ -z "${LD_LIBRARY_PATH}" ] ; then
+			LD_LIBRARY_PATH="${EPICS_BASE_PVT}/lib/${EPICS_HOST_ARCH}"
+		else
+			LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_BASE_PVT}/lib/${EPICS_HOST_ARCH}"
+		fi
 	fi
 fi
 
-PATH="${PATH}:${EPICS_EXTENSIONS}/lib/${EPICS_HOST_ARCH}"
+PATH="${PATH}:${EPICS_BASE}/bin/${EPICS_HOST_ARCH}"
+
+# Allow private versions of extensions
+if [ -n "${EPICS_EXTENSIONS_PVT}" ] ; then
+	if [ -d $EPICS_EXTENSIONS_PVT/bin/$EPICS_HOST_ARCH ]; then
+		PATH="${PATH}:${EPICS_EXTENSIONS_PVT}/bin/${EPICS_HOST_ARCH}"
+	fi
+	# Needed if shared extension libraries are built
+	if [ -d $EPICS_EXTENSIONS_PVT/lib/$EPICS_HOST_ARCH ]; then
+		if [ -z "${LD_LIBRARY_PATH}" ] ; then
+			LD_LIBRARY_PATH="${EPICS_EXTENSIONS_PVT}/lib/${EPICS_HOST_ARCH}"
+		else
+			LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS_PVT}/lib/${EPICS_HOST_ARCH}"
+		fi
+	fi
+fi
+
+PATH="${PATH}:${EPICS_EXTENSIONS}/bin/${EPICS_HOST_ARCH}"
+
+# Needed if shared base libraries are built
+if [ -z "${LD_LIBRARY_PATH}" ] ; then
+	LD_LIBRARY_PATH="${EPICS_BASE}/lib/${EPICS_HOST_ARCH}"
+else
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_BASE}/lib/${EPICS_HOST_ARCH}"
+fi
+
 # Needed if shared extension libraries are built
 if [ -z "${LD_LIBRARY_PATH}" ] ; then
 	LD_LIBRARY_PATH="${EPICS_EXTENSIONS}/lib/${EPICS_HOST_ARCH}"
@@ -62,6 +110,7 @@ fi
 
 # End of set R3.14 environment variables
 
+#---------------------------------------------------------------
 
 # Start of set pre R3.14 environment variables
 
@@ -70,14 +119,41 @@ fi
 EPICS_TS_MIN_WEST=360
 export EPICS_TS_MIN_WEST
 
-HOST_ARCH=`/usr/local/epics/startup/HostArch`
+HOST_ARCH=`/usr/local/epics/startup/HostArch.pl`
 export HOST_ARCH
 
+# Allow private versions of base
+if [ -n "${EPICS_BASE_PVT}" ] ; then
+	if [ -d $EPICS_BASE_PVT/bin/$HOST_ARCH ]; then
+		PATH="${PATH}:${EPICS_BASE_PVT}/bin/${HOST_ARCH}"
+	fi
+	# Needed if shared extension libraries are built
+	if [ -d $EPICS_BASE_PVT/lib/$HOST_ARCH ]; then
+		if [ -z "${LD_LIBRARY_PATH}" ] ; then
+			LD_LIBRARY_PATH="${EPICS_BASE_PVT}/lib/${HOST_ARCH}"
+		else
+			LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_BASE_PVT}/lib/${HOST_ARCH}"
+		fi
+	fi
+fi
+
+PATH="${PATH}:${EPICS_BASE}/lib/${HOST_ARCH}"
+# Needed if shared base libraries are built
+LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_BASE}/lib/${HOST_ARCH}"
+
 # Allow private versions of extensions
 if [ -n "${EPICS_EXTENSIONS_PVT}" ] ; then
-	PATH="${PATH}:${EPICS_EXTENSIONS_PVT}/bin/${HOST_ARCH}"
+	if [ -d $EPICS_EXTENSIONS_PVT/bin/$HOST_ARCH ]; then
+		PATH="${PATH}:${EPICS_EXTENSIONS_PVT}/bin/${HOST_ARCH}"
+	fi
 	# Needed if shared extension libraries are built
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS_PVT}/lib/${HOST_ARCH}"
+	if [ -d $EPICS_EXTENSIONS_PVT/lib/$HOST_ARCH ]; then
+		if [ -z "${LD_LIBRARY_PATH}" ] ; then
+			LD_LIBRARY_PATH="${EPICS_EXTENSIONS_PVT}/lib/${HOST_ARCH}"
+		else
+			LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS_PVT}/lib/${HOST_ARCH}"
+		fi
+	fi
 fi
 
 PATH="${PATH}:${EPICS_EXTENSIONS}/lib/${HOST_ARCH}"
@@ -86,11 +162,9 @@ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS}/lib/${HOST_ARCH}"
 
 # End of set pre R3.14 environment variables
 
+#---------------------------------------------------------------
+
 export PATH
 export LD_LIBRARY_PATH
-
-if [ -z "${JBAADTHOME}" ] ; then
-	JBAADTHOME=janetanderson
-	export JBAADTHOME
-fi
+export CLASSPATH