← Back to branch summary

~unity-api-team/unity-scopes-api/child-scopes-option

~unity-api-team/unity-scopes-api/child-scopes-option

« back to all changes in this revision

Viewing changes to src/internal/zmq_middleware/CMakeLists.txt

Committer: Michi Henning
Date: 2013-11-19 02:51:46 UTC
mto: This revision was merged to the branch mainline in revision 62.
Revision ID: michi.henning@canonical.com-20131119025146-kglcalpphl4ozzk7

Fixed scoperegistry to use new scoperunner and to figure out which scopes to run from config files.
Still to do:
- deal with overrides and OEM scopes, particularly the grouping aspect.
- SignalThread needs to invoke a callback for clean shut-down on receipt of SIGINT.

files added:
demo/README

demo/scope-groups

demo/scope-groups/CMakeLists.txt

demo/scope-groups/GroupBC.ini.in

demo/scopes

demo/scopes/CMakeLists.txt

demo/scopes/scope-A

demo/scopes/scope-A/CMakeLists.txt

demo/scopes/scope-A/scope-A.cpp

demo/scopes/scope-A/scope-A.ini.in

demo/scopes/scope-B

demo/scopes/scope-B/CMakeLists.txt

demo/scopes/scope-B/scope-B.cpp

demo/scopes/scope-B/scope-B.ini.in

demo/scopes/scope-C

demo/scopes/scope-C/CMakeLists.txt

demo/scopes/scope-C/scope-C.cpp

demo/scopes/scope-C/scope-C.ini.in

demo/scopes/scope-D

demo/scopes/scope-D/CMakeLists.txt

demo/scopes/scope-D/scope-D.cpp

demo/scopes/scope-D/scope-D.ini.in

demo/scopes/scope-N

demo/scopes/scope-N/CMakeLists.txt

demo/scopes/scope-N/scope-N.cpp

demo/scopes/scope-N/scope-N.ini.in

demo/scopes/scope-S

demo/scopes/scope-S/CMakeLists.txt

demo/scopes/scope-S/scope-S.ini.in

include/scopes/internal/ScopeConfig.h

include/scopes/internal/zmq_middleware/ZmqConfig.h

scoperegistry

scoperegistry/CMakeLists.txt

scoperegistry/FindFiles.cpp

scoperegistry/FindFiles.h

scoperegistry/SignalThread.cpp

scoperegistry/SignalThread.h

scoperegistry/scoperegistry.cpp

scoperunner

scoperunner/CMakeLists.txt

scoperunner/scoperunner.cpp

src/internal/ScopeConfig.cpp

src/internal/zmq_middleware/ZmqConfig.cpp

test/gtest/unity/api/scopes/Runtime/Zmq.ini.in

test/gtest/unity/api/scopes/internal/RegistryConfig/ScoperunnerRelativePath.ini.in

test/gtest/unity/api/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini.in

test/gtest/unity/api/scopes/internal/zmq_middleware/RegistryI/Zmq.ini.in

test/gtest/unity/api/scopes/internal/zmq_middleware/ServantBase/Zmq.ini.in

test/gtest/unity/api/scopes/internal/zmq_middleware/ZmqMiddleware/Zmq.ini.in

files removed:
demo/RegistryMain.ini.in

demo/Zmq.Registry.ini.in

demo/scope-A.cpp

demo/scope-B.cpp

demo/scope-C.cpp

demo/scope-D.cpp

demo/scoperunner-A.cpp

demo/scoperunner-BC.cpp

demo/scoperunner-D.cpp

demo/scoperunner-slow.cpp

src/internal/RegistryMain.cpp

src/internal/RegistryMain.ini.in

files renamed:
demo/scope-slow.cpp => demo/scopes/scope-S/scope-S.cpp

files modified:
CMakeLists.txt

demo/CMakeLists.txt

demo/Factory.ini.in

demo/Registry.ini.in

demo/Runtime.ini.in

demo/Zmq.ini.in

demo/client.cpp

include/scopes/internal/MiddlewareBase.h

include/scopes/internal/MiddlewareFactoryConfig.h

include/scopes/internal/RegistryConfig.h

include/scopes/internal/RegistryObject.h

include/scopes/internal/RuntimeImpl.h

include/scopes/internal/lttng/SimpleTracepoint.h

include/scopes/internal/zmq_middleware/ZmqMiddleware.h

src/internal/CMakeLists.txt

src/internal/MiddlewareFactoryConfig.cpp

src/internal/RegistryConfig.cpp

src/internal/RegistryObject.cpp

src/internal/RuntimeConfig.cpp

src/internal/RuntimeImpl.cpp

src/internal/zmq_middleware/CMakeLists.txt

src/internal/zmq_middleware/ZmqMiddleware.cpp

test/gtest/unity/api/scopes/Runtime/CMakeLists.txt

test/gtest/unity/api/scopes/Runtime/Registry.ini.in

test/gtest/unity/api/scopes/Runtime/Runtime.ini.in

test/gtest/unity/api/scopes/internal/MiddlewareFactoryConfig/Factory.ini.in

test/gtest/unity/api/scopes/internal/MiddlewareFactoryConfig/MiddlewareFactoryConfig_test.cpp

test/gtest/unity/api/scopes/internal/RegistryConfig/CMakeLists.txt

test/gtest/unity/api/scopes/internal/RegistryConfig/Registry.ini.in

test/gtest/unity/api/scopes/internal/RegistryConfig/RegistryConfig_test.cpp

test/gtest/unity/api/scopes/internal/RuntimeConfig/BadMW.ini.in

test/gtest/unity/api/scopes/internal/RuntimeConfig/BadRegID.ini.in

test/gtest/unity/api/scopes/internal/RuntimeConfig/FacFileEmpty.ini.in

test/gtest/unity/api/scopes/internal/RuntimeConfig/MWEmpty.ini.in

test/gtest/unity/api/scopes/internal/RuntimeConfig/RegFileEmpty.ini.in

test/gtest/unity/api/scopes/internal/RuntimeConfig/RegIDEmpty.ini.in

test/gtest/unity/api/scopes/internal/RuntimeConfig/Runtime.ini.in

test/gtest/unity/api/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp

test/gtest/unity/api/scopes/internal/RuntimeImpl/CMakeLists.txt

test/gtest/unity/api/scopes/internal/RuntimeImpl/Registry.ini.in

test/gtest/unity/api/scopes/internal/RuntimeImpl/Runtime.ini.in

test/gtest/unity/api/scopes/internal/RuntimeImpl/RuntimeImpl_test.cpp

test/gtest/unity/api/scopes/internal/RuntimeImpl/Zmq.ini.in

test/gtest/unity/api/scopes/internal/zmq_middleware/ObjectAdapter/CMakeLists.txt

test/gtest/unity/api/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp

test/gtest/unity/api/scopes/internal/zmq_middleware/RegistryI/CMakeLists.txt

test/gtest/unity/api/scopes/internal/zmq_middleware/RegistryI/Registry.ini.in

test/gtest/unity/api/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp

test/gtest/unity/api/scopes/internal/zmq_middleware/RegistryI/Runtime.ini.in

test/gtest/unity/api/scopes/internal/zmq_middleware/ServantBase/CMakeLists.txt

test/gtest/unity/api/scopes/internal/zmq_middleware/ServantBase/ServantBase_test.cpp

test/gtest/unity/api/scopes/internal/zmq_middleware/ZmqMiddleware/CMakeLists.txt

test/gtest/unity/api/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp

Show diffs side-by-side

added added

removed removed

src/internal/zmq_middleware/CMakeLists.txt

14

14

${CMAKE_CURRENT_SOURCE_DIR}/ScopeI.cpp

15

15

${CMAKE_CURRENT_SOURCE_DIR}/ServantBase.cpp

16

16

${CMAKE_CURRENT_SOURCE_DIR}/VariantConverter.cpp

17

${CMAKE_CURRENT_SOURCE_DIR}/ZmqConfig.cpp

17

18

${CMAKE_CURRENT_SOURCE_DIR}/ZmqMiddleware.cpp

18

19

${CMAKE_CURRENT_SOURCE_DIR}/ZmqException.cpp

19

20

${CMAKE_CURRENT_SOURCE_DIR}/ZmqObject.cpp

Older »