From cc382a10e0d11b605c0fde60ed84ad39e17958ce Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Thu, 13 Sep 2001 14:58:24 +0000
Subject: [PATCH] Updates for R3.14.0beta1.

---
 startup/.cshrc       |  43 -----------------
 startup/.profile     |  66 --------------------------
 startup/Site.cshrc   | 103 +++++++++++++++++++++++-----------------
 startup/Site.profile |  88 +++++++++++++++++++++++++++-------
 startup/borland.bat  | 109 +++++++++++++++++--------------------------
 startup/win32.bat    | 107 +++++++++++++++++-------------------------
 6 files changed, 215 insertions(+), 301 deletions(-)
 delete mode 100755 startup/.cshrc
 delete mode 100755 startup/.profile

diff --git a/startup/.cshrc b/startup/.cshrc
deleted file mode 100755
index 30a37ed7e..000000000
--- a/startup/.cshrc
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-#----------- Start of R3.14 epics extensions path requirements --------------------------------------
-if ( ! $?EPICS_EXTENSIONS ) then
-	setenv EPICS_EXTENSIONS /usr/local/epics/extensions
-endif
-if ( $?EPICS_EXTENSIONS_PVT ) then
-	set path = ( $path $EPICS_EXTENSIONS_PVT $EPICS_EXTENSIONS/bin/$EPICS_HOST_ARCH)
-	if ( $?LD_LIBRARY_PATH ) then
-		setenv LD_LIBRARY_PATH $LD_LIBRARY_PATH:$EPICS_EXTENSIONS_PVT/lib/$EPICS_HOST_ARCH:$EPICS_EXTENSIONS/lib/$EPICS_HOST_ARCH
-	else
-		setenv LD_LIBRARY_PATH $EPICS_EXTENSIONS_PVT/lib/$EPICS_HOST_ARCH:$EPICS_EXTENSIONS/lib/$EPICS_HOST_ARCH
-	endif
-else
-	set path = ( $path $EPICS_EXTENSIONS/bin/$EPICS_HOST_ARCH)
-	if ( $?LD_LIBRARY_PATH ) then
-		setenv LD_LIBRARY_PATH $LD_LIBRARY_PATH:$EPICS_EXTENSIONS/lib/$EPICS_HOST_ARCH
-	else
-		setenv LD_LIBRARY_PATH $EPICS_EXTENSIONS/lib/$EPICS_HOST_ARCH
-	endif
-endif
-#----------- End of R3.14 epics extensions path requirements -----------------------------------------
-
-#----------- Start of R3.13 epics extensions path requirements --------------------------------------
-if ( ! $?EPICS_EXTENSIONS ) then
-	setenv EPICS_EXTENSIONS /usr/local/epics/extensions
-endif
-if ( $?EPICS_EXTENSIONS_PVT ) then
-	set path = ( $path $EPICS_EXTENSIONS_PVT $EPICS_EXTENSIONS/bin/$HOST_ARCH)
-	if ( $?LD_LIBRARY_PATH ) then
-		setenv LD_LIBRARY_PATH $LD_LIBRARY_PATH:$EPICS_EXTENSIONS_PVT/lib/$HOST_ARCH):$EPICS_EXTENSIONS/lib/$HOST_ARCH)
-	else
-		setenv LD_LIBRARY_PATH $EPICS_EXTENSIONS_PVT/lib/$HOST_ARCH):$EPICS_EXTENSIONS/lib/$HOST_ARCH)
-	endif
-else
-	set path = ( $path $EPICS_EXTENSIONS/bin/$HOST_ARCH)
-	if ( $?LD_LIBRARY_PATH ) then
-		setenv LD_LIBRARY_PATH $LD_LIBRARY_PATH:$EPICS_EXTENSIONS/lib/$HOST_ARCH)
-	else
-		setenv LD_LIBRARY_PATH $EPICS_EXTENSIONS/lib/$HOST_ARCH)
-	endif
-endif
-#----------- End of R3.13 epics extensions path requirements -----------------------------------------
diff --git a/startup/.profile b/startup/.profile
deleted file mode 100755
index 183cf36b9..000000000
--- a/startup/.profile
+++ /dev/null
@@ -1,66 +0,0 @@
-# Pre R3.14 statments may be uncommented if needed
-
-#----------- Start of pre R3.12 path requirements -----------------------------
-#
-#PATH=$PATH:./.epicsUnix/$HOST_ARCH/bin:$HOME/op/$HOST_ARCH
-#
-#if [ -z "${EPICS_ADD_ON}" ]
-#then
-#	EPICS_ADD_ON=/usr/local/epics/add_on ; export EPICS_ADD_ON
-#fi
-#
-#if [ -z "${PVT_ADD_ON}" ]
-#then
-#	PVT_ADD_ON=$HOME/bin ; export PVT_ADD_ON
-#fi
-#
-#PATH=$PVT_ADD_ON:$EPICS_ADD_ON/bin:$PATH
-#
-##----------- End of pre R3.12 path requirements -------------------------------
-
-#----------- Start of sun4 to solaris transitional path requirements ----------
-#if [ ${HOST_ARCH}="solaris" ] ; then
-#if [ -z "${EPICS_EXTENSIONS}" ] ; then
-#       EPICS_EXTENSIONS=/usr/local/epics/extensions ; export EPICS_EXTENSIONS
-#fi
-#       PATH=${EPICS_EXTENSIONS}/bin/sun4:$PATH
-#fi
-##----------- End of sun4 to solaris transitional path requirements ------------
-#
-##----------- Start of R3.12 path requirements ---------------------------------
-#
-#PATH=./appSR/tools:./appSR/bin/$HOST_ARCH:./base/tools:./base/bin/$HOST_ARCH:$PATH
-#
-#----------- Start of R3.13 path requirements ---------------------------------
-#if [ -z "${EPICS_EXTENSIONS}" ]
-#then
-#	EPICS_EXTENSIONS=/usr/local/epics/extensions ; export EPICS_EXTENSIONS
-#fi
-#
-#if [ -z "${EPICS_EXTENSIONS_PVT}" ]
-#then
-#	PATH=${EPICS_EXTENSIONS}/bin/${HOST_ARCH}:$PATH
-#else
-#	PATH=${EPICS_EXTENSIONS_PVT}:${EPICS_EXTENSIONS}/bin/${HOST_ARCH}:$PATH
-#fi
-#
-#export PATH
-#----------- End of R3.13 path requirements ---------------------------------
-
-#----------- End of R3.12 path requirements -----------------------------------
-
-#----------- Start of R3.14 path requirements ---------------------------------
-if [ -z "${EPICS_EXTENSIONS}" ]
-then
-	EPICS_EXTENSIONS=/usr/local/epics/extensions ; export EPICS_EXTENSIONS
-fi
-
-if [ -z "${EPICS_EXTENSIONS_PVT}" ]
-then
-	PATH=${EPICS_EXTENSIONS}/bin/${EPICS_HOST_ARCH}:$PATH
-else
-	PATH=${EPICS_EXTENSIONS_PVT}:${EPICS_EXTENSIONS}/bin/${EPICS_HOST_ARCH}:$PATH
-fi
-
-export PATH
-#----------- End of R3.14 path requirements ---------------------------------
diff --git a/startup/Site.cshrc b/startup/Site.cshrc
index d525838e0..cdeb8a238 100755
--- a/startup/Site.cshrc
+++ b/startup/Site.cshrc
@@ -3,38 +3,55 @@
 #
 #  sites should modify these definitions
 
+# Location of epics extensions
+if ( ! $?EPICS_EXTENSIONS ) then
+	setenv EPICS_EXTENSIONS /usr/local/epics/extensions
+endif
+
+# Time service:
+# EPICS_TS_NTP_INET ntp or Unix time server ip addr.
+
+# Postscript printer definition needed by some extensions (eg medm, dp, dm, ...)
+setenv PSPRINTER lp
+
+# Needed only by medm extension
+setenv EPICS_DISPLAY_PATH
+
+# Needed only by orbitscreen extension
+if ( ! $?ORBITSCREENHOME ) then
+	setenv ORBITSCREENHOME $EPICS_EXTENSIONS/src/orbitscreen
+endif
+
+# Needed only by adt extension
+if ( ! $?ADTHOME ) then
+	setenv ADTHOME /usr/local/oag/apps/src/appconfig/adt
+	echo $ADTHOME
+endif
+
+# Needed only by ar extension (archiver)
+setenv EPICS_AR_PORT 7002
+##################################################################
+
+# 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`
 else
    setenv EPICS_HOST_ARCH `/usr/local/epics/startup/EpicsHostArch`
 endif
 
-# Time service:
-# EPICS_TS_MIN_WEST the local time difference from GMT.
-# EPICS_TS_NTP_INET ntp or Unix time server ip addr.
-setenv EPICS_TS_MIN_WEST 360
-
-# Needed only by ar extension (archiver)
-#setenv EPICS_AR_PORT 7002
-
-# Postscript printer definition needed by some extensions (eg medm, dp, dm, ...)
-#setenv PSPRINTER lp
-
-# Needed only by medm extension
-#setenv EPICS_DISPLAY_PATH
-
-# Location of epics extensions
-if ( ! $?EPICS_EXTENSIONS ) then
-	setenv EPICS_EXTENSIONS /usr/local/epics/extensions
-endif
-
 # Allow private versions of extensions
 if ( $?EPICS_EXTENSIONS_PVT ) then
-	set path = ( $path $EPICS_EXTENSIONS_PVT $EPICS_EXTENSIONS/bin/$EPICS_HOST_ARCH)
-else
-	set path = ( $path $EPICS_EXTENSIONS/bin/$EPICS_HOST_ARCH)
+	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
 endif
 
+set path = ( $path $EPICS_EXTENSIONS/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}/lib/${EPICS_HOST_ARCH}"
@@ -42,32 +59,32 @@ else
    setenv LD_LIBRARY_PATH "${EPICS_EXTENSIONS}/lib/${EPICS_HOST_ARCH}"
 endif
 
+# End of set R3.14 environment variables
+##################################################################
+
+
 # Start of set pre R3.14 environment variables
-#if ( -e /usr/local/etc/setup/HostArch ) then
-#   setenv HOST_ARCH `/usr/local/etc/setup/HostArch`
-#else
-#   setenv HOST_ARCH `/usr/local/epics/startup/HostArch`
-#endif
+
+# Time service:
+# 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`
+else
+   setenv HOST_ARCH `/usr/local/epics/startup/HostArch`
+endif
 
 # Allow private versions of extensions
 if ( $?EPICS_EXTENSIONS_PVT ) then
-	set path = ( $path $EPICS_EXTENSIONS_PVT $EPICS_EXTENSIONS/bin/$EPICS_HOST_ARCH)
-else
-	set path = ( $path $EPICS_EXTENSIONS/bin/$EPICS_HOST_ARCH)
+	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}"
 endif
 
+set path = ( $path $EPICS_EXTENSIONS/bin/$HOST_ARCH )
 # 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}"
-else
-   setenv LD_LIBRARY_PATH "${EPICS_EXTENSIONS}/lib/${EPICS_HOST_ARCH}"
-endif
-# End of set R3.14 environment variables
-
-# Allow site specific setup definitions
-if ( -e /usr/local/etc/setup/.cshrc ) then
-   source /usr/local/etc/setup/.cshrc
-else
-   source /usr/local/epics/startup/.cshrc
-endif
+setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS}/lib/${HOST_ARCH}"
 
+# End of set pre R3.14 environment variables
+##################################################################
diff --git a/startup/Site.profile b/startup/Site.profile
index 552ae4a04..7bc21a9a9 100755
--- a/startup/Site.profile
+++ b/startup/Site.profile
@@ -1,21 +1,16 @@
 #!/bin/sh
 #  Site-specific EPICS environment settings
+#
+#  sites should modify these definitions
 
-# Start of set pre R3.14 environment variable
-#HOST_ARCH=`/usr/local/epics/startup/HostArch`
-#export HOST_ARCH
-# End of set pre R3.14 environment variable
-
-# Start of set R3.14 environment variable
-EPICS_HOST_ARCH=`/usr/local/epics/startup/EpicsHostArch`
-export EPICS_HOST_ARCH
-# End of set R3.14 environment variable
+# Location of epics extensions
+if [ -z "${EPICS_EXTENSIONS}" ] ; then
+	EPICS_EXTENSIONS=/usr/local/epics/extensions
+	export EPICS_EXTENSIONS
+fi
 
 # Time service:
-# EPICS_TS_MIN_WEST the local time difference from GMT.
 # EPICS_TS_NTP_INET ntp or Unix time server ip addr.
-EPICS_TS_MIN_WEST=360
-export EPICS_TS_MIN_WEST
 
 # Postscript printer definition needed by some extensions (eg medm, dp, dm, ...)
 PSPRINTER=lp
@@ -26,17 +21,76 @@ export PSPRINTER
 #export EPICS_DISPLAY_PATH
 
 # Needed only by orbitscreen extension
-#if [ $ORBITSCREENHOME="" ] ; then
-#        #setenv ORBITSCREENHOME $EPICS_ADD_ON/src/orbitscreen
-#        ORBITSCREENHOME=$EPICS_EXTENSIONS/src/orbitscreen
-#	export ORBITSCREENHOME
+if [ -z "${ORBITSCREENHOME}" ] ; then
+	ORBITSCREENHOME=$EPICS_EXTENSIONS/src/orbitscreen
+	export ORBITSCREENHOME
+fi
+
+# Needed only by adt extension
+#if [ -z "${ADTHOME}" ] ; then
+#	ADTHOME=
+#	export ADTHOME
 #fi
 
 # Needed only by ar extension (archiver)
 #EPICS_AR_PORT=7002
 #export EPICS_AR_PORT
 
+# Start of set R3.14 environment variables
 
-. /usr/local/epics/startup/.profile
+EPICS_HOST_ARCH=`/usr/local/epics/startup/EpicsHostArch`
+export EPICS_HOST_ARCH
+
+# Allow private versions of extensions
+if [ -n "${EPICS_EXTENSIONS_PVT}" ] ; then
+	PATH="${PATH}:${EPICS_EXTENSIONS_PVT}/bin/${EPICS_HOST_ARCH}"
+	# 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}"
+	fi
+fi
+
+PATH="${PATH}:${EPICS_EXTENSIONS}/lib/${EPICS_HOST_ARCH}"
+# Needed if shared extension libraries are built
+if [ -z "${LD_LIBRARY_PATH}" ] ; then
+	LD_LIBRARY_PATH="${EPICS_EXTENSIONS}/lib/${EPICS_HOST_ARCH}"
+else
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS}/lib/${EPICS_HOST_ARCH}"
+fi
+
+# End of set R3.14 environment variables
 
 
+# Start of set pre R3.14 environment variables
+
+# Time service:
+# EPICS_TS_MIN_WEST the local time difference from GMT.
+EPICS_TS_MIN_WEST=360
+export EPICS_TS_MIN_WEST
+
+HOST_ARCH=`/usr/local/epics/startup/HostArch`
+export HOST_ARCH
+
+# Allow private versions of extensions
+if [ -n "${EPICS_EXTENSIONS_PVT}" ] ; then
+	PATH="${PATH}:${EPICS_EXTENSIONS_PVT}/bin/${HOST_ARCH}"
+	# Needed if shared extension libraries are built
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS_PVT}/lib/${HOST_ARCH}"
+fi
+
+PATH="${PATH}:${EPICS_EXTENSIONS}/lib/${HOST_ARCH}"
+# Needed if shared extension libraries are built
+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
+
diff --git a/startup/borland.bat b/startup/borland.bat
index 5db85a0cf..812b36a95 100755
--- a/startup/borland.bat
+++ b/startup/borland.bat
@@ -1,80 +1,55 @@
 @ECHO OFF
-set path=
-set include=
-set lib=
-REM    --------------- WIN95 -------------------
+REM    ===================================================
+REM    ====== REQUIRED ENVIRONMENT VARIABLES FOLLOW ======
+REM
+REM    --------------- WINDOWS ---------------------------
+REM    ----- WIN95 -----
 REM set PATH=C:\WINDOWS;C:\WINDOWS\COMMAND
-set PATH=C:\WINNT;C:\WINNT\system32
+REM    ----- WINNT -----
+set PAth=c:\wiNNT;C:\WINNT\system32
 
-REM    --------------- EPICS ------------------------
-REM ---- R3.13.x
-REM set HOST_ARCH=Borland
-REM set PATH=%PATH%;G:\epics\base\bin\%HOST_ARCH%
-REM set PATH=%PATH%;G:\epics\extensions\bin\%HOST_ARCH%
-REM ---- R3.14.x
+REM    --------------- GNU make (use cygwin make ) ----------------
+REM    Needed only if using GNU make from cygwin
+REM    Can be replaced with path to a GNU make
+REM
+REM    cygwin contains tk/tcl, vim, perl, and many unix tools
+REM    need grep from here NOT from cvs directory
+REM    some tools may need a tmp directory
+set PATH=%PATH%;c:\cygwin\bin
+
+REM    --------------- perl (use cygwin perl) ------------
+set PERLLIB=/C//cygwin/lib/perl5/5.6.1
+
+REM     ------------ Borland c++ compiler -----------------
+REM     cygwin tools first so borland make not used
+set PATH=%PATH%;c:\Borland\Bcc55\bin
+
+REM    --------------- EPICS -----------------------------
 set EPICS_HOST_ARCH=win32-x86-borland
 set PATH=%PATH%;G:\epics\base\bin\%EPICS_HOST_ARCH%
 set PATH=%PATH%;G:\epics\extensions\bin\%EPICS_HOST_ARCH%
 
-REM    --------------- Epics Channel Access ----------
+REM    ===================================================
+REM    ====== OPTIONAL ENVIRONMENT VARIABLES FOLLOW ======
 
-REM the following line works !!!!!
-REM set EPICS_CA_ADDR_LIST=164.54.9.255
-REM set EPICS_CA_ADDR_LIST=164.54.188.65 164.54.9.255
+REM    --------------- GNU make flags --------------------
+REM set MAKEFLAGS=-w
 
+REM    --------------- EPICS Channel Access --------------
+REM    Uncomment and modify the following lines
+REM    to override the base/configure/CONFIG_ENV defaults
+REM set EPICS_CA_ADDR_LIST=164.54.5.255
+REM set EPICS_CA_ADDR_LIST=164.54.188.65 164.54.5.255
 REM set EPICS_CA_AUTO_CA_ADDR_LIST=YES
-REM set EPICS_CA_CONN_TMO=30.0
-REM set EPICS_CA_BEACON_PERIOD=15.0
-REM set EPICS_CA_REPEATER_PORT=5065
-REM set EPICS_CA_SERVER_PORT=5064
-REM set EPICS_TS_MIN_WEST=420
 
-REM    ------------ cygwin unix tools, make, etc.-----
-REM     cygwin needed for GNU make
-REM     need grep from here NOT from cvs directory
-REM     some tools need a tmp directory
-set PATH=%PATH%;.;..
-REM REM  set PATH=%PATH%;c:\bin;c:\gnuwin32\b18\h-i386-cygwin32\bin
-REM set PATH=%PATH%;c:\bin;c:\cygnus\B19\h-i386-cygwin32\bin
-REM set PATH=%PATH%;c:\bin;c:\cygnus\cygwin-b20\h-i586-cygwin32\bin
-set PATH=%PATH%;c:\bin;c:\cygwin\bin
-set MAKEFLAGS=-w
-set MAKE_MODE=unix
+REM    --------------- JAVA ------------------------------
+REM    Needed for java extensions
+REM set PATH=%PATH%;C:\jdk1.2.2\bin
+REM set CLASSPATH=G:\epics\extensions\javalib
+REM set CLASSPATH=%CLASSPATH%;C:\jdk1.2.2\lib\tools.jar
 
-REM    --------------- perl ------------------------
-REM set PERLLIB=C:\perl\lib
-set PATH=%path%;C:\perl\bin
-
-REM ============OPTIONAL ITEMS FOLLOW ================
-REM    --------------- vim --------------------
-REM set VIM=C:\vim5.3
-set PATH=%path%;C:\vim5.3
-
-REM    --------------- CVS ---------------------------
-set CVSROOT=/cvsroot
-set LOGNAME=janet
-REM         rcs needs a c:\temp directory
-REM 
-REM   set PATH=%PATH%;C:\cyclic\cvs-1.10\bin
-set PATH=%PATH%;C:\cyclic\cvs-1.10
-
-REM    --------------- Exceed ---------------------------
-set PATH=%PATH%;C:\Exceed
-
-REM ---------------- tk/tcl ---------------------
-SET TCL_LIBRARY=%CYGFS%\share\tcl8.0\
-SET GDBTK_LIBRARY=%CYGFS%/share/gdbtcl
-
-REM    --------------- JAVA -------------------
-set CLASSPATH=G:\epics\extensions\javalib
-set PATH=%PATH%;C:\jdk1.2.2\bin
-set CLASSPATH=%CLASSPATH%;C:\jdk1.2.2\lib\tools.jar
-
-REM ===========END OF OPTIONAL ITEMS ================
-
-REM ---------------- Borland c++ compiler -----------------
-SET INCLUDE=c:\\Borland\\Bcc55\\Include
-SET LIB=c:\\Borland\\Bcc55\\lib
-REM cygwin tools first so borland make not used
-set PATH=%PATH%;c:\Borland\Bcc55\bin
+REM    --------------- Exceed ----------------------------
+REM    Needed for XWindow extensions
+REM set PATH=%PATH%;C:\Exceed
 
+REM    ===================================================
diff --git a/startup/win32.bat b/startup/win32.bat
index e7c857b57..047fcedac 100755
--- a/startup/win32.bat
+++ b/startup/win32.bat
@@ -1,78 +1,55 @@
 @ECHO OFF
-set path=
-set include=
-set lib=
-REM    --------------- WIN95 -------------------
+REM    ===================================================
+REM    ====== REQUIRED ENVIRONMENT VARIABLES FOLLOW ======
+REM
+REM    --------------- WINDOWS ---------------------------
+REM    ----- WIN95 -----
 REM set PATH=C:\WINDOWS;C:\WINDOWS\COMMAND
-set PATH=C:\WINNT;C:\WINNT\system32
+REM    ----- WINNT -----
+set PAth=c:\wiNNT;C:\WINNT\system32
 
-REM    --------------- EPICS ------------------------
+REM    --------------- GNU make (use cygwin make ) ----------------
+REM    Needed only if using GNU make from cygwin
+REM    Can be replaced with path to a GNU make
+REM
+REM    cygwin contains tk/tcl, vim, perl, and many unix tools
+REM    need grep from here NOT from cvs directory
+REM    some tools may need a tmp directory
+set PATH=%PATH%;c:\cygwin\bin
+
+REM    --------------- perl (use cygwin perl) ------------
+set PERLLIB=/C//cygwin/lib/perl5/5.6.1
+
+REM    --------------- Visual c++ ------------------------
+REM    ----- Visual c++ 6.0 -----
+call "D:\Program files\Microsoft Visual Studio\Vc98\bin\vcvars32.bat"
+
+REM    --------------- EPICS -----------------------------
 set EPICS_HOST_ARCH=win32-x86
 set PATH=%PATH%;G:\epics\base\bin\%EPICS_HOST_ARCH%
 set PATH=%PATH%;G:\epics\extensions\bin\%EPICS_HOST_ARCH%
 
-REM    ------------ cygwin (unix tools, make, etc.) -----
-REM     need grep from here NOT from cvs directory
-REM     some tools need a tmp directory
-set PATH=%PATH%;.;..
-REM REM  set PATH=%PATH%;c:\bin;c:\gnuwin32\b18\h-i386-cygwin32\bin
-REM set PATH=%PATH%;c:\bin;c:\cygnus\B19\h-i386-cygwin32\bin
-set PATH=%PATH%;c:\bin;c:\cygnus\cygwin-b20\h-i586-cygwin32\bin
-set MAKEFLAGS=-w
-set MAKE_MODE=unix
+REM    ===================================================
+REM    ====== OPTIONAL ENVIRONMENT VARIABLES FOLLOW ======
 
-REM    --------------- CVS ---------------------------
-set CVSROOT=/cvsroot
-set LOGNAME=janet
-REM         rcs needs a c:\temp directory
-REM 
-REM   set PATH=%PATH%;C:\cyclic\cvs-1.10\bin
-set PATH=%PATH%;C:\cyclic\cvs-1.10
-
-REM    --------------- Exceed ---------------------------
-set PATH=%PATH%;C:\Exceed
-
-REM    --------------- Epics Channel Access ----------
-
-REM the following line works !!!!!
-REM set EPICS_CA_ADDR_LIST=164.54.9.255
-set EPICS_CA_ADDR_LIST=164.54.188.65 164.54.9.255
+REM    --------------- GNU make flags --------------------
+REM set MAKEFLAGS=-w
 
+REM    --------------- EPICS Channel Access --------------
+REM    Uncomment and modify the following lines
+REM    to override the base/configure/CONFIG_ENV defaults
+REM set EPICS_CA_ADDR_LIST=164.54.5.255
+REM set EPICS_CA_ADDR_LIST=164.54.188.65 164.54.5.255
 REM set EPICS_CA_AUTO_CA_ADDR_LIST=YES
-REM set EPICS_CA_CONN_TMO=30.0
-REM set EPICS_CA_BEACON_PERIOD=15.0
-REM set EPICS_CA_REPEATER_PORT=5065
-REM set EPICS_CA_SERVER_PORT=5064
-REM set EPICS_TS_MIN_WEST=420
 
-REM    --------------- perl ------------------------
-REM set PERLLIB=C:\perl\lib
-set PATH=%path%;C:\perl\bin
+REM    --------------- JAVA ------------------------------
+REM    Needed for java extensions
+REM set PATH=%PATH%;C:\jdk1.2.2\bin
+REM set CLASSPATH=G:\epics\extensions\javalib
+REM set CLASSPATH=%CLASSPATH%;C:\jdk1.2.2\lib\tools.jar
 
-REM    --------------- vim --------------------
-REM set VIM=C:\vim5.3
-set PATH=%path%;C:\vim5.3
-
-REM    --------------- JAVA -------------------
-REM  set CLASSPATH=.;c:\jdk1.1.3\lib\classes.zip;
-REM  set PATH=%PATH%;C:\jdk1.1.7\bin
-set PATH=%PATH%;C:\jdk1.2.2\bin
-set CLASSPATH=G:\epics\extensions\javalib
-set CLASSPATH=%CLASSPATH%;C:\jdk1.2.2\lib\tools.jar
-
-REM    --------------- Visual c++ ------------------
-
-REM set PATH=%PATH%;c:\msdev\bin;
-REM set PATH=%PATH%;c:\Progra~1\DevStudio\VX\bin;
-REM call c:\Progra~1\DevStudio\VC\bin\vcvars32.bat
-REM call c:\msdev\bin\vcvars32.bat m68k
-
-REM ----- Visual c++ 6.0 ---------
-call "D:\Program files\Microsoft Visual Studio\Vc98\bin\vcvars32.bat"
-REM ----- Visual c++ 5.0 ---------
-REM call c:\epics\vcvars32.bat m68k
-REM ----- Visual c++ 4.2 ---------
-REM call c:\msdev\bin\vcvars32.bat m68k
-
-REM    -----------------------------------------------
+REM    --------------- Exceed ----------------------------
+REM    Needed for XWindow extensions
+REM set PATH=%PATH%;C:\Exceed
 
+REM    ===================================================