diff --git a/Makefile b/Makefile index 66fe0f5..bee3a67 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/pvDataApp/Makefile b/pvDataApp/Makefile deleted file mode 100644 index 7a79091..0000000 --- a/pvDataApp/Makefile +++ /dev/null @@ -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 - diff --git a/src/Makefile b/src/Makefile new file mode 100644 index 0000000..fea10f3 --- /dev/null +++ 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 + diff --git a/pvDataApp/factory/Compare.cpp b/src/factory/Compare.cpp similarity index 100% rename from pvDataApp/factory/Compare.cpp rename to src/factory/Compare.cpp diff --git a/pvDataApp/factory/Convert.cpp b/src/factory/Convert.cpp similarity index 100% rename from pvDataApp/factory/Convert.cpp rename to src/factory/Convert.cpp diff --git a/pvDataApp/factory/FieldCreateFactory.cpp b/src/factory/FieldCreateFactory.cpp similarity index 100% rename from pvDataApp/factory/FieldCreateFactory.cpp rename to src/factory/FieldCreateFactory.cpp diff --git a/pvDataApp/factory/Makefile b/src/factory/Makefile similarity index 94% rename from pvDataApp/factory/Makefile rename to src/factory/Makefile index 1c071b4..3b51d4e 100644 --- a/pvDataApp/factory/Makefile +++ b/src/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 diff --git a/pvDataApp/factory/PVArray.cpp b/src/factory/PVArray.cpp similarity index 100% rename from pvDataApp/factory/PVArray.cpp rename to src/factory/PVArray.cpp diff --git a/pvDataApp/factory/PVAuxInfoImpl.cpp b/src/factory/PVAuxInfoImpl.cpp similarity index 100% rename from pvDataApp/factory/PVAuxInfoImpl.cpp rename to src/factory/PVAuxInfoImpl.cpp diff --git a/pvDataApp/factory/PVDataCreateFactory.cpp b/src/factory/PVDataCreateFactory.cpp similarity index 100% rename from pvDataApp/factory/PVDataCreateFactory.cpp rename to src/factory/PVDataCreateFactory.cpp diff --git a/pvDataApp/factory/PVField.cpp b/src/factory/PVField.cpp similarity index 100% rename from pvDataApp/factory/PVField.cpp rename to src/factory/PVField.cpp diff --git a/pvDataApp/factory/PVScalar.cpp b/src/factory/PVScalar.cpp similarity index 100% rename from pvDataApp/factory/PVScalar.cpp rename to src/factory/PVScalar.cpp diff --git a/pvDataApp/factory/PVScalarArray.cpp b/src/factory/PVScalarArray.cpp similarity index 100% rename from pvDataApp/factory/PVScalarArray.cpp rename to src/factory/PVScalarArray.cpp diff --git a/pvDataApp/factory/PVStructure.cpp b/src/factory/PVStructure.cpp similarity index 100% rename from pvDataApp/factory/PVStructure.cpp rename to src/factory/PVStructure.cpp diff --git a/pvDataApp/factory/PVStructureArray.cpp b/src/factory/PVStructureArray.cpp similarity index 100% rename from pvDataApp/factory/PVStructureArray.cpp rename to src/factory/PVStructureArray.cpp diff --git a/pvDataApp/factory/PVUnion.cpp b/src/factory/PVUnion.cpp similarity index 100% rename from pvDataApp/factory/PVUnion.cpp rename to src/factory/PVUnion.cpp diff --git a/pvDataApp/factory/PVUnionArray.cpp b/src/factory/PVUnionArray.cpp similarity index 100% rename from pvDataApp/factory/PVUnionArray.cpp rename to src/factory/PVUnionArray.cpp diff --git a/pvDataApp/factory/StandardField.cpp b/src/factory/StandardField.cpp similarity index 100% rename from pvDataApp/factory/StandardField.cpp rename to src/factory/StandardField.cpp diff --git a/pvDataApp/factory/StandardPVField.cpp b/src/factory/StandardPVField.cpp similarity index 100% rename from pvDataApp/factory/StandardPVField.cpp rename to src/factory/StandardPVField.cpp diff --git a/pvDataApp/factory/TypeFunc.cpp b/src/factory/TypeFunc.cpp similarity index 100% rename from pvDataApp/factory/TypeFunc.cpp rename to src/factory/TypeFunc.cpp diff --git a/pvDataApp/factory/factory.h b/src/factory/factory.h similarity index 100% rename from pvDataApp/factory/factory.h rename to src/factory/factory.h diff --git a/pvDataApp/factory/printer.cpp b/src/factory/printer.cpp similarity index 100% rename from pvDataApp/factory/printer.cpp rename to src/factory/printer.cpp diff --git a/pvDataApp/factory/pvSubArrayCopy.cpp b/src/factory/pvSubArrayCopy.cpp similarity index 100% rename from pvDataApp/factory/pvSubArrayCopy.cpp rename to src/factory/pvSubArrayCopy.cpp diff --git a/pvDataApp/misc/Makefile b/src/misc/Makefile similarity index 96% rename from pvDataApp/misc/Makefile rename to src/misc/Makefile index bcdf086..829d6a5 100644 --- a/pvDataApp/misc/Makefile +++ b/src/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 diff --git a/pvDataApp/misc/bitSet.cpp b/src/misc/bitSet.cpp similarity index 100% rename from pvDataApp/misc/bitSet.cpp rename to src/misc/bitSet.cpp diff --git a/pvDataApp/misc/bitSet.h b/src/misc/bitSet.h similarity index 100% rename from pvDataApp/misc/bitSet.h rename to src/misc/bitSet.h diff --git a/pvDataApp/misc/byteBuffer.cpp b/src/misc/byteBuffer.cpp similarity index 100% rename from pvDataApp/misc/byteBuffer.cpp rename to src/misc/byteBuffer.cpp diff --git a/pvDataApp/misc/byteBuffer.h b/src/misc/byteBuffer.h similarity index 100% rename from pvDataApp/misc/byteBuffer.h rename to src/misc/byteBuffer.h diff --git a/pvDataApp/misc/current_function.h b/src/misc/current_function.h similarity index 100% rename from pvDataApp/misc/current_function.h rename to src/misc/current_function.h diff --git a/pvDataApp/misc/destroyable.h b/src/misc/destroyable.h similarity index 100% rename from pvDataApp/misc/destroyable.h rename to src/misc/destroyable.h diff --git a/pvDataApp/misc/epicsException.cpp b/src/misc/epicsException.cpp similarity index 100% rename from pvDataApp/misc/epicsException.cpp rename to src/misc/epicsException.cpp diff --git a/pvDataApp/misc/epicsException.h b/src/misc/epicsException.h similarity index 100% rename from pvDataApp/misc/epicsException.h rename to src/misc/epicsException.h diff --git a/pvDataApp/misc/event.cpp b/src/misc/event.cpp similarity index 100% rename from pvDataApp/misc/event.cpp rename to src/misc/event.cpp diff --git a/pvDataApp/misc/event.h b/src/misc/event.h similarity index 100% rename from pvDataApp/misc/event.h rename to src/misc/event.h diff --git a/pvDataApp/misc/executor.cpp b/src/misc/executor.cpp similarity index 100% rename from pvDataApp/misc/executor.cpp rename to src/misc/executor.cpp diff --git a/pvDataApp/misc/executor.h b/src/misc/executor.h similarity index 100% rename from pvDataApp/misc/executor.h rename to src/misc/executor.h diff --git a/pvDataApp/misc/localStaticLock.cpp b/src/misc/localStaticLock.cpp similarity index 100% rename from pvDataApp/misc/localStaticLock.cpp rename to src/misc/localStaticLock.cpp diff --git a/pvDataApp/misc/localStaticLock.h b/src/misc/localStaticLock.h similarity index 100% rename from pvDataApp/misc/localStaticLock.h rename to src/misc/localStaticLock.h diff --git a/pvDataApp/misc/lock.h b/src/misc/lock.h similarity index 100% rename from pvDataApp/misc/lock.h rename to src/misc/lock.h diff --git a/pvDataApp/misc/messageQueue.cpp b/src/misc/messageQueue.cpp similarity index 100% rename from pvDataApp/misc/messageQueue.cpp rename to src/misc/messageQueue.cpp diff --git a/pvDataApp/misc/messageQueue.h b/src/misc/messageQueue.h similarity index 100% rename from pvDataApp/misc/messageQueue.h rename to src/misc/messageQueue.h diff --git a/pvDataApp/misc/noDefaultMethods.h b/src/misc/noDefaultMethods.h similarity index 100% rename from pvDataApp/misc/noDefaultMethods.h rename to src/misc/noDefaultMethods.h diff --git a/pvDataApp/misc/parseToPOD.cpp b/src/misc/parseToPOD.cpp similarity index 100% rename from pvDataApp/misc/parseToPOD.cpp rename to src/misc/parseToPOD.cpp diff --git a/pvDataApp/misc/queue.h b/src/misc/queue.h similarity index 100% rename from pvDataApp/misc/queue.h rename to src/misc/queue.h diff --git a/pvDataApp/misc/requester.cpp b/src/misc/requester.cpp similarity index 100% rename from pvDataApp/misc/requester.cpp rename to src/misc/requester.cpp diff --git a/pvDataApp/misc/requester.h b/src/misc/requester.h similarity index 100% rename from pvDataApp/misc/requester.h rename to src/misc/requester.h diff --git a/pvDataApp/misc/serialize.h b/src/misc/serialize.h similarity index 100% rename from pvDataApp/misc/serialize.h rename to src/misc/serialize.h diff --git a/pvDataApp/misc/serializeHelper.cpp b/src/misc/serializeHelper.cpp similarity index 100% rename from pvDataApp/misc/serializeHelper.cpp rename to src/misc/serializeHelper.cpp diff --git a/pvDataApp/misc/serializeHelper.h b/src/misc/serializeHelper.h similarity index 100% rename from pvDataApp/misc/serializeHelper.h rename to src/misc/serializeHelper.h diff --git a/pvDataApp/misc/sharedPtr.h b/src/misc/sharedPtr.h similarity index 100% rename from pvDataApp/misc/sharedPtr.h rename to src/misc/sharedPtr.h diff --git a/pvDataApp/misc/sharedVector.h b/src/misc/sharedVector.h similarity index 100% rename from pvDataApp/misc/sharedVector.h rename to src/misc/sharedVector.h diff --git a/pvDataApp/misc/status.cpp b/src/misc/status.cpp similarity index 100% rename from pvDataApp/misc/status.cpp rename to src/misc/status.cpp diff --git a/pvDataApp/misc/status.h b/src/misc/status.h similarity index 100% rename from pvDataApp/misc/status.h rename to src/misc/status.h diff --git a/pvDataApp/misc/templateMeta.h b/src/misc/templateMeta.h similarity index 100% rename from pvDataApp/misc/templateMeta.h rename to src/misc/templateMeta.h diff --git a/pvDataApp/misc/thread.h b/src/misc/thread.h similarity index 100% rename from pvDataApp/misc/thread.h rename to src/misc/thread.h diff --git a/pvDataApp/misc/timeFunction.cpp b/src/misc/timeFunction.cpp similarity index 100% rename from pvDataApp/misc/timeFunction.cpp rename to src/misc/timeFunction.cpp diff --git a/pvDataApp/misc/timeFunction.h b/src/misc/timeFunction.h similarity index 100% rename from pvDataApp/misc/timeFunction.h rename to src/misc/timeFunction.h diff --git a/pvDataApp/misc/timer.cpp b/src/misc/timer.cpp similarity index 100% rename from pvDataApp/misc/timer.cpp rename to src/misc/timer.cpp diff --git a/pvDataApp/misc/timer.h b/src/misc/timer.h similarity index 100% rename from pvDataApp/misc/timer.h rename to src/misc/timer.h diff --git a/pvDataApp/misc/typeCast.cpp b/src/misc/typeCast.cpp similarity index 100% rename from pvDataApp/misc/typeCast.cpp rename to src/misc/typeCast.cpp diff --git a/pvDataApp/misc/typeCast.h b/src/misc/typeCast.h similarity index 100% rename from pvDataApp/misc/typeCast.h rename to src/misc/typeCast.h diff --git a/pvDataApp/monitor/Makefile b/src/monitor/Makefile similarity index 73% rename from pvDataApp/monitor/Makefile rename to src/monitor/Makefile index 295f5bd..54387fa 100644 --- a/pvDataApp/monitor/Makefile +++ b/src/monitor/Makefile @@ -1,6 +1,6 @@ # This is a Makefile fragment, see ../Makefile -SRC_DIRS += $(PVDATAAPP)/monitor +SRC_DIRS += $(PVDATASRC)/monitor INC += monitor.h diff --git a/pvDataApp/monitor/monitor.cpp b/src/monitor/monitor.cpp similarity index 100% rename from pvDataApp/monitor/monitor.cpp rename to src/monitor/monitor.cpp diff --git a/pvDataApp/monitor/monitor.h b/src/monitor/monitor.h similarity index 100% rename from pvDataApp/monitor/monitor.h rename to src/monitor/monitor.h diff --git a/pvDataApp/property/Makefile b/src/property/Makefile similarity index 92% rename from pvDataApp/property/Makefile rename to src/property/Makefile index 283bc09..eae0c9f 100644 --- a/pvDataApp/property/Makefile +++ b/src/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 diff --git a/pvDataApp/property/alarm.cpp b/src/property/alarm.cpp similarity index 100% rename from pvDataApp/property/alarm.cpp rename to src/property/alarm.cpp diff --git a/pvDataApp/property/alarm.h b/src/property/alarm.h similarity index 100% rename from pvDataApp/property/alarm.h rename to src/property/alarm.h diff --git a/pvDataApp/property/control.h b/src/property/control.h similarity index 100% rename from pvDataApp/property/control.h rename to src/property/control.h diff --git a/pvDataApp/property/display.h b/src/property/display.h similarity index 100% rename from pvDataApp/property/display.h rename to src/property/display.h diff --git a/pvDataApp/property/pvAlarm.cpp b/src/property/pvAlarm.cpp similarity index 100% rename from pvDataApp/property/pvAlarm.cpp rename to src/property/pvAlarm.cpp diff --git a/pvDataApp/property/pvAlarm.h b/src/property/pvAlarm.h similarity index 100% rename from pvDataApp/property/pvAlarm.h rename to src/property/pvAlarm.h diff --git a/pvDataApp/property/pvControl.cpp b/src/property/pvControl.cpp similarity index 100% rename from pvDataApp/property/pvControl.cpp rename to src/property/pvControl.cpp diff --git a/pvDataApp/property/pvControl.h b/src/property/pvControl.h similarity index 100% rename from pvDataApp/property/pvControl.h rename to src/property/pvControl.h diff --git a/pvDataApp/property/pvDisplay.cpp b/src/property/pvDisplay.cpp similarity index 100% rename from pvDataApp/property/pvDisplay.cpp rename to src/property/pvDisplay.cpp diff --git a/pvDataApp/property/pvDisplay.h b/src/property/pvDisplay.h similarity index 100% rename from pvDataApp/property/pvDisplay.h rename to src/property/pvDisplay.h diff --git a/pvDataApp/property/pvEnumerated.cpp b/src/property/pvEnumerated.cpp similarity index 100% rename from pvDataApp/property/pvEnumerated.cpp rename to src/property/pvEnumerated.cpp diff --git a/pvDataApp/property/pvEnumerated.h b/src/property/pvEnumerated.h similarity index 100% rename from pvDataApp/property/pvEnumerated.h rename to src/property/pvEnumerated.h diff --git a/pvDataApp/property/pvTimeStamp.cpp b/src/property/pvTimeStamp.cpp similarity index 100% rename from pvDataApp/property/pvTimeStamp.cpp rename to src/property/pvTimeStamp.cpp diff --git a/pvDataApp/property/pvTimeStamp.h b/src/property/pvTimeStamp.h similarity index 100% rename from pvDataApp/property/pvTimeStamp.h rename to src/property/pvTimeStamp.h diff --git a/pvDataApp/property/timeStamp.cpp b/src/property/timeStamp.cpp similarity index 100% rename from pvDataApp/property/timeStamp.cpp rename to src/property/timeStamp.cpp diff --git a/pvDataApp/property/timeStamp.h b/src/property/timeStamp.h similarity index 100% rename from pvDataApp/property/timeStamp.h rename to src/property/timeStamp.h diff --git a/pvDataApp/pv/Makefile b/src/pv/Makefile similarity index 87% rename from pvDataApp/pv/Makefile rename to src/pv/Makefile index afd0602..87da8ae 100644 --- a/pvDataApp/pv/Makefile +++ b/src/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 diff --git a/pvDataApp/pv/convert.h b/src/pv/convert.h similarity index 100% rename from pvDataApp/pv/convert.h rename to src/pv/convert.h diff --git a/pvDataApp/pv/printer.h b/src/pv/printer.h similarity index 100% rename from pvDataApp/pv/printer.h rename to src/pv/printer.h diff --git a/pvDataApp/pv/pvData.h b/src/pv/pvData.h similarity index 100% rename from pvDataApp/pv/pvData.h rename to src/pv/pvData.h diff --git a/pvDataApp/pv/pvIntrospect.h b/src/pv/pvIntrospect.h similarity index 100% rename from pvDataApp/pv/pvIntrospect.h rename to src/pv/pvIntrospect.h diff --git a/pvDataApp/pv/pvSubArrayCopy.h b/src/pv/pvSubArrayCopy.h similarity index 100% rename from pvDataApp/pv/pvSubArrayCopy.h rename to src/pv/pvSubArrayCopy.h diff --git a/pvDataApp/pv/pvType.h b/src/pv/pvType.h similarity index 100% rename from pvDataApp/pv/pvType.h rename to src/pv/pvType.h diff --git a/pvDataApp/pv/standardField.h b/src/pv/standardField.h similarity index 100% rename from pvDataApp/pv/standardField.h rename to src/pv/standardField.h diff --git a/pvDataApp/pv/standardPVField.h b/src/pv/standardPVField.h similarity index 100% rename from pvDataApp/pv/standardPVField.h rename to src/pv/standardPVField.h diff --git a/pvDataApp/pvMisc/Makefile b/src/pvMisc/Makefile similarity index 75% rename from pvDataApp/pvMisc/Makefile rename to src/pvMisc/Makefile index b942450..859b94c 100644 --- a/pvDataApp/pvMisc/Makefile +++ b/src/pvMisc/Makefile @@ -1,6 +1,6 @@ # This is a Makefile fragment, see ../Makefile -SRC_DIRS += $(PVDATAAPP)/pvMisc +SRC_DIRS += $(PVDATASRC)/pvMisc INC += bitSetUtil.h diff --git a/pvDataApp/pvMisc/bitSetUtil.cpp b/src/pvMisc/bitSetUtil.cpp similarity index 100% rename from pvDataApp/pvMisc/bitSetUtil.cpp rename to src/pvMisc/bitSetUtil.cpp diff --git a/pvDataApp/pvMisc/bitSetUtil.h b/src/pvMisc/bitSetUtil.h similarity index 100% rename from pvDataApp/pvMisc/bitSetUtil.h rename to src/pvMisc/bitSetUtil.h