From 256dcfcc0473c8e486e8f977536dee9dd6909940 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Mon, 8 Jul 2002 15:42:31 +0000 Subject: [PATCH] Updates for R3.14.0beta2. --- startup/borland.bat | 16 +++------------- startup/win32.bat | 23 +++++++++++------------ 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/startup/borland.bat b/startup/borland.bat index c65dc2b8f..816aa6e0c 100755 --- a/startup/borland.bat +++ b/startup/borland.bat @@ -36,18 +36,11 @@ REM ====== OPTIONAL ENVIRONMENT VARIABLES FOLLOW ====== REM --------------- GNU make flags -------------------- REM set MAKEFLAGS=-w -REM --------------- EPICS ----------------------------- -REM Pre R3.14 requirements -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 --------------- 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_AUTO_ADDR_LIST=YES REM --------------- vim (use cygwin vim ) ---------------- REM HOME needed by vim to write .viminfo file. @@ -57,15 +50,12 @@ set VIM=c:\cygwin REM --------------- JAVA ------------------------------ REM Needed for java extensions -REM set PATH=%PATH%;C:\jdk1.2.2\bin -REM set CLASSPATH=%CLASSPATH%;C:\jdk1.2.2\lib\tools.jar -REM set PATH=C:\j2sdk1.4.0\bin;%PATH% - +set PATH=%PATH%;C:\j2sdk1.4.0\bin set CLASSPATH=G:\epics\extensions\javalib -set PATH=%PATH%;D:\jsdk1.3.1_02\bin REM --------------- Exceed ---------------------------- REM Needed for XWindow extensions +REM Cygwin should preceed Exceed in path REM set PATH=%PATH%;C:\Exceed REM =================================================== diff --git a/startup/win32.bat b/startup/win32.bat index 21d82b696..56b0b3fd1 100755 --- a/startup/win32.bat +++ b/startup/win32.bat @@ -6,7 +6,7 @@ REM --------------- WINDOWS --------------------------- REM ----- WIN95 ----- REM set PATH=C:\WINDOWS;C:\WINDOWS\COMMAND REM ----- WINNT ----- -set PAth=c:\wiNNT;C:\WINNT\system32 +set PATH=C:\WINNT;C:\WINNT\SYSTEM32 REM --------------- GNU make (use cygwin make ) ---------------- REM Needed only if using GNU make from cygwin @@ -25,7 +25,7 @@ REM ----- Visual c++ 6.0 ----- call "C:\Program files\Microsoft Visual Studio\Vc98\bin\vcvars32.bat" REM --------------- EPICS ----------------------------- -REM ----- R3.14 EPICS ----- +REM R3.14 requirements 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% @@ -36,27 +36,26 @@ REM ====== OPTIONAL ENVIRONMENT VARIABLES FOLLOW ====== 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.188.65 164.54.5.255 +REM set EPICS_CA_AUTO_ADDR_LIST=YES + REM --------------- vim (use cygwin vim ) ---------------- REM HOME needed by vim to write .viminfo file. set HOME=c:/users/%USERNAME% REM VIM needed by vim to find _vimrc file. set VIM=c:\cygwin -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 --------------- JAVA ------------------------------ REM Needed for java extensions -REM set CLASSPATH=G:\epics\extensions\javalib -REM set PATH=%PATH%;C:\jdk1.3\bin -set CLASSPATH=%CLASSPATH%;C:\jdk1.3\lib\tools.jar +set PATH=%PATH%;C:\j2sdk1.4.0\bin +set CLASSPATH=G:\epics\extensions\javalib REM --------------- Exceed ---------------------------- REM Needed for XWindow extensions +REM Cygwin should preceed Exceed in path REM set PATH=%PATH%;C:\Exceed REM ===================================================