From 2cf6f43c5f6b45d7e05d7375a3a524a69e27aa24 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Fri, 17 Dec 2010 12:21:29 -0500 Subject: [PATCH] Split up src/util Move log server into libCom with the log client. Move caRepeater init script and ca_test into ca/client/ --- src/Makefile | 3 -- src/ca/client/Makefile | 13 ++++++++ src/{util => ca/client}/rc2.caRepeater | 0 src/{util => ca/client/test}/ca_test.c | 0 src/{util => ca/client/test}/ca_test.h | 0 src/{util => ca/client/test}/ca_test_main.c | 0 src/libCom/Makefile | 16 +++++++++- src/libCom/{logClient => log}/iocLog.c | 0 src/libCom/{logClient => log}/iocLog.h | 0 src/{util => libCom/log}/iocLogServer.c | 0 src/libCom/{logClient => log}/logClient.c | 0 src/libCom/{logClient => log}/logClient.h | 0 src/{util => libCom/log}/rc2.logServer | 0 src/util/Makefile | 35 --------------------- 14 files changed, 28 insertions(+), 39 deletions(-) rename src/{util => ca/client}/rc2.caRepeater (100%) rename src/{util => ca/client/test}/ca_test.c (100%) rename src/{util => ca/client/test}/ca_test.h (100%) rename src/{util => ca/client/test}/ca_test_main.c (100%) rename src/libCom/{logClient => log}/iocLog.c (100%) rename src/libCom/{logClient => log}/iocLog.h (100%) rename src/{util => libCom/log}/iocLogServer.c (100%) rename src/libCom/{logClient => log}/logClient.c (100%) rename src/libCom/{logClient => log}/logClient.h (100%) rename src/{util => libCom/log}/rc2.logServer (100%) delete mode 100644 src/util/Makefile diff --git a/src/Makefile b/src/Makefile index 0c8d312e1..27f070cac 100644 --- a/src/Makefile +++ b/src/Makefile @@ -48,9 +48,6 @@ ioc/db_DEPEND_DIRS = ioc/bpt ca/client DIRS += ioc/as ioc/as_DEPEND_DIRS = ioc/db libCom/as -DIRS += util -util_DEPEND_DIRS = ca/client - DIRS += ioc/dbtemplate ioc/dbtemplate_DEPEND_DIRS = ioc/db diff --git a/src/ca/client/Makefile b/src/ca/client/Makefile index 612209396..912295ac5 100644 --- a/src/ca/client/Makefile +++ b/src/ca/client/Makefile @@ -95,5 +95,18 @@ caConnTest_SRCS = caConnTestMain.cpp caConnTest.cpp casw_SYS_LIBS_solaris = socket +SCRIPTS_solaris := S99caRepeater +SCRIPTS_Linux := S99caRepeater + +SRC_DIRS += $(TOP)/src/ca/client/test +PROD_HOST += ca_test +ca_test_SRCS = ca_test_main.c ca_test.c +ca_test_LIBS = ca Com +ca_test_SYS_LIBS_WIN32 = ws2_32 advapi32 user32 + +OBJS_vxWorks += ca_test + include $(TOP)/configure/RULES +S99%: ../rc2.% + sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@ diff --git a/src/util/rc2.caRepeater b/src/ca/client/rc2.caRepeater similarity index 100% rename from src/util/rc2.caRepeater rename to src/ca/client/rc2.caRepeater diff --git a/src/util/ca_test.c b/src/ca/client/test/ca_test.c similarity index 100% rename from src/util/ca_test.c rename to src/ca/client/test/ca_test.c diff --git a/src/util/ca_test.h b/src/ca/client/test/ca_test.h similarity index 100% rename from src/util/ca_test.h rename to src/ca/client/test/ca_test.h diff --git a/src/util/ca_test_main.c b/src/ca/client/test/ca_test_main.c similarity index 100% rename from src/util/ca_test_main.c rename to src/ca/client/test/ca_test_main.c diff --git a/src/libCom/Makefile b/src/libCom/Makefile index 117132fc7..380cbdac4 100644 --- a/src/libCom/Makefile +++ b/src/libCom/Makefile @@ -110,12 +110,23 @@ SRCS += iocsh.cpp SRCS += registry.c SRCS += libComRegister.c -SRC_DIRS += $(LIBCOM)/logClient +SRC_DIRS += $(LIBCOM)/log INC += iocLog.h INC += logClient.h SRCS += iocLog.c SRCS += logClient.c +PROD_HOST += iocLogServer + +iocLogServer_SYS_LIBS_solaris += socket +iocLogServer_SYS_LIBS_WIN32 += user32 + +iocLogServer_SRCS = iocLogServer.c +iocLogServer_LIBS = Com + +SCRIPTS_solaris := S99logServer +SCRIPTS_Linux := S99logServer + SRC_DIRS += $(LIBCOM)/macLib INC += macLib.h SRCS += macCore.c @@ -321,6 +332,9 @@ errSymTbl.c: $(ERR_S_FILES) $(LIBCOM)/error/makeStatTbl.pl $(COMMON_DIR)/epicsVersion.h: $(CONFIG)/CONFIG_BASE_VERSION $(CONFIG)/CONFIG_SITE $(PERL) $(LIBCOM)/misc/makeEpicsVersion.pl $(CONFIG)/CONFIG_BASE_VERSION $(@D) $(EPICS_SITE_VERSION) +S99%: ../log/rc2.% + sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@ + clean:: @$(RM) errSymTbl.c envData.c diff --git a/src/libCom/logClient/iocLog.c b/src/libCom/log/iocLog.c similarity index 100% rename from src/libCom/logClient/iocLog.c rename to src/libCom/log/iocLog.c diff --git a/src/libCom/logClient/iocLog.h b/src/libCom/log/iocLog.h similarity index 100% rename from src/libCom/logClient/iocLog.h rename to src/libCom/log/iocLog.h diff --git a/src/util/iocLogServer.c b/src/libCom/log/iocLogServer.c similarity index 100% rename from src/util/iocLogServer.c rename to src/libCom/log/iocLogServer.c diff --git a/src/libCom/logClient/logClient.c b/src/libCom/log/logClient.c similarity index 100% rename from src/libCom/logClient/logClient.c rename to src/libCom/log/logClient.c diff --git a/src/libCom/logClient/logClient.h b/src/libCom/log/logClient.h similarity index 100% rename from src/libCom/logClient/logClient.h rename to src/libCom/log/logClient.h diff --git a/src/util/rc2.logServer b/src/libCom/log/rc2.logServer similarity index 100% rename from src/util/rc2.logServer rename to src/libCom/log/rc2.logServer diff --git a/src/util/Makefile b/src/util/Makefile deleted file mode 100644 index 5ca7c798a..000000000 --- a/src/util/Makefile +++ /dev/null @@ -1,35 +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 is distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. -#************************************************************************* -TOP=../.. - -include $(TOP)/configure/CONFIG - -PROD_LIBS = ca Com - -# -# Added winmm user32 for the non-dll build -# -PROD_HOST_DEFAULT = ca_test iocLogServer -PROD_HOST_WIN32 = ca_test iocLogServer -PROD_SYS_LIBS_WIN32 = ws2_32 advapi32 user32 - -iocLogServer_SYS_LIBS_solaris = socket - -ca_test_SRCS = ca_test_main.c ca_test.c -iocLogServer_SRCS = iocLogServer.c - -OBJS_vxWorks = ca_test - -SCRIPTS_solaris := S99logServer S99caRepeater -SCRIPTS_Linux := S99logServer S99caRepeater - -include $(TOP)/configure/RULES - -S99%: ../rc2.% - sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@