Merge branch '7.0' into PSI-7.0
This commit is contained in:
@@ -5,6 +5,7 @@ include $(TOP)/configure/CONFIG
|
||||
TEMPLATES_DIR = makeBaseApp
|
||||
|
||||
TEMPLATES += top/Makefile
|
||||
TEMPLATES += top/.gitignore
|
||||
TEMPLATES += top/configure/CONFIG
|
||||
TEMPLATES += top/configure/CONFIG_SITE
|
||||
TEMPLATES += top/configure/Makefile
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
# Authors: Ralph Lange, Marty Kraimer, Andrew Johnson and Janet Anderson
|
||||
|
||||
use FindBin qw($Bin);
|
||||
use lib ("$Bin/../../lib/perl");
|
||||
use FindBin qw($RealBin);
|
||||
use lib ("$RealBin/../../lib/perl");
|
||||
|
||||
use Cwd;
|
||||
use Getopt::Std;
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
# Install directories
|
||||
/bin/
|
||||
/cfg/
|
||||
/db/
|
||||
/dbd/
|
||||
/html/
|
||||
/include/
|
||||
/lib/
|
||||
/templates/
|
||||
|
||||
# Local configuration files
|
||||
/configure/*.local
|
||||
|
||||
# iocBoot generated files
|
||||
/iocBoot/*ioc*/cdCommands
|
||||
/iocBoot/*ioc*/dllPath.bat
|
||||
/iocBoot/*ioc*/envPaths
|
||||
/iocBoot/*ioc*/relPaths.sh
|
||||
|
||||
# Build directories
|
||||
O.*/
|
||||
|
||||
# Common files created by other tools
|
||||
/QtC-*
|
||||
/.vscode/
|
||||
*.orig
|
||||
*.log
|
||||
.*.swp
|
||||
.DS_Store
|
||||
@@ -5,6 +5,7 @@ include $(TOP)/configure/CONFIG
|
||||
TEMPLATES_DIR = makeBaseExt
|
||||
|
||||
TEMPLATES += top/Makefile
|
||||
TEMPLATES += top/.gitignore
|
||||
TEMPLATES += top/README
|
||||
TEMPLATES += top/configure/CONFIG
|
||||
TEMPLATES += top/configure/CONFIG_SITE
|
||||
@@ -13,7 +14,6 @@ TEMPLATES += top/configure/RELEASE
|
||||
TEMPLATES += top/configure/RULES
|
||||
TEMPLATES += top/configure/RULES_DIRS
|
||||
TEMPLATES += top/configure/RULES_TOP
|
||||
TEMPLATES += top/configure/RULES_PYTHON
|
||||
TEMPLATES += top/configure/RULES_IDL
|
||||
|
||||
TEMPLATES += $(subst ../,,$(wildcard ../top/configure/os/CONFIG*))
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
# Install directories
|
||||
/bin/
|
||||
/cfg/
|
||||
/html/
|
||||
/include/
|
||||
/lib/
|
||||
|
||||
# Local configuration files
|
||||
/configure/*.local
|
||||
|
||||
# Build directories
|
||||
O.*/
|
||||
|
||||
# Common files created by other tools
|
||||
/QtC-*
|
||||
/.vscode/
|
||||
*.orig
|
||||
*.log
|
||||
.*.swp
|
||||
.DS_Store
|
||||
@@ -1,9 +1,4 @@
|
||||
# extensions/configure/RULES
|
||||
|
||||
include $(CONFIG)/RULES
|
||||
-include $(TOP)/configure/RULES_PYTHON
|
||||
-include $(TOP)/configure/RULES_IDL
|
||||
|
||||
ifdef BASE_3_15
|
||||
-include $(TOP)/configure/RULES_JAVA
|
||||
endif
|
||||
|
||||
@@ -1,54 +0,0 @@
|
||||
# extensions/configure/RULES_PYTHON
|
||||
|
||||
ifdef T_A
|
||||
ifeq ($(findstring Host,$(VALID_BUILDS)),Host)
|
||||
|
||||
SWIG ?= swig
|
||||
|
||||
vpath %.py $(USR_VPATH) $(ALL_SRC_DIRS)
|
||||
|
||||
# The optional PYTHON_INSTALL_LOCATION environment variable
|
||||
# should be set to <python install site directory>/site-packages
|
||||
PYTHON_INSTALL_LOCATION ?= $(INSTALL_LOCATION)/lang/python
|
||||
|
||||
INSTALL_PYTHON = $(PYTHON_INSTALL_LOCATION)/$(PYTHON_PACKAGE)
|
||||
|
||||
PYTHON_PACKAGE_PTH = $(addsuffix .pth,$(PYTHON_PACKAGE))
|
||||
INSTALL_PYTHON_PACKAGE_PTH = $(addprefix $(PYTHON_INSTALL_LOCATION)/,$(PYTHON_PACKAGE_PTH))
|
||||
|
||||
PYTHON_SCRIPTS = $(filter-out $(LOADABLE_LIBRARY),$(PYTHON_MODULES))
|
||||
PYTHON_LIBRARY = $(filter $(LOADABLE_LIBRARY),$(PYTHON_MODULES))
|
||||
PYTHON_SHRLIBNAME = $(PYTHON_LIBRARY:%=$(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX))
|
||||
|
||||
INSTALL_PYTHONS = $(addprefix $(INSTALL_PYTHON)/,$(PYTHON_SCRIPTS))
|
||||
INSTALL_PYTHONS += $(addprefix $(INSTALL_PYTHON)/,$(PYTHON_SHRLIBNAME))
|
||||
|
||||
buildInstall: $(INSTALL_PYTHONS) $(INSTALL_PYTHON_PACKAGE_PTH)
|
||||
|
||||
$(INSTALL_PYTHON)/%: %
|
||||
@echo "Installing python modules $@"
|
||||
@$(INSTALL) -d -m 644 $< $(INSTALL_PYTHON)
|
||||
|
||||
$(INSTALL_PYTHON)/%: ../%
|
||||
@echo "Installing python modules $@"
|
||||
@$(INSTALL) -d -m 644 $< $(INSTALL_PYTHON)
|
||||
|
||||
$(PYTHON_INSTALL_LOCATION)/%: %
|
||||
@echo "Installing python pth file $@"
|
||||
@$(INSTALL) -d -m 644 $< $(PYTHON_INSTALL_LOCATION)
|
||||
|
||||
$(PYTHON_PACKAGE_PTH):
|
||||
@echo $(PYTHON_PACKAGE) > $@
|
||||
|
||||
%_wrap.c: ../%.i
|
||||
$(SWIG) -python -o $@ $<
|
||||
|
||||
ifdef BASE_3_15
|
||||
clean:
|
||||
else
|
||||
clean::
|
||||
endif
|
||||
@$(RM) *.py *.so *.pth
|
||||
|
||||
endif
|
||||
endif
|
||||
@@ -1,53 +0,0 @@
|
||||
#
|
||||
# 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
|
||||
|
||||
# ---------- java definitions
|
||||
JAVA_DIR=c:/j2sdk1.4.1_01
|
||||
|
||||
# ---------- tcl/tk definitions
|
||||
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
|
||||
|
||||
#X11_LIB = c:/cygwin/lib
|
||||
#X11_INC = c:/cygwin/include
|
||||
|
||||
#MOTIF_LIB = $(X11_LIB)
|
||||
#MOTIF_INC = $(X11_INC)
|
||||
|
||||
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)
|
||||
@@ -0,0 +1,27 @@
|
||||
#
|
||||
# Site Specific Configuration Information
|
||||
|
||||
# Where to find utilities/libraries
|
||||
# If you do not have a certain product,
|
||||
# leave the line empty.
|
||||
#
|
||||
|
||||
#
|
||||
# XDarwin
|
||||
#
|
||||
#X11_LIB=/usr/X11R6/lib
|
||||
#X11_INC=/usr/X11R6/include
|
||||
#XPM_LIB=/usr/X11R6/lib
|
||||
#XPM_INC=/usr/X11R6/include
|
||||
|
||||
#
|
||||
# HomeBrew X11 & OpenMotif
|
||||
#
|
||||
X11_LIB=/opt/homebrew/lib
|
||||
X11_INC=/opt/homebrew/include
|
||||
XPM_LIB=/opt/homebrew/lib
|
||||
XPM_INC=/opt/homebrew/include
|
||||
MOTIF_LIB=/opt/homebrew/lib
|
||||
MOTIF_INC=/opt/homebrew/include
|
||||
|
||||
SCIPLOT = YES
|
||||
@@ -1,81 +0,0 @@
|
||||
#
|
||||
# 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
|
||||
|
||||
PYTHON_DIR=/usr/lib/python2.2
|
||||
PYTHON_INCLUDE=/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3
|
||||
|
||||
# Following 3 for SDDS
|
||||
#USE_GD_LIBRARY=1
|
||||
#USE_RUNCONTROL=1
|
||||
#USE_LOGDAEMON=1
|
||||
|
||||
# Where to find utilities/libraries
|
||||
# If you do not have a certain product,
|
||||
# leave the line empty.
|
||||
#
|
||||
|
||||
#
|
||||
# XDarwin
|
||||
#
|
||||
X11_LIB=/usr/X11R6/lib
|
||||
X11_INC=/usr/X11R6/include/X11
|
||||
XPM_LIB=/usr/X11R6/lib
|
||||
XPM_INC=/usr/X11R6/include/X11
|
||||
|
||||
#
|
||||
# Fink OpenMotif
|
||||
#
|
||||
MOTIF_LIB=/sw/lib
|
||||
MOTIF_INC=/sw/include
|
||||
|
||||
#
|
||||
# DarwinPorts OpenMotif
|
||||
#
|
||||
#MOTIF_LIB=/opt/local/lib
|
||||
#MOTIF_INC=/opt/local/include
|
||||
|
||||
#
|
||||
# Interviews
|
||||
#
|
||||
IV_INC=
|
||||
IV-2_6_INC=
|
||||
IV_BIN=
|
||||
IV_LIB=
|
||||
|
||||
OPENWIN =
|
||||
WINGZ_INC =
|
||||
WINGZ_LIB =
|
||||
MATHEMATICA =
|
||||
|
||||
# Define XRTGRAPH_EXTENSIONS = YES only if using XRT/graph 3.x
|
||||
# and you want the extensions for MEDM
|
||||
#XRTGRAPH_EXTENSIONS = YES
|
||||
#XRTGRAPH = /opt/local/xrtgraph
|
||||
|
||||
SCIPLOT = YES
|
||||
QUESTWIN =
|
||||
|
||||
TK_LIB = /sw/lib
|
||||
TK_INC = /sw/include
|
||||
TCL_LIB = /sw/lib
|
||||
TCL_INC = /sw/include
|
||||
DP_LIB = /sw/lib
|
||||
DP_INC = /sw/include
|
||||
BLT_LIB = /sw/lib
|
||||
BLT_INC = /sw/include
|
||||
|
||||
#
|
||||
# Preliminary JAVA support
|
||||
#
|
||||
JAVA_DIR=/System/Library/Frameworks/JavaVM.framework/Home
|
||||
JAVA_INC=/System/Library/Frameworks/JavaVM.framework/Headers
|
||||
JAVA_INCLUDES = -I$(JAVA_INC)
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
#
|
||||
# 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.darwin-ppc.darwin-ppc
|
||||
|
||||
@@ -1,79 +1,27 @@
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
PYTHON_DIR=/usr/lib/python2.2
|
||||
PYTHON_INCLUDE=/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3
|
||||
|
||||
# Following 3 for SDDS
|
||||
#USE_GD_LIBRARY=1
|
||||
#USE_RUNCONTROL=1
|
||||
#USE_LOGDAEMON=1
|
||||
|
||||
# Where to find utilities/libraries
|
||||
# If you do not have a certain product,
|
||||
# leave the line empty.
|
||||
#
|
||||
|
||||
#
|
||||
# XDarwin
|
||||
#
|
||||
X11_LIB=/usr/X11R6/lib
|
||||
X11_INC=/usr/X11R6/include
|
||||
XPM_LIB=/usr/X11R6/lib
|
||||
XPM_INC=/usr/X11R6/include
|
||||
#X11_LIB=/usr/X11R6/lib
|
||||
#X11_INC=/usr/X11R6/include
|
||||
#XPM_LIB=/usr/X11R6/lib
|
||||
#XPM_INC=/usr/X11R6/include
|
||||
|
||||
#
|
||||
# Fink OpenMotif
|
||||
# HomeBrew X11 & OpenMotif
|
||||
#
|
||||
#MOTIF_LIB=/sw/lib
|
||||
#MOTIF_INC=/sw/include
|
||||
|
||||
#
|
||||
# DarwinPorts OpenMotif
|
||||
#
|
||||
MOTIF_LIB=/opt/local/lib
|
||||
MOTIF_INC=/opt/local/include
|
||||
|
||||
#
|
||||
# Interviews
|
||||
#
|
||||
IV_INC=
|
||||
IV-2_6_INC=
|
||||
IV_BIN=
|
||||
IV_LIB=
|
||||
|
||||
OPENWIN =
|
||||
WINGZ_INC =
|
||||
WINGZ_LIB =
|
||||
MATHEMATICA =
|
||||
|
||||
# Define XRTGRAPH_EXTENSIONS = YES only if using XRT/graph 3.x
|
||||
# and you want the extensions for MEDM
|
||||
#XRTGRAPH_EXTENSIONS = YES
|
||||
#XRTGRAPH = /opt/local/xrtgraph
|
||||
X11_LIB=/opt/homebrew/lib
|
||||
X11_INC=/opt/homebrew/include
|
||||
XPM_LIB=/opt/homebrew/lib
|
||||
XPM_INC=/opt/homebrew/include
|
||||
MOTIF_LIB=/opt/homebrew/lib
|
||||
MOTIF_INC=/opt/homebrew/include
|
||||
|
||||
SCIPLOT = YES
|
||||
QUESTWIN =
|
||||
|
||||
TK_LIB = /sw/lib
|
||||
TK_INC = /sw/include
|
||||
TCL_LIB = /sw/lib
|
||||
TCL_INC = /sw/include
|
||||
DP_LIB = /sw/lib
|
||||
DP_INC = /sw/include
|
||||
BLT_LIB = /sw/lib
|
||||
BLT_INC = /sw/include
|
||||
|
||||
#
|
||||
# Preliminary JAVA support
|
||||
#
|
||||
JAVA_DIR=/System/Library/Frameworks/JavaVM.framework/Home
|
||||
JAVA_INC=/System/Library/Frameworks/JavaVM.framework/Headers
|
||||
JAVA_INCLUDES = -I$(JAVA_INC)
|
||||
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
# Site Specific Configuration Information
|
||||
|
||||
X11_LIB=/usr/lib/aarch64-linux-gnu
|
||||
X11_INC=/usr/include
|
||||
|
||||
# OpenMotif location
|
||||
MOTIF_LIB=/usr/lib/aarch64-linux-gnu
|
||||
MOTIF_INC=/usr/include
|
||||
|
||||
@@ -12,40 +12,12 @@
|
||||
#MOTIF_LIB=/usr/X11R6/lib
|
||||
#MOTIF_INC=/usr/X11R6/include
|
||||
|
||||
#With the release of Fedora Core 5 the
|
||||
#X11 and MOTIF libraries now live at /usr/lib
|
||||
X11_LIB=/usr/lib
|
||||
X11_INC=/usr/include
|
||||
MOTIF_LIB=/usr/lib
|
||||
MOTIF_INC=/usr/include
|
||||
|
||||
OPENWIN =
|
||||
WINGZ =
|
||||
MATHEMATICA =
|
||||
QUESTWIN =
|
||||
TK_TCL = /usr/lib
|
||||
IDL =
|
||||
|
||||
#JAVA_DIR=/usr/local/java
|
||||
#JAVA_DIR=/usr/java/j2sdk1.4.1
|
||||
JAVA_DIR=/usr
|
||||
JAVA_INC=$(JAVA_DIR)/include
|
||||
|
||||
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
|
||||
|
||||
CLAPACK_LIB = /usr/local/oag/3rdParty/CLAPACK/Linux_P4SSE2/lib
|
||||
ATLAS_LIB = /usr/local/oag/3rdParty/ATLAS/Linux_P4SSE2/lib
|
||||
F2C_LIB = /usr/local/oag/3rdParty/F2C/Linux_P4SSE2/lib
|
||||
CLAPACK_INCLUDE = /usr/local/oag/3rdParty/CLAPACK/Linux_P4SSE2/include
|
||||
ATLAS_INCLUDE = /usr/local/oag/3rdParty/ATLAS/Linux_P4SSE2/include
|
||||
|
||||
# Define XRTGRAPH_EXTENSIONS = YES only if using XRT/graph 3.x
|
||||
# and you want the extensions for MEDM
|
||||
#XRTGRAPH_EXTENSIONS = YES
|
||||
|
||||
@@ -18,13 +18,6 @@ MOTIF_INC=/usr/include
|
||||
#MOTIF_LIB=/usr/X11R6/lib64
|
||||
#MOTIF_INC=/usr/X11R6/include
|
||||
|
||||
# testing pre-compiled versions
|
||||
CLAPACK_LIB = /usr/local/oag/3rdParty/ATLAS/Linux_Core2Duo64SSE3/lib
|
||||
ATLAS_LIB = /usr/local/oag/3rdParty/ATLAS/Linux_Core2Duo64SSE3/lib
|
||||
ATLAS_INCLUDE = /usr/local/oag/3rdParty/ATLAS/Linux_Core2Duo64SSE3/include
|
||||
|
||||
JAVA_DIR=/usr
|
||||
|
||||
# Sciplot and XRTgraph used by medm
|
||||
SCIPLOT=YES
|
||||
#XRTGRAPH_EXTENSIONS = YES
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
#
|
||||
# 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.solaris-sparc.solaris-sparc
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
#
|
||||
# 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.solaris-sparc.solaris-sparc
|
||||
|
||||
@@ -1,88 +0,0 @@
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
# sun X11
|
||||
X11_LIB = /usr/openwin/lib
|
||||
X11_INC = /usr/openwin/include
|
||||
# mit X11
|
||||
#X11_LIB = /opt/X11R5/lib
|
||||
#X11_INC = /opt/X11R5/include
|
||||
# osf motif
|
||||
#MOTIF_INC = /opt/local/Motif2.0/include
|
||||
#MOTIF_LIB = /opt/local/Motif2.0/lib
|
||||
# sun SDK motif
|
||||
#MOTIF_INC = /opt/SUNWmotif/include
|
||||
#MOTIF_LIB = /opt/SUNWmotif/lib
|
||||
# sun 5.4,5.6 SDK motif
|
||||
MOTIF_INC = /usr/dt/include
|
||||
MOTIF_LIB = /usr/dt/lib
|
||||
OPENWIN = /usr/openwin
|
||||
|
||||
INTERVIEWS_BIN=/usr/local/interviews/bin/O.solaris
|
||||
INTERVIEWS_LIB=/usr/local/interviews/lib/O.solaris
|
||||
IV_INC=/usr/local/interviews/include
|
||||
IV-2_6_INC=/usr/local/interviews/include/IV-2_6
|
||||
IV_BIN=/usr/local/interviews/bin/O.solaris
|
||||
IV_LIB=/usr/local/interviews/lib/O.solaris
|
||||
|
||||
WINGZ_INC = /opt/local/Wingz2/incl
|
||||
WINGZ_LIB = /opt/local/Wingz2/lib
|
||||
#MATHEMATICA = /usr/local/math
|
||||
|
||||
# Define XRTGRAPH_EXTENSIONS = YES only if using XRT/graph 3.x
|
||||
# and you want the extensions for MEDM
|
||||
#XRTGRAPH_EXTENSIONS = YES
|
||||
#XRTGRAPH = /opt/local/xrtgraph
|
||||
SCIPLOT = YES
|
||||
|
||||
QUESTWIN = /usr/local/questwin
|
||||
|
||||
TK_LIB = /opt/local/lib
|
||||
TK_INC = /opt/local/include
|
||||
TCL_LIB = /opt/local/lib
|
||||
TCL_INC = /opt/local/include
|
||||
DP_LIB = /opt/local/lib
|
||||
DP_INC = /opt/local/include
|
||||
BLT_LIB = /opt/local/lib
|
||||
BLT_INC = /opt/local/include
|
||||
|
||||
IDL = /usr/local/idl
|
||||
# IDL=$(IDL)/external/rpc is the sun4 version
|
||||
IDLRPC = $(IDL)/external/rpc.solaris
|
||||
|
||||
# sun 5.4
|
||||
#JAVA_DIR=/opt/local/java
|
||||
# sun 5.6
|
||||
JAVA_DIR=/usr/java
|
||||
JAVA_INC=$(JAVA_DIR)/include
|
||||
|
||||
ZLIB_PREFIX = /usr/local/oag
|
||||
ZLIB = $(notdir $(wildcard $(ZLIB_PREFIX)/lib/libz.a))
|
||||
ifeq ($(ZLIB) , libz.a)
|
||||
ZLIB_LIB = $(ZLIB_PREFIX)/lib
|
||||
ZLIB_INC = -I$(ZLIB_PREFIX)/include
|
||||
ZLIB_CFLAG = -DzLib
|
||||
ZLIB_PROD_LIB = z
|
||||
z_DIR=$(ZLIB_PREFIX)/lib
|
||||
else
|
||||
ZLIB_LIB =
|
||||
ZLIB_INC =
|
||||
ZLIB_CFLAG =
|
||||
ZLIB_PROD_LIB =
|
||||
z_DIR=
|
||||
endif
|
||||
|
||||
PYTHON_DIR=/opt/local/lib/python2.2
|
||||
PYTHON_INCLUDE=/opt/local/include/python2.2
|
||||
|
||||
CLAPACK_LIB = /usr/local/oag/3rdParty/CLAPACK/SunOS_SunUS5/lib
|
||||
ATLAS_LIB = /usr/local/oag/3rdParty/ATLAS/SunOS_SunUS5/lib
|
||||
F2C_LIB = /usr/local/oag/3rdParty/F2C/SunOS_SunUS5/lib
|
||||
CLAPACK_INCLUDE = /usr/local/oag/3rdParty/CLAPACK/SunOS_SunUS5/include
|
||||
ATLAS_INCLUDE = /usr/local/oag/3rdParty/ATLAS/SunOS_SunUS5/include
|
||||
@@ -1,11 +0,0 @@
|
||||
#
|
||||
# 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.solaris-sparc64.solaris-sparc64
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
#
|
||||
# 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.solaris-sparc.solaris-sparc
|
||||
|
||||
FORCE_ZLIB_BUILD=YES
|
||||
|
||||
CLAPACK_LIB = /usr/local/oag/3rdParty/CLAPACK/SunOS_SunUSIII_4/lib
|
||||
ATLAS_LIB = /usr/local/oag/3rdParty/ATLAS/SunOS_SunUSIII_4/lib
|
||||
F2C_LIB = /usr/local/oag/3rdParty/F2C/SunOS_SunUSIII_4/lib
|
||||
CLAPACK_INCLUDE = /usr/local/oag/3rdParty/CLAPACK/SunOS_SunUSIII_4/include
|
||||
ATLAS_INCLUDE = /usr/local/oag/3rdParty/ATLAS/SunOS_SunUSIII_4/include
|
||||
|
||||
# Define XRTGRAPH_EXTENSIONS = YES only if using XRT/graph 3.x
|
||||
# and you want the extensions for MEDM
|
||||
#XRTGRAPH_EXTENSIONS =
|
||||
#XRTGRAPH =
|
||||
SCIPLOT = YES
|
||||
@@ -1,6 +0,0 @@
|
||||
#
|
||||
# Site Specific Configuration Information
|
||||
# Only the local epics system manager should modify this file
|
||||
|
||||
-include $(TOP)/configure/os/CONFIG_SITE.solaris-x86.solaris-x86
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
#
|
||||
# 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.solaris-x86.solaris-x86
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
#
|
||||
# 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.solaris-sparc.solaris-sparc
|
||||
|
||||
#XRTGRAPH_EXTENSIONS=
|
||||
#XRTGRAPH=
|
||||
SCIPLOT=YES
|
||||
|
||||
X11_LIB = /usr/lib
|
||||
X11_INC = /usr/include
|
||||
MOTIF_INC = /usr/include
|
||||
MOTIF_LIB = /usr/lib
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
#
|
||||
# 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.solaris-x86.solaris-x86
|
||||
|
||||
XRTGRAPH=
|
||||
SCIPLOT=YES
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
#
|
||||
# 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.cygwin-x86.cygwin-x86
|
||||
|
||||
@@ -56,31 +56,10 @@ ARCH_DEP_LDFLAGS_ML += /NODEFAULTLIB:"libcmtd.lib"
|
||||
|
||||
ARCH_DEP_LDFLAGS += $(ARCH_DEP_LDFLAGS_$(WIN32_RUNTIME))
|
||||
|
||||
# ---------- java definitions
|
||||
JAVA_DIR=c:/j2sdk1.4.1_01
|
||||
|
||||
# ---------- tcl/tk definitions
|
||||
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
|
||||
@@ -88,106 +67,8 @@ XRTGRAPH_EXTENSIONS = NO
|
||||
|
||||
SCIPLOT = YES
|
||||
|
||||
# z library created in SDDS extension
|
||||
ZLIB_CFLAG = -DzLib
|
||||
ZLIB_PROD_LIB = z
|
||||
z_DIR = $(EPICS_EXTENSIONS_LIB)
|
||||
|
||||
CLAPACK_INCLUDE = c:/CLAPACK/include
|
||||
CLAPACK_LIB = c:/CLAPACK/lib
|
||||
|
||||
EXCEED = Exceed13.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/Exceed/xdk/lib
|
||||
X11_INC = c:/Exceed/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
|
||||
ifeq ($(EXCEED),Exceed7.10)
|
||||
X11_LIB = c:/Exceed7.10/XDK/lib
|
||||
X11_INC = c:/Exceed7.10/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
|
||||
ifeq ($(EXCEED),Exceed10.0)
|
||||
XDK=C:/Exceed10.0/xdk
|
||||
X11_LIB = $(XDK)/lib
|
||||
X11_INC = $(XDK)/include
|
||||
#X11_LIB = c:/Exceed10.0/XDK/lib
|
||||
#X11_INC = c:/Exceed10.0/XDK/include
|
||||
EXCEED_XLIBS=XmStatic XmStatXt Xlib HCLXmu
|
||||
XmStatic_DIR=$(X11_LIB)
|
||||
XmStatXt_DIR=$(X11_LIB)
|
||||
Xlib_DIR=$(X11_LIB)
|
||||
HCLXmu_DIR=$(X11_LIB)
|
||||
EXCEED_CFLAGS=/DXMSTATIC /DMOTIFAPP
|
||||
endif
|
||||
ifeq ($(EXCEED),Exceed12.0)
|
||||
XDK=C:/Exceed12.0/XDK
|
||||
X11_LIB = $(XDK)/lib
|
||||
X11_INC = $(XDK)/include
|
||||
EXCEED_XLIBS=XmStatic XmStatXt Xlib HCLXmu
|
||||
XmStatic_DIR=$(X11_LIB)
|
||||
XmStatXt_DIR=$(X11_LIB)
|
||||
Xlib_DIR=$(X11_LIB)
|
||||
HCLXmu_DIR=$(X11_LIB)
|
||||
EXCEED_CFLAGS=/DXMSTATIC /DMOTIFAPP
|
||||
endif
|
||||
ifeq ($(EXCEED),Exceed13.0)
|
||||
XDK=C:/Exceed13.0/XDK
|
||||
X11_LIB = $(XDK)/lib
|
||||
@@ -200,15 +81,6 @@ ifeq ($(EXCEED),Exceed13.0)
|
||||
EXCEED_CFLAGS=/DXMSTATIC /DMOTIFAPP
|
||||
endif
|
||||
|
||||
|
||||
######################################################
|
||||
# Override for XFree86/LessTif
|
||||
#X11_LIB = c:/Cygwin/usr/X11R6/lib
|
||||
#X11_INC = c:/Cygwin/usr/X11R6/include
|
||||
#EXCEED_XLIBS = Xm Xt Xp Xmu X11 Xext
|
||||
#EXCEED_CFLAGS =
|
||||
######################################################
|
||||
|
||||
MOTIF_LIB = $(X11_LIB)
|
||||
MOTIF_INC = $(X11_INC)
|
||||
|
||||
|
||||
@@ -67,6 +67,7 @@ sub readRelease {
|
||||
my ($uvar) = m/^ undefine \s+ ($MVAR)/x;
|
||||
if ($uvar ne '') {
|
||||
delete $Rmacros->{$uvar};
|
||||
@$Rapps = grep($_ ne $uvar, @$Rapps);
|
||||
next;
|
||||
}
|
||||
|
||||
|
||||
+52
-10
@@ -8,7 +8,8 @@
|
||||
#*************************************************************************
|
||||
|
||||
# Tool to expand @VAR@ variables while copying a file.
|
||||
# The file will *not* be copied if it already exists.
|
||||
# The output file will *not* be written to if it already
|
||||
# exists and the expansion would leave the file unchanged.
|
||||
#
|
||||
# Author: Andrew Johnson <anj@aps.anl.gov>
|
||||
# Date: 10 February 2005
|
||||
@@ -22,11 +23,10 @@ use lib ("$Bin/../../lib/perl");
|
||||
use EPICS::Getopts;
|
||||
use EPICS::Path;
|
||||
use EPICS::Release;
|
||||
use EPICS::Copy;
|
||||
|
||||
# Process command line options
|
||||
our ($opt_a, $opt_d, @opt_D, $opt_h, $opt_t);
|
||||
getopts('a:dD@ht:')
|
||||
our ($opt_a, $opt_d, @opt_D, $opt_h, $opt_q, $opt_t);
|
||||
getopts('a:dD@hqt:')
|
||||
or HELP_MESSAGE();
|
||||
|
||||
# Handle the -h command
|
||||
@@ -43,7 +43,6 @@ my $outfile = shift
|
||||
|
||||
# Where are we?
|
||||
my $top = AbsPath($opt_t);
|
||||
print "TOP = $top\n" if $opt_d;
|
||||
|
||||
# Read RELEASE file into vars
|
||||
my %vars = (TOP => $top);
|
||||
@@ -56,20 +55,63 @@ $vars{'ARCH'} = $opt_a if $opt_a;
|
||||
while ($_ = shift @opt_D) {
|
||||
m/^ (\w+) \s* = \s* (.*) $/x;
|
||||
$vars{$1} = $2;
|
||||
print "$1 = $2\n" if $opt_d;
|
||||
}
|
||||
|
||||
# Do it!
|
||||
copyFile($infile, $outfile, \%vars);
|
||||
print "Variables defined:\n",
|
||||
map " $_ = $vars{$_}\n", sort keys %vars
|
||||
if $opt_d;
|
||||
|
||||
##### File contains subroutines only below here
|
||||
# Generate the expanded output
|
||||
open(my $SRC, '<', $infile)
|
||||
or die "$! reading $infile\n";
|
||||
|
||||
my $vf=0;
|
||||
my %nf;
|
||||
my $output = join '', map {
|
||||
# Substitute any @VARS@ in the text
|
||||
s{@([A-Za-z0-9_]+)@}
|
||||
{exists $vars{$1} ? (++$vf, $vars{$1}) : (++$nf{$1}, "\@$1\@")}eg;
|
||||
$_
|
||||
} <$SRC>;
|
||||
close $SRC;
|
||||
|
||||
my $vn = scalar %nf;
|
||||
print "Expanded $infile => $outfile with $vf successes, $vn failures\n",
|
||||
map {" \@$_\@ - " . $nf{$_} . " instance(s)\n"} keys %nf
|
||||
if $opt_d;
|
||||
|
||||
# Check if the output file matches
|
||||
my $DST;
|
||||
if (open($DST, '+<', $outfile)) {
|
||||
|
||||
my $actual = join('', <$DST>);
|
||||
|
||||
if ($actual eq $output) {
|
||||
close $DST;
|
||||
print "expandVars.pl: Keeping existing output file $outfile\n"
|
||||
unless $opt_q;
|
||||
exit 0;
|
||||
}
|
||||
|
||||
seek $DST, 0, 0;
|
||||
truncate $DST, 0;
|
||||
} else {
|
||||
open($DST, '>', $outfile)
|
||||
or die "Can't create $outfile: $!\n";
|
||||
}
|
||||
|
||||
print $DST $output;
|
||||
close $DST;
|
||||
exit 0;
|
||||
|
||||
##### Subroutines only below here
|
||||
|
||||
sub HELP_MESSAGE {
|
||||
print STDERR <<EOF;
|
||||
Usage:
|
||||
expandVars.pl -h
|
||||
Display this Usage message
|
||||
expandVars.pl -t /path/to/top [-a arch] -D var=val ... infile outfile
|
||||
expandVars.pl -t /path/to/top [-a arch] -D var=val ... [-q] infile outfile
|
||||
Expand vars in infile to generate outfile
|
||||
EOF
|
||||
exit $opt_h ? 0 : 1;
|
||||
|
||||
@@ -15,6 +15,7 @@ use FindBin qw($Bin);
|
||||
use lib "$Bin/../../lib/perl";
|
||||
|
||||
use EPICS::Getopts;
|
||||
use EPICS::Path;
|
||||
use POSIX qw(strftime);
|
||||
|
||||
use strict;
|
||||
@@ -29,7 +30,10 @@ our $opt_t = '.';
|
||||
our $opt_N = 'VCSVERSION';
|
||||
our $opt_V = $now;
|
||||
|
||||
our $RevDate = $now;
|
||||
|
||||
my $vcs;
|
||||
my $cv;
|
||||
|
||||
getopts('dhivqt:N:V:') && @ARGV == 1
|
||||
or HELP_MESSAGE();
|
||||
@@ -38,13 +42,19 @@ my ($outfile) = @ARGV;
|
||||
|
||||
if ($opt_d) { exit 0 } # exit if make is run in dry-run mode
|
||||
|
||||
if (!$vcs && -d "$opt_t/_darcs") { # Darcs
|
||||
# Save abs-path to output filename; chdir <top>
|
||||
my $absfile = AbsPath($outfile);
|
||||
chdir $opt_t or
|
||||
die "Can't cd to $opt_t: $!\n";
|
||||
|
||||
if (-d '_darcs') { # Darcs
|
||||
print "== Found <top>/_darcs directory\n" if $opt_v;
|
||||
# v1-4-dirty
|
||||
# is tag 'v1' plus 4 patches
|
||||
# with uncommited modifications
|
||||
my $result = `cd "$opt_t" && echo "\$(darcs show tags | head -1)-\$((\$(darcs changes --count --from-tag .)-1))"`;
|
||||
chomp $result;
|
||||
my @tags = `darcs show tags`;
|
||||
my $count = `darcs changes --count --from-tag .` - 1;
|
||||
my $result = $tags[0] . '-' . $count;
|
||||
print "== darcs show tags, changes:\n$result\n==\n" if $opt_v;
|
||||
if (!$? && $result ne '') {
|
||||
$opt_V = $result;
|
||||
@@ -53,8 +63,10 @@ if (!$vcs && -d "$opt_t/_darcs") { # Darcs
|
||||
my $hasmod = `darcs whatsnew --repodir="$opt_t" -l`;
|
||||
$opt_V .= '-dirty' unless $?;
|
||||
}
|
||||
$cv = `darcs log --last 1`;
|
||||
$cv =~ s/\A .* Date: \s+ ( [^\n]+ ) .* \z/$1/sx;
|
||||
}
|
||||
if (!$vcs && -d "$opt_t/.hg") { # Mercurial
|
||||
elsif (-d '.hg') { # Mercurial
|
||||
print "== Found <top>/.hg directory\n" if $opt_v;
|
||||
# v1-4-abcdef-dirty
|
||||
# is 4 commits after tag 'v1' with short hash abcdef
|
||||
@@ -69,8 +81,9 @@ if (!$vcs && -d "$opt_t/.hg") { # Mercurial
|
||||
chomp $hasmod;
|
||||
$opt_V .= '-dirty' if $hasmod ne '';
|
||||
}
|
||||
$cv = `hg log -l1 --template '{date|isodate}'`
|
||||
}
|
||||
if (!$vcs && -d "$opt_t/.git") { # Git
|
||||
elsif (-d '.git') { # Git
|
||||
print "== Found <top>/.git directory\n" if $opt_v;
|
||||
# v1-4-abcdef-dirty
|
||||
# is 4 commits after tag 'v1' with short hash abcdef
|
||||
@@ -82,23 +95,25 @@ if (!$vcs && -d "$opt_t/.git") { # Git
|
||||
$opt_V = $result;
|
||||
$vcs = 'Git';
|
||||
}
|
||||
$cv = `git show -s --format=%ci HEAD`;
|
||||
}
|
||||
if (!$vcs && -d "$opt_t/.svn") { # Subversion
|
||||
elsif (-d '.svn') { # Subversion
|
||||
print "== Found <top>/.svn directory\n" if $opt_v;
|
||||
# 12345-dirty
|
||||
my $result = `cd "$opt_t" && svn info --non-interactive`;
|
||||
my $result = `svn info --non-interactive`;
|
||||
chomp $result;
|
||||
print "== svn info:\n$result\n==\n" if $opt_v;
|
||||
if (!$? && $result =~ /^Revision:\s*(\d+)/m) {
|
||||
$opt_V = $1;
|
||||
$vcs = 'Subversion';
|
||||
# see if working copy has modifications, additions, removals, or missing files
|
||||
my $hasmod = `cd "$opt_t" && svn status --non-interactive`;
|
||||
my $hasmod = `svn status --non-interactive`;
|
||||
chomp $hasmod;
|
||||
$opt_V .= '-dirty' if $hasmod ne '';
|
||||
}
|
||||
$cv = `svn info --show-item last-changed-date`;
|
||||
}
|
||||
if (!$vcs && -d "$opt_t/.bzr") { # Bazaar
|
||||
elsif (-d '.bzr') { # Bazaar
|
||||
print "== Found <top>/.bzr directory\n" if $opt_v;
|
||||
# 12444-anj@aps.anl.gov-20131003210403-icfd8mc37g8vctpf-dirty
|
||||
my $result = `bzr version-info -q --custom --template="{revno}-{revision_id}-{clean}"`;
|
||||
@@ -108,8 +123,9 @@ if (!$vcs && -d "$opt_t/.bzr") { # Bazaar
|
||||
$opt_V = $result;
|
||||
$vcs = 'Bazaar';
|
||||
}
|
||||
$cv = `bzr version-info -q --custom --template='{date}'`;
|
||||
}
|
||||
if (!$vcs) {
|
||||
else {
|
||||
print "== No VCS directories\n" if $opt_v;
|
||||
if ($opt_V eq '') {
|
||||
$vcs = 'build date/time';
|
||||
@@ -120,6 +136,9 @@ if (!$vcs) {
|
||||
}
|
||||
}
|
||||
|
||||
chomp $cv;
|
||||
$RevDate=$vcs . ': ' . $cv;
|
||||
|
||||
my $output = << "__END";
|
||||
/* Generated file, do not edit! */
|
||||
|
||||
@@ -128,12 +147,16 @@ my $output = << "__END";
|
||||
#ifndef $opt_N
|
||||
#define $opt_N \"$opt_V\"
|
||||
#endif
|
||||
#ifndef ${opt_N}_DATE
|
||||
#define ${opt_N}_DATE \"$RevDate\"
|
||||
#endif
|
||||
__END
|
||||
|
||||
print "== Want:\n$output==\n" if $opt_v;
|
||||
|
||||
my $DST;
|
||||
if (open($DST, '+<', $outfile)) {
|
||||
if (open($DST, '+<', $absfile)) {
|
||||
|
||||
my $actual = join('', <$DST>);
|
||||
print "== Current:\n$actual==\n" if $opt_v;
|
||||
|
||||
@@ -162,7 +185,7 @@ if (open($DST, '+<', $outfile)) {
|
||||
print "Creating VCS header $outfile\n",
|
||||
" $opt_N = \"$opt_V\"\n"
|
||||
unless $opt_q;
|
||||
open($DST, '>', $outfile)
|
||||
open($DST, '>', $absfile)
|
||||
or die "Can't create $outfile: $!\n";
|
||||
}
|
||||
|
||||
@@ -190,4 +213,3 @@ Usage:
|
||||
EOF
|
||||
exit $opt_h ? 0 : 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
# be set at runtime, which will override any compiled-in setting but the
|
||||
# 'make runtests' command can't give a different timeout for each test.
|
||||
|
||||
use 5.10.1; # This script uses the defined-or operator //
|
||||
use strict;
|
||||
|
||||
use File::Basename;
|
||||
|
||||
Reference in New Issue
Block a user