Rename pvDataApp to src, adjust Makefiles.

2014-03-28 10:20:24 -05:00
parent 1e40797bc4
commit 19269735ae
93 changed files with 29 additions and 29 deletions
--- a/4
+++ b/4
@@ -5,10 +5,10 @@ include $(TOP)/configure/CONFIG

 DIRS += configure

-DIRS += pvDataApp
+DIRS += src
 pvDataApp_DEPEND_DIRS = configure

 DIRS += testApp
-testApp_DEPEND_DIRS = pvDataApp
+testApp_DEPEND_DIRS = src

 include $(TOP)/configure/RULES_TOP
--- a/pvDataApp/Makefile
+++ b/pvDataApp/Makefile
@@ -1,21 +0,0 @@
-# Makefile for the pvData library
-
-TOP = ..
-include $(TOP)/configure/CONFIG
-
-PVDATAAPP = $(TOP)/pvDataApp
-
-include $(PVDATAAPP)/misc/Makefile
-include $(PVDATAAPP)/pv/Makefile
-include $(PVDATAAPP)/factory/Makefile
-include $(PVDATAAPP)/property/Makefile
-include $(PVDATAAPP)/pvMisc/Makefile
-include $(PVDATAAPP)/monitor/Makefile
-
-LIBRARY = pvData
-pvData_LIBS += Com
-
-USR_CXXFLAGS_RTEMS = -D__rtems__
-
-include $(TOP)/configure/RULES
-
--- a/src/Makefile
+++ b/src/Makefile
@@ -0,0 +1,21 @@
+# Makefile for the pvData library
+
+TOP = ..
+include $(TOP)/configure/CONFIG
+
+PVDATASRC = $(TOP)/src
+
+include $(PVDATASRC)/misc/Makefile
+include $(PVDATASRC)/pv/Makefile
+include $(PVDATASRC)/factory/Makefile
+include $(PVDATASRC)/property/Makefile
+include $(PVDATASRC)/pvMisc/Makefile
+include $(PVDATASRC)/monitor/Makefile
+
+LIBRARY = pvData
+pvData_LIBS += Com
+
+USR_CXXFLAGS_RTEMS = -D__rtems__
+
+include $(TOP)/configure/RULES
+
--- a/pvDataApp/factory/Compare.cpp
+++ b/pvDataApp/factory/Compare.cpp
--- a/pvDataApp/factory/Convert.cpp
+++ b/pvDataApp/factory/Convert.cpp
--- a/pvDataApp/factory/FieldCreateFactory.cpp
+++ b/pvDataApp/factory/FieldCreateFactory.cpp
--- a/pvDataApp/factory/Makefile
+++ b/pvDataApp/factory/Makefile
@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile

-SRC_DIRS += $(PVDATAAPP)/factory
+SRC_DIRS += $(PVDATASRC)/factory

 INC += factory.h
 LIBSRCS += TypeFunc.cpp
--- a/pvDataApp/factory/PVArray.cpp
+++ b/pvDataApp/factory/PVArray.cpp
--- a/pvDataApp/factory/PVAuxInfoImpl.cpp
+++ b/pvDataApp/factory/PVAuxInfoImpl.cpp
--- a/pvDataApp/factory/PVDataCreateFactory.cpp
+++ b/pvDataApp/factory/PVDataCreateFactory.cpp
--- a/pvDataApp/factory/PVField.cpp
+++ b/pvDataApp/factory/PVField.cpp
--- a/pvDataApp/factory/PVScalar.cpp
+++ b/pvDataApp/factory/PVScalar.cpp
--- a/pvDataApp/factory/PVScalarArray.cpp
+++ b/pvDataApp/factory/PVScalarArray.cpp
--- a/pvDataApp/factory/PVStructure.cpp
+++ b/pvDataApp/factory/PVStructure.cpp
--- a/pvDataApp/factory/PVStructureArray.cpp
+++ b/pvDataApp/factory/PVStructureArray.cpp
--- a/pvDataApp/factory/PVUnion.cpp
+++ b/pvDataApp/factory/PVUnion.cpp
--- a/pvDataApp/factory/PVUnionArray.cpp
+++ b/pvDataApp/factory/PVUnionArray.cpp
--- a/pvDataApp/factory/StandardField.cpp
+++ b/pvDataApp/factory/StandardField.cpp
--- a/pvDataApp/factory/StandardPVField.cpp
+++ b/pvDataApp/factory/StandardPVField.cpp
--- a/pvDataApp/factory/TypeFunc.cpp
+++ b/pvDataApp/factory/TypeFunc.cpp
--- a/pvDataApp/factory/factory.h
+++ b/pvDataApp/factory/factory.h
--- a/pvDataApp/factory/printer.cpp
+++ b/pvDataApp/factory/printer.cpp
--- a/pvDataApp/factory/pvSubArrayCopy.cpp
+++ b/pvDataApp/factory/pvSubArrayCopy.cpp
--- a/pvDataApp/misc/Makefile
+++ b/pvDataApp/misc/Makefile
@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile

-SRC_DIRS += $(PVDATAAPP)/misc
+SRC_DIRS += $(PVDATASRC)/misc

 INC += noDefaultMethods.h
 INC += lock.h
--- a/pvDataApp/misc/bitSet.cpp
+++ b/pvDataApp/misc/bitSet.cpp
--- a/pvDataApp/misc/bitSet.h
+++ b/pvDataApp/misc/bitSet.h
--- a/pvDataApp/misc/byteBuffer.cpp
+++ b/pvDataApp/misc/byteBuffer.cpp
--- a/pvDataApp/misc/byteBuffer.h
+++ b/pvDataApp/misc/byteBuffer.h
--- a/pvDataApp/misc/current_function.h
+++ b/pvDataApp/misc/current_function.h
--- a/pvDataApp/misc/destroyable.h
+++ b/pvDataApp/misc/destroyable.h
--- a/pvDataApp/misc/epicsException.cpp
+++ b/pvDataApp/misc/epicsException.cpp
--- a/pvDataApp/misc/epicsException.h
+++ b/pvDataApp/misc/epicsException.h
--- a/pvDataApp/misc/event.cpp
+++ b/pvDataApp/misc/event.cpp
--- a/pvDataApp/misc/event.h
+++ b/pvDataApp/misc/event.h
--- a/pvDataApp/misc/executor.cpp
+++ b/pvDataApp/misc/executor.cpp
--- a/pvDataApp/misc/executor.h
+++ b/pvDataApp/misc/executor.h
--- a/pvDataApp/misc/localStaticLock.cpp
+++ b/pvDataApp/misc/localStaticLock.cpp
--- a/pvDataApp/misc/localStaticLock.h
+++ b/pvDataApp/misc/localStaticLock.h
--- a/pvDataApp/misc/lock.h
+++ b/pvDataApp/misc/lock.h
--- a/pvDataApp/misc/messageQueue.cpp
+++ b/pvDataApp/misc/messageQueue.cpp
--- a/pvDataApp/misc/messageQueue.h
+++ b/pvDataApp/misc/messageQueue.h
--- a/pvDataApp/misc/noDefaultMethods.h
+++ b/pvDataApp/misc/noDefaultMethods.h
--- a/pvDataApp/misc/parseToPOD.cpp
+++ b/pvDataApp/misc/parseToPOD.cpp
--- a/pvDataApp/misc/queue.h
+++ b/pvDataApp/misc/queue.h
--- a/pvDataApp/misc/requester.cpp
+++ b/pvDataApp/misc/requester.cpp
--- a/pvDataApp/misc/requester.h
+++ b/pvDataApp/misc/requester.h
--- a/pvDataApp/misc/serialize.h
+++ b/pvDataApp/misc/serialize.h
--- a/pvDataApp/misc/serializeHelper.cpp
+++ b/pvDataApp/misc/serializeHelper.cpp
--- a/pvDataApp/misc/serializeHelper.h
+++ b/pvDataApp/misc/serializeHelper.h
--- a/pvDataApp/misc/sharedPtr.h
+++ b/pvDataApp/misc/sharedPtr.h
--- a/pvDataApp/misc/sharedVector.h
+++ b/pvDataApp/misc/sharedVector.h
--- a/pvDataApp/misc/status.cpp
+++ b/pvDataApp/misc/status.cpp
--- a/pvDataApp/misc/status.h
+++ b/pvDataApp/misc/status.h
--- a/pvDataApp/misc/templateMeta.h
+++ b/pvDataApp/misc/templateMeta.h
--- a/pvDataApp/misc/thread.h
+++ b/pvDataApp/misc/thread.h
--- a/pvDataApp/misc/timeFunction.cpp
+++ b/pvDataApp/misc/timeFunction.cpp
--- a/pvDataApp/misc/timeFunction.h
+++ b/pvDataApp/misc/timeFunction.h
--- a/pvDataApp/misc/timer.cpp
+++ b/pvDataApp/misc/timer.cpp
--- a/pvDataApp/misc/timer.h
+++ b/pvDataApp/misc/timer.h
--- a/pvDataApp/misc/typeCast.cpp
+++ b/pvDataApp/misc/typeCast.cpp
--- a/pvDataApp/misc/typeCast.h
+++ b/pvDataApp/misc/typeCast.h
--- a/pvDataApp/monitor/Makefile
+++ b/pvDataApp/monitor/Makefile
@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile

-SRC_DIRS += $(PVDATAAPP)/monitor
+SRC_DIRS += $(PVDATASRC)/monitor

 INC += monitor.h

--- a/pvDataApp/monitor/monitor.cpp
+++ b/pvDataApp/monitor/monitor.cpp
--- a/pvDataApp/monitor/monitor.h
+++ b/pvDataApp/monitor/monitor.h
--- a/pvDataApp/property/Makefile
+++ b/pvDataApp/property/Makefile
@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile

-SRC_DIRS += $(PVDATAAPP)/property
+SRC_DIRS += $(PVDATASRC)/property

 INC += alarm.h
 INC += pvAlarm.h
--- a/pvDataApp/property/alarm.cpp
+++ b/pvDataApp/property/alarm.cpp
--- a/pvDataApp/property/alarm.h
+++ b/pvDataApp/property/alarm.h
--- a/pvDataApp/property/control.h
+++ b/pvDataApp/property/control.h
--- a/pvDataApp/property/display.h
+++ b/pvDataApp/property/display.h
--- a/pvDataApp/property/pvAlarm.cpp
+++ b/pvDataApp/property/pvAlarm.cpp
--- a/pvDataApp/property/pvAlarm.h
+++ b/pvDataApp/property/pvAlarm.h
--- a/pvDataApp/property/pvControl.cpp
+++ b/pvDataApp/property/pvControl.cpp
--- a/pvDataApp/property/pvControl.h
+++ b/pvDataApp/property/pvControl.h
--- a/pvDataApp/property/pvDisplay.cpp
+++ b/pvDataApp/property/pvDisplay.cpp
--- a/pvDataApp/property/pvDisplay.h
+++ b/pvDataApp/property/pvDisplay.h
--- a/pvDataApp/property/pvEnumerated.cpp
+++ b/pvDataApp/property/pvEnumerated.cpp
--- a/pvDataApp/property/pvEnumerated.h
+++ b/pvDataApp/property/pvEnumerated.h
--- a/pvDataApp/property/pvTimeStamp.cpp
+++ b/pvDataApp/property/pvTimeStamp.cpp
--- a/pvDataApp/property/pvTimeStamp.h
+++ b/pvDataApp/property/pvTimeStamp.h
--- a/pvDataApp/property/timeStamp.cpp
+++ b/pvDataApp/property/timeStamp.cpp
--- a/pvDataApp/property/timeStamp.h
+++ b/pvDataApp/property/timeStamp.h
--- a/pvDataApp/pv/Makefile
+++ b/pvDataApp/pv/Makefile
@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile

-SRC_DIRS += $(PVDATAAPP)/pv
+SRC_DIRS += $(PVDATASRC)/pv

 INC += pvType.h
 INC += pvIntrospect.h
--- a/pvDataApp/pv/convert.h
+++ b/pvDataApp/pv/convert.h
--- a/pvDataApp/pv/printer.h
+++ b/pvDataApp/pv/printer.h
--- a/pvDataApp/pv/pvData.h
+++ b/pvDataApp/pv/pvData.h
--- a/pvDataApp/pv/pvIntrospect.h
+++ b/pvDataApp/pv/pvIntrospect.h
--- a/pvDataApp/pv/pvSubArrayCopy.h
+++ b/pvDataApp/pv/pvSubArrayCopy.h
--- a/pvDataApp/pv/pvType.h
+++ b/pvDataApp/pv/pvType.h
--- a/pvDataApp/pv/standardField.h
+++ b/pvDataApp/pv/standardField.h
--- a/pvDataApp/pv/standardPVField.h
+++ b/pvDataApp/pv/standardPVField.h
--- a/pvDataApp/pvMisc/Makefile
+++ b/pvDataApp/pvMisc/Makefile
@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile

-SRC_DIRS += $(PVDATAAPP)/pvMisc
+SRC_DIRS += $(PVDATASRC)/pvMisc

 INC += bitSetUtil.h

--- a/pvDataApp/pvMisc/bitSetUtil.cpp
+++ b/pvDataApp/pvMisc/bitSetUtil.cpp
--- a/pvDataApp/pvMisc/bitSetUtil.h
+++ b/pvDataApp/pvMisc/bitSetUtil.h