std: Build in std/test, into libdbRecStd

This commit is contained in:
Andrew Johnson
2011-08-26 13:41:25 -05:00
parent e15e42cff3
commit 239e1487e1
3 changed files with 9 additions and 49 deletions

View File

@@ -1,5 +1,5 @@
#*************************************************************************
# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
@@ -19,8 +19,9 @@ dbRecStd_LIBS = dbCore ca Com
dbRecStd_RCS += dbRecStd.rc
include $(STDDIR)/dev/Makefile
include $(STDDIR)/rec/Makefile
include $(STDDIR)/dev/Makefile
include $(STDDIR)/test/Makefile
include $(STDDIR)/softIoc/Makefile
include $(TOP)/configure/RULES

View File

@@ -1,22 +1,17 @@
#*************************************************************************
# Copyright (c) 2008 UChicago Argonne LLC, as Operator of Argonne
# Copyright (c) 2011 UChicago Argonne LLC, 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 is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************
TOP=../../..
include $(TOP)/configure/CONFIG
# This is a Makefile fragment, see src/std/Makefile.
SRC_DIRS += $(STDDIR)/test
DBD += devTestAsyn.dbd
LIBSRCS += devHistogramTestAsyn.c
LIBSRCS += devTestAsyn.c
LIBRARY_IOC = testDevIoc
testDevIoc_LIBS += miscIoc recIoc asIoc dbIoc registryIoc dbStaticIoc ca Com
testDevIoc_RCS = testDevIoc.rc
include $(TOP)/configure/RULES
dbRecStd_SRCS += devHistogramTestAsyn.c
dbRecStd_SRCS += devTestAsyn.c

View File

@@ -1,36 +0,0 @@
#include <Winver.h>
#include "epicsVersion.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS__WINDOWS32
FILETYPE VFT_UNKNOWN
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments","Test Device Support Library for EPICS\0"
VALUE "CompanyName", "The EPICS collaboration\0"
VALUE "FileDescription", "Test Device Support Library\0"
VALUE "FileVersion", EPICS_VERSION_STRING "\0"
VALUE "InternalName", "testDevIoc\0"
VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
VALUE "OriginalFilename", "testDevIoc.dll\0"
VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END