configure: Deleted RULES_JAVA and associated variables
Also removed some extensions template configuration files for architectures that we have already removed from Base.
This commit is contained in:
@ -74,7 +74,6 @@ INSTALL_TEMPLATES = $(INSTALL_LOCATION)/templates
|
||||
INSTALL_DBD = $(INSTALL_LOCATION)/dbd
|
||||
INSTALL_DB = $(INSTALL_LOCATION)/db
|
||||
INSTALL_CONFIG = $(INSTALL_LOCATION)/configure
|
||||
INSTALL_JAVA = $(INSTALL_LOCATION)/javalib
|
||||
|
||||
#Directory for OS independant build created files
|
||||
COMMON_DIR = ../O.Common
|
||||
@ -163,9 +162,6 @@ TESTPRODNAME = $(addsuffix $(EXE),$(basename $(TESTPROD)))
|
||||
SHRLIBNAME = $(SHRLIBNAME_$(SHARED_LIBRARIES))
|
||||
TESTSHRLIBNAME = $(TESTSHRLIBNAME_$(SHARED_LIBRARIES))
|
||||
|
||||
JAVA =
|
||||
JAR =
|
||||
|
||||
#--------------------------------------------------
|
||||
# obj files
|
||||
|
||||
|
@ -74,8 +74,6 @@ all: install
|
||||
|
||||
-include $(CONFIG)/RULES.Db
|
||||
|
||||
-include $(CONFIG)/RULES_JAVA
|
||||
|
||||
ifneq (,$(strip $(HDEPENDS_FILES)))
|
||||
$(filter-out $(wildcard *$(DEP)), $(HDEPENDS_FILES)): $(COMMON_INC)
|
||||
-include $(HDEPENDS_FILES)
|
||||
|
@ -1,159 +0,0 @@
|
||||
#*************************************************************************
|
||||
# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
|
||||
# National Laboratory.
|
||||
# Copyright (c) 2002 The Regents of the University of California, as
|
||||
# Operator of Los Alamos National Laboratory.
|
||||
# EPICS BASE Versions 3.13.7
|
||||
# and higher are distributed subject to a Software License Agreement found
|
||||
# in file LICENSE that is included with this distribution.
|
||||
#*************************************************************************
|
||||
# $Revision-Id$
|
||||
#
|
||||
|
||||
|
||||
ifeq ($(BUILD_CLASS),HOST)
|
||||
|
||||
#-------------------------------------------------------
|
||||
# java jdk1.1.5 definitions
|
||||
|
||||
JAVA_INC = $(JAVA_DIR)/include
|
||||
JAVA_BIN = $(JAVA_DIR)/bin
|
||||
JAVA_INCLUDES += -I$(JAVA_INC) -I$(JAVA_INC)/$(word 1, $(subst -, ,$(T_A))) -I$(COMMON_DIR)
|
||||
|
||||
JAVACCMD = $(subst \,/,$(JAVA_BIN)/javac$(EXE) $(CLASSPATH) $(SOURCEPATH) $(JAVACFLAGS))
|
||||
JAVAHCMD = $(subst \,/,$(JAVA_BIN)/javah$(EXE) -d $(COMMON_DIR) -force $(CLASSPATH) $(JAVAHFLAGS))
|
||||
JARCMD = $(subst \,/,$(JAVA_BIN)/jar$(EXE) $(JAR_OPTIONS) $@ $(JARINPUT) $(JARPACKAGES))
|
||||
|
||||
#-------------------------------------------------------
|
||||
vpath %.java ..
|
||||
vpath %.jar .. $(COMMON_DIR)
|
||||
|
||||
empty:=
|
||||
space:= $(empty) $(empty)
|
||||
CLASSPATH = -classpath $(subst $(space),:,$(strip $(USR_PRECLASSPATH) $(INSTALL_JAVA) $(USR_CLASSPATH)))
|
||||
SOURCEPATH = -sourcepath .:..:../..
|
||||
|
||||
#-------------------------------------------------------
|
||||
# Java directory
|
||||
|
||||
ifdef JAVA
|
||||
JAVA_DIRECTORY_TARGETS += $(INSTALL_JAVA)
|
||||
endif
|
||||
|
||||
#-------------------------------------------------------
|
||||
# Java native method C header files
|
||||
|
||||
JAVAHFLAGS += $(USR_JAVAHFLAGS)
|
||||
JAVAINC_CLASSFILES += $(addprefix $(INSTALL_JAVA)/,$(subst _,/,$(subst .h,.class,$(JAVAINC))))
|
||||
JAVAINC_CLASSNAMES += $(subst _,.,$(subst .h,,$(JAVAINC)))
|
||||
COMMON_JAVAINC += $(addprefix $(COMMON_DIR)/,$(JAVAINC))
|
||||
|
||||
#-------------------------------------------------------
|
||||
# Java class files
|
||||
|
||||
JAVACFLAGS += $(USR_JAVACFLAGS)
|
||||
CLASSES += $(subst .java,.class,$(JAVA))
|
||||
INSTALL_CLASSES = $(addprefix $(INSTALL_JAVA)/,$(CLASSES))
|
||||
|
||||
TESTCLASSES += $(subst .java,.class,$(notdir $(TESTJAVA)))
|
||||
COMMON_TESTCLASSES += $(addprefix $(COMMON_DIR)/,$(TESTCLASSES))
|
||||
DEPTESTJAVA += $(subst .class,.java,$(TESTCLASSES))
|
||||
|
||||
#-------------------------------------------------------
|
||||
# Java jar file
|
||||
|
||||
INSTALL_JAR =$(addprefix $(INSTALL_JAVA)/,$(JAR))
|
||||
JARMANIFEST += $(firstword $(MANIFEST) $(JAR_MANIFEST))
|
||||
JARDEPFILES += $(addprefix $(INSTALL_JAVA)/,$(subst .java,.class,$(JAVA)) $(JAR_INPUT))
|
||||
JARINPUT += $(foreach inp,$(JAR_INPUT),-C $(INSTALL_JAVA) $(subst .java,.class,$(inp)))
|
||||
JARPACKAGES += $(foreach pkg,$(JAR_PACKAGES),-C $(INSTALL_JAVA) $(subst .,/,$(pkg)))
|
||||
PACKAGEDIRS += $(foreach pkg,$(JAR_PACKAGES),$(addprefix $(INSTALL_JAVA)/,$(subst .,/,$(pkg))))
|
||||
|
||||
ifneq ($(JARMANIFEST),)
|
||||
JAR_OPTIONS = cvmf $(JARMANIFEST)
|
||||
else
|
||||
JAR_OPTIONS = cvf
|
||||
endif
|
||||
|
||||
#-------------------------------------------------------
|
||||
# Java doc definitions
|
||||
ifdef JAVADOC
|
||||
JAVADOCFLAGS += $(USR_JAVADOCFLAGS)
|
||||
JAVADOCCMD = $(subst \,/,$(JAVA_BIN)/javadoc$(EXE) $(CLASSPATH) $(SOURCEPATH) $(JAVADOCFLAGS))
|
||||
INSTALL_JAVADOC = $(addprefix $(INSTALL_HTML)/,$(JAVADOC))/index.html
|
||||
endif
|
||||
|
||||
#-------------------------------------------------------
|
||||
# Java rules
|
||||
|
||||
all: install
|
||||
|
||||
install: buildInstall
|
||||
|
||||
buildInstall : build
|
||||
|
||||
rebuild: clean install
|
||||
|
||||
inc: $(JAVA_DIRECTORY_TARGETS) $(INSTALL_CLASSES) $(COMMON_JAVAINC)
|
||||
|
||||
build: inc
|
||||
|
||||
build: $(COMMON_TESTCLASSES)
|
||||
|
||||
buildInstall : $(INSTALL_JAR) $(INSTALL_JAVADOC)
|
||||
|
||||
clean: java_clean
|
||||
|
||||
#This clean works only from O.* dirs.
|
||||
java_clean:
|
||||
@$(RMDIR) $(INSTALL_CLASSES) $(PACKAGEDIRS)
|
||||
@$(RM) $(INSTALL_JAR) $(INSTALL_JAVADOC)
|
||||
@$(RM) $(COMMON_TESTCLASSES) $(COMMON_JAVAINC)
|
||||
|
||||
ifdef JAVA_DIRECTORY_TARGETS
|
||||
$(JAVA_DIRECTORY_TARGETS):
|
||||
$(MKDIR) -p $@
|
||||
endif
|
||||
|
||||
$(COMMON_JAVAINC):$(JAVAINC_CLASSFILES)
|
||||
$(ECHO) Creating header files $(COMMON_JAVAINC)
|
||||
@$(RM) $@
|
||||
$(JAVAHCMD) $(JAVAINC_CLASSNAMES)
|
||||
|
||||
$(COMMON_TESTCLASSES): $(addprefix ../,$(DEPTESTJAVA))
|
||||
$(ECHO) Creating test java class files $(COMMON_TESTCLASSES)
|
||||
@$(RM) $@
|
||||
$(JAVACCMD) -d $(COMMON_DIR) $^
|
||||
|
||||
$(INSTALL_CLASSES): $(addprefix ../,$(JAVA))
|
||||
$(ECHO) Creating java class files
|
||||
@$(RM) $@
|
||||
$(JAVACCMD) -d $(INSTALL_JAVA) $^
|
||||
|
||||
$(INSTALL_JAVADOC): $(addprefix ../,$(JAVA))
|
||||
$(ECHO) Creating java doc files
|
||||
@$(RM) $@
|
||||
$(JAVADOCCMD) -d $(addprefix $(INSTALL_HTML)/,$(JAVADOC)) $^
|
||||
|
||||
$(COMMON_DIR)/%.jar: $(JARDEPFILES)
|
||||
$(ECHO) Creating java jar file $@
|
||||
@$(RM) $@
|
||||
$(JARCMD)
|
||||
|
||||
$(INSTALL_JAVA)/%.jar: $(COMMON_DIR)/%.jar
|
||||
$(ECHO) "Installing java jar file $@"
|
||||
@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
|
||||
|
||||
$(INSTALL_JAVA)/%.jar: %.jar
|
||||
$(ECHO) "Installing java jar file $@"
|
||||
@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
|
||||
|
||||
$(addprefix $(INSTALL_JAVA)/, $(JARINPUT)): $(INSTALL_JAVA)/%: ../%
|
||||
$(ECHO) "Installing jar input file $@"
|
||||
@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
|
||||
|
||||
.PHONY: all install buildInstall rebuild clean build inc java_clean
|
||||
|
||||
.PRECIOUS: $(COMMON_JAVAINC)
|
||||
|
||||
endif
|
@ -22,9 +22,8 @@ realuninstall: uninstallDirs
|
||||
$(RMDIR) $(INSTALL_LOCATION_BIN)
|
||||
$(RMDIR) $(INSTALL_LOCATION_LIB)
|
||||
|
||||
UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC)\
|
||||
$(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES) \
|
||||
$(INSTALL_DB)
|
||||
UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC)
|
||||
UNINSTALL_DIRS += $(INSTALL_HTML) $(INSTALL_TEMPLATES) $(INSTALL_DB)
|
||||
UNINSTALL_DIRS += $(DIRECTORY_TARGETS)
|
||||
uninstallDirs:
|
||||
$(RMDIR) $(UNINSTALL_DIRS)
|
||||
|
@ -198,7 +198,6 @@
|
||||
RULES_DIRS Definitions and rules for building subdirectories
|
||||
RULES_EXPAND
|
||||
RULES_FILE_TYPE
|
||||
RULES_JAVA Definitions and rules for java jars and classes
|
||||
RULES_TARGET
|
||||
RULES_TOP Rules specific to a <top> dir (uninstall and tar)
|
||||
Sample.Makefile Sample makefile with comments
|
||||
|
@ -209,7 +209,6 @@
|
||||
RULES_DIRS Definitions and rules for building subdirectories
|
||||
RULES_EXPAND
|
||||
RULES_FILE_TYPE
|
||||
RULES_JAVA Definitions and rules for java jars and classes
|
||||
RULES_TARGET
|
||||
RULES_TOP Rules specific to a <top> dir (uninstall and tar)
|
||||
Sample.Makefile Sample makefile with comments
|
||||
|
@ -12,9 +12,17 @@
|
||||
<p>
|
||||
EPICS Base 3.15.0.x releases are not intended for use in production systems.</p>
|
||||
|
||||
<h2 align="center">Changes between 3.14.x and 3.15.0.1</h2>
|
||||
<h2 align="center">Changes between 3.15.0.1 and 3.15.0.2</h2>
|
||||
<!-- Insert new items immediately below here ... -->
|
||||
|
||||
<h3>Deleted Java build rules</h3>
|
||||
|
||||
<p>Java has its own build systems now, so we've deleted the rules and associated
|
||||
variables from Base, although they might get added to the Extensions build rules
|
||||
for a while in case anyone still needs them.</p>
|
||||
|
||||
<h2 align="center">Changes between 3.14.x and 3.15.0.1</h2>
|
||||
|
||||
<h3>Cross-builds targeting win32-x86-mingw</h3>
|
||||
|
||||
<p>Some Linux distributions now package the MinGW cross-compiler which makes it
|
||||
|
@ -1,13 +0,0 @@
|
||||
#
|
||||
# $Revision-Id$
|
||||
#
|
||||
# Site Specific Configuration Information
|
||||
# Only the local epics system manager should modify this file
|
||||
|
||||
# Where to find utilities/libraries
|
||||
# If you do not have a certain product,
|
||||
# leave the line empty.
|
||||
#
|
||||
|
||||
-include $(TOP)/configure/os/CONFIG_SITE.win32-x86.win32-x86
|
||||
|
@ -1,13 +0,0 @@
|
||||
#
|
||||
# $Revision-Id$
|
||||
#
|
||||
# Site Specific Configuration Information
|
||||
# Only the local epics system manager should modify this file
|
||||
|
||||
# Where to find utilities/libraries
|
||||
# If you do not have a certain product,
|
||||
# leave the line empty.
|
||||
#
|
||||
|
||||
-include $(TOP)/configure/os/CONFIG_SITE.hpux-parisc.hpux-parisc
|
||||
|
@ -1,30 +0,0 @@
|
||||
#
|
||||
# $Revision-Id$
|
||||
#
|
||||
# Site Specific Configuration Information
|
||||
# Only the local epics system manager should modify this file
|
||||
|
||||
# Where to find utilities/libraries
|
||||
# If you do not have a certain product,
|
||||
# leave the line empty.
|
||||
#
|
||||
|
||||
-include $(TOP)/configure/os/CONFIG_SITE.Common.Common
|
||||
|
||||
# Where to find utilities/libraries
|
||||
X11_INC = /usr/include/X11R5
|
||||
X11_LIB = /usr/lib/X11R5
|
||||
MOTIF_INC = /usr/include/Motif1.2
|
||||
MOTIF_LIB = /usr/lib/Motif1.2
|
||||
INTERVIEWS_BIN=/usr/local/interviews/bin/O.hp700
|
||||
XRTGRAPH = /usr/csite/xrt
|
||||
OPENWIN = /usr/csite4/local/xview
|
||||
WINGZ_INC = /usr/local/Wingz2/incl
|
||||
WINGZ_LIB = /usr/local/Wingz2/lib
|
||||
MATHEMATICA = /usr/local/math
|
||||
QUESTWIN = /usr/local/questwin
|
||||
IDL = /usr/csite/idl
|
||||
#JAVA_DIR=/usr/java/j2sdk1.4.1_01
|
||||
JAVA_DIR=/usr/local/java
|
||||
JAVA_INC=$(JAVA_DIR)/include
|
||||
|
@ -1,11 +0,0 @@
|
||||
#
|
||||
# $Revision-Id$
|
||||
#
|
||||
# Site Specific Configuration Information
|
||||
# Only the local epics system manager should modify this file
|
||||
|
||||
# Where to find utilities/libraries
|
||||
# If you do not have a certain product,
|
||||
# leave the line empty.
|
||||
#
|
||||
|
@ -1,41 +0,0 @@
|
||||
#
|
||||
# $Revision-Id$
|
||||
#
|
||||
# Site Specific Configuration Information
|
||||
# Only the local epics system manager should modify this file
|
||||
|
||||
# Where to find utilities/libraries
|
||||
# If you do not have a certain product,
|
||||
# leave the line empty.
|
||||
#
|
||||
|
||||
-include $(TOP)/configure/os/CONFIG_SITE.Common.Common
|
||||
|
||||
X11_LIB=/usr/X11R6/lib
|
||||
X11_INC=/usr/X11R6/include/X11
|
||||
MOTIF_LIB=/usr/X11R6/lib
|
||||
MOTIF_INC=/usr/X11R6/include
|
||||
#X11_INC=/local2/X11R6/include/X11
|
||||
#X11_LIB=/local2/X11R6/lib
|
||||
#MOTIF_LIB=/local2/X11R6/lib
|
||||
#MOTIF_INC=/local2/X11R6/include
|
||||
|
||||
OPENWIN =
|
||||
WINGZ =
|
||||
MATHEMATICA =
|
||||
SCIPLOT=YES
|
||||
XRTGRAPH =
|
||||
QUESTWIN =
|
||||
TK_TCL = /usr/lib
|
||||
IDL =
|
||||
|
||||
INTERVIEWS_BIN=/usr/local/interviews/bin/O.Linux
|
||||
|
||||
IV_INC=/usr/local/interviews/include
|
||||
IV_BIN=/usr/local/interviews/bin/O.Linux
|
||||
IV_LIB=/usr/local/interviews/lib/O.Linux
|
||||
|
||||
PYTHON_DIR=/usr/lib/python2.2
|
||||
PYTHON_INCLUDE=/usr/include/python2.2
|
||||
|
||||
JAVA_DIR=c:/j2sdk1.4.1_01
|
@ -1,109 +0,0 @@
|
||||
#
|
||||
# $Revision-Id$
|
||||
#
|
||||
# Site Specific Configuration Information
|
||||
# Only the local epics system manager should modify this file
|
||||
|
||||
# Where to find utilities/libraries
|
||||
# If you do not have a certain product,
|
||||
# leave the line empty.
|
||||
#
|
||||
|
||||
-include $(TOP)/configure/os/CONFIG_SITE.Common.Common
|
||||
|
||||
|
||||
EXCEED = Exceed7.0
|
||||
|
||||
ifeq ($(EXCEED),Exceed5)
|
||||
X11_LIB = c:/exceed5/xdk/lib
|
||||
X11_INC = c:/exceed5/xdk/include
|
||||
EXCEED_XLIBS=xmstatic xt xlibgui xlib xmu
|
||||
xmstatic_DIR=$(X11_LIB)
|
||||
xt_DIR=$(X11_LIB)
|
||||
xlibgui_DIR=$(X11_LIB)
|
||||
xlib_DIR=$(X11_LIB)
|
||||
xmu_DIR=$(X11_LIB)
|
||||
EXCEED_CFLAGS=
|
||||
endif
|
||||
ifeq ($(EXCEED),Exceed6.0)
|
||||
X11_LIB = c:/exceed/xdk/lib
|
||||
X11_INC = c:/exceed/xdk/include
|
||||
EXCEED_XLIBS=xmstatic HCLXt xlibgui xlib HCLXmu
|
||||
xmstatic_DIR=$(X11_LIB)
|
||||
HCLXt_DIR=$(X11_LIB)
|
||||
xlibgui_DIR=$(X11_LIB)
|
||||
xlib_DIR=$(X11_LIB)
|
||||
HCLXmu_DIR=$(X11_LIB)
|
||||
EXCEED_CFLAGS=
|
||||
endif
|
||||
ifeq ($(EXCEED),Exceed6.1)
|
||||
X11_LIB = c:/exceed/xdk/lib
|
||||
X11_INC = c:/exceed/xdk/include
|
||||
EXCEED_XLIBS=XmStatic XmStatXt xlibgui xlib HCLXmu
|
||||
XmStatic_DIR=$(X11_LIB)
|
||||
XmStatXt_DIR=$(X11_LIB)
|
||||
xlibgui_DIR=$(X11_LIB)
|
||||
xlib_DIR=$(X11_LIB)
|
||||
HCLXmu_DIR=$(X11_LIB)
|
||||
EXCEED_CFLAGS=/DXMSTATIC
|
||||
endif
|
||||
ifeq ($(EXCEED),Exceed6.2)
|
||||
X11_LIB = c:/exceed/xdk/lib
|
||||
X11_INC = c:/exceed/xdk/include
|
||||
EXCEED_XLIBS=XmStatic XmStatXt xlibgui Xlib hclXmu
|
||||
XmStatic_DIR=$(X11_LIB)
|
||||
XmStatXt_DIR=$(X11_LIB)
|
||||
xlibgui_DIR=$(X11_LIB)
|
||||
Xlib_DIR=$(X11_LIB)
|
||||
hclXmu_DIR=$(X11_LIB)
|
||||
EXCEED_CFLAGS=/DXMSTATIC
|
||||
endif
|
||||
ifeq ($(EXCEED),Exceed7.0)
|
||||
X11_LIB = c:/Exceed/xdk/lib
|
||||
X11_INC = c:/Exceed/xdk/include
|
||||
EXCEED_XLIBS=XmStatic XmStatXt XlibGui Xlib HCLXmu
|
||||
XmStatic_DIR=$(X11_LIB)
|
||||
XmStatXt_DIR=$(X11_LIB)
|
||||
XlibGui_DIR=$(X11_LIB)
|
||||
Xlib_DIR=$(X11_LIB)
|
||||
HCLXmu_DIR=$(X11_LIB)
|
||||
EXCEED_CFLAGS=/DXMSTATIC /DMOTIFAPP
|
||||
endif
|
||||
|
||||
MOTIF_LIB = $(X11_LIB)
|
||||
MOTIF_INC = $(X11_INC)
|
||||
|
||||
TCL = c:\\Tcl
|
||||
TK_LIB = $(TCL)/lib
|
||||
TK_INC = $(TCL)/include
|
||||
TCL_LIB = $(TCL)/lib
|
||||
TCL_INC = $(TCL)/include
|
||||
DP_LIB = $(TCL)/lib
|
||||
DP_INC = $(TCL)/include
|
||||
BLT_LIB = $(TCL)/lib
|
||||
BLT_INC = $(TCL)/include
|
||||
|
||||
IDL = /usr/local/idl
|
||||
# IDL=$(IDL)/external/rpc is the sun4 version
|
||||
IDLRPC = $(IDL)/external/rpc.solaris
|
||||
|
||||
OPENWIN =
|
||||
INTERVIEWS_BIN =
|
||||
WINGZ_INC =
|
||||
WINGZ_LIB =
|
||||
MATHEMATICA =
|
||||
QUESTWIN =
|
||||
|
||||
# Define XRTGRAPH_EXTENSIONS = YES only if using XRT/graph 3.x
|
||||
# and you want the extensions for MEDM
|
||||
XRTGRAPH_EXTENSIONS = NO
|
||||
XRTGRAPH =
|
||||
|
||||
SCIPLOT = ../../src/medmdev/medm
|
||||
|
||||
# z library created in SDDS extension
|
||||
ZLIB_CFLAG = -DzLib
|
||||
ZLIB_PROD_LIB = z
|
||||
z_DIR = $(EPICS_EXTENSIONS_LIB)
|
||||
|
||||
JAVA_DIR=c:/j2sdk1.4.1_01
|
@ -81,38 +81,3 @@ set path = ( $path $EPICS_EXTENSIONS/bin/$EPICS_HOST_ARCH )
|
||||
|
||||
# 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.
|
||||
#setenv EPICS_TS_MIN_WEST 360
|
||||
#
|
||||
#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.pl`
|
||||
#endif
|
||||
#
|
||||
## Allow private versions of extensions
|
||||
#if ( $?EPICS_EXTENSIONS_PVT ) then
|
||||
# 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 )
|
||||
## Needed if shared extension libraries are built
|
||||
#setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS}/lib/${HOST_ARCH}"
|
||||
|
||||
# End of set pre R3.14 environment variables
|
||||
##################################################################
|
||||
|
@ -86,33 +86,3 @@ PATH="${PATH}:${EPICS_EXTENSIONS}/bin/${EPICS_HOST_ARCH}"
|
||||
# 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=`"${MY_EPICS_BASE}"/startup/HostArch`
|
||||
#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
|
||||
#fi
|
||||
#
|
||||
## Allow private versions of extensions
|
||||
#if [ -n "${EPICS_EXTENSIONS_PVT}" ] ; then
|
||||
# if [ -d "${EPICS_EXTENSIONS_PVT}/bin/${HOST_ARCH}" ]; then
|
||||
# PATH="${PATH}:${EPICS_EXTENSIONS_PVT}/bin/${HOST_ARCH}"
|
||||
# fi
|
||||
#fi
|
||||
#
|
||||
#PATH="${PATH}:${EPICS_EXTENSIONS}/lib/${HOST_ARCH}"
|
||||
#
|
||||
# End of set pre R3.14 environment variables
|
||||
|
||||
#---------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user