lp:~michihenning/unity-scopes-api/config-fixes
Created by
Michi Henning
and last modified
- Get this branch:
- bzr branch lp:~michihenning/unity-scopes-api/config-fixes
Only
Michi Henning
can upload to this branch. If you are
Michi Henning
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- PS Jenkins bot (community): Approve (continuous-integration)
- Marcus Tomlinson (community): Approve
- Michal Hruby (community): Approve
-
Diff: 3858 lines (+1129/-643)103 files modifiedCMakeLists.txt (+13/-14)
CONFIGFILES (+208/-0)
RELEASE_NOTES.md (+13/-2)
data/CMakeLists.txt (+2/-10)
data/Registry.ini.in (+0/-10)
data/Runtime.ini.in (+0/-5)
data/SSRegistry.ini.in (+0/-7)
data/SSRuntime.ini.in (+0/-5)
data/Zmq.ini.in (+0/-3)
data/libunity-scopes.pc.in (+3/-1)
data/scope-registry.conf.in (+1/-1)
data/smart-scopes-proxy.conf.in (+1/-1)
debian/changelog (+24/-3)
debian/libunity-scopes-doc.install (+1/-1)
debian/libunity-scopes1.install (+3/-4)
debian/libunity-scopes1.symbols (+15/-12)
demo/CMakeLists.txt (+0/-1)
demo/README (+1/-1)
demo/Registry.ini.in (+0/-5)
demo/Runtime.ini.in (+0/-2)
demo/Zmq.ini.in (+0/-3)
demo/click/scope-click/CMakeLists.txt (+1/-1)
demo/stand-alone/CMakeLists.txt (+0/-1)
demo/stand-alone/Runtime.ini.in (+0/-2)
demo/stand-alone/Zmq.ini.in (+0/-3)
doc/Doxyfile-devel.in (+1/-1)
doc/Doxyfile.in (+1/-1)
doc/index.html (+3/-3)
include/CMakeLists.txt (+4/-4)
include/unity/scopes/Runtime.h (+9/-0)
include/unity/scopes/internal/ConfigBase.h (+13/-3)
include/unity/scopes/internal/DfltConfig.h.in (+17/-3)
include/unity/scopes/internal/MiddlewareBase.h (+3/-1)
include/unity/scopes/internal/RegistryConfig.h (+0/-10)
include/unity/scopes/internal/RegistryObject.h (+3/-2)
include/unity/scopes/internal/RuntimeConfig.h (+4/-2)
include/unity/scopes/internal/RuntimeImpl.h (+6/-7)
include/unity/scopes/internal/ScopeConfig.h (+2/-4)
include/unity/scopes/internal/smartscopes/SSConfig.h (+62/-0)
include/unity/scopes/internal/smartscopes/SSRegistryObject.h (+6/-2)
include/unity/scopes/internal/zmq_middleware/ZmqConfig.h (+0/-2)
include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h (+6/-2)
scoperegistry/CMakeLists.txt (+1/-1)
scoperegistry/scoperegistry.cpp (+6/-24)
scoperunner/CMakeLists.txt (+1/-1)
smartscopesproxy/CMakeLists.txt (+1/-1)
smartscopesproxy/smartscopesproxy.cpp (+9/-9)
src/scopes/Runtime.cpp (+6/-1)
src/scopes/internal/ConfigBase.cpp (+89/-7)
src/scopes/internal/MiddlewareFactory.cpp (+1/-1)
src/scopes/internal/RegistryConfig.cpp (+33/-33)
src/scopes/internal/RegistryObject.cpp (+59/-27)
src/scopes/internal/RuntimeConfig.cpp (+45/-20)
src/scopes/internal/RuntimeImpl.cpp (+30/-41)
src/scopes/internal/ScopeConfig.cpp (+57/-35)
src/scopes/internal/smartscopes/CMakeLists.txt (+1/-0)
src/scopes/internal/smartscopes/SSConfig.cpp (+129/-0)
src/scopes/internal/smartscopes/SSRegistryObject.cpp (+7/-8)
src/scopes/internal/zmq_middleware/ZmqConfig.cpp (+36/-15)
src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp (+64/-66)
src/scopes/internal/zmq_middleware/ZmqObject.cpp (+6/-33)
test/gtest/scopes/Activation/Activation_test.cpp (+1/-1)
test/gtest/scopes/Activation/Registry.ini.in (+0/-2)
test/gtest/scopes/Activation/Zmq.ini.in (+1/-2)
test/gtest/scopes/Filters/Filters_test.cpp (+1/-1)
test/gtest/scopes/Filters/Registry.ini.in (+0/-2)
test/gtest/scopes/Filters/Zmq.ini.in (+1/-2)
test/gtest/scopes/Invocation/Invocation_test.cpp (+3/-3)
test/gtest/scopes/Invocation/Registry.ini.in (+0/-2)
test/gtest/scopes/Invocation/Zmq.ini.in (+1/-2)
test/gtest/scopes/Registry/RegistryTest.ini.in (+0/-2)
test/gtest/scopes/Registry/Registry_test.cpp (+3/-0)
test/gtest/scopes/Registry/Runtime.ini.in (+1/-0)
test/gtest/scopes/Registry/Zmq.ini.in (+1/-2)
test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.cpp (+1/-1)
test/gtest/scopes/Runtime/Registry.ini.in (+0/-2)
test/gtest/scopes/Runtime/Runtime_test.cpp (+9/-9)
test/gtest/scopes/Runtime/Zmq.ini.in (+1/-2)
test/gtest/scopes/internal/ConfigBase/ConfigBase_test.cpp (+31/-15)
test/gtest/scopes/internal/RegistryConfig/Registry.ini.in (+0/-2)
test/gtest/scopes/internal/RegistryConfig/RegistryConfig_test.cpp (+0/-1)
test/gtest/scopes/internal/RegistryConfig/ScoperunnerRelativePath.ini.in (+0/-1)
test/gtest/scopes/internal/ResultReplyObject/Registry.ini.in (+0/-2)
test/gtest/scopes/internal/ResultReplyObject/Zmq.ini.in (+1/-2)
test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp (+0/-29)
test/gtest/scopes/internal/RuntimeImpl/Registry.ini.in (+1/-3)
test/gtest/scopes/internal/RuntimeImpl/Zmq.ini.in (+1/-2)
test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp (+4/-4)
test/gtest/scopes/internal/ScopeMetadataImpl/Zmq.ini.in (+1/-2)
test/gtest/scopes/internal/smartscopes/smartscopesproxy/SSRegistryTest.ini.in (+0/-5)
test/gtest/scopes/internal/smartscopes/smartscopesproxy/Zmq.ini.in (+1/-2)
test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp (+4/-2)
test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp (+33/-32)
test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini.in (+1/-2)
test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp (+3/-8)
test/gtest/scopes/internal/zmq_middleware/RegistryI/TestRegistry.ini.in (+0/-5)
test/gtest/scopes/internal/zmq_middleware/RegistryI/Zmq.ini.in (+1/-2)
test/gtest/scopes/internal/zmq_middleware/ServantBase/ServantBase_test.cpp (+6/-6)
test/gtest/scopes/internal/zmq_middleware/ServantBase/Zmq.ini.in (+1/-2)
test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/Zmq.ini.in (+1/-2)
test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp (+6/-8)
test/whitespace/check_whitespace.py (+1/-1)
unity-scopes.map (+1/-0)
Related bugs
Bug #1257822: Move scope endpoints under $XDG_RUNTIME_DIR | High | Fix Released | |
Bug #1274421: Deployment directories for scopes conflict with packaging | High | Fix Released |
Related blueprints
Branch information
Recent revisions
- 317. By Michi Henning
-
Reverting previous revert after Michal checked, and it appears that Qt
can actually handle the XXXXX part of the filename in the middle of the
name, not just at the end. - 316. By Michi Henning
-
Changed the .ini extension check back to check whether the file name
*contains* .ini, because of some weird insanity with Qt temp file names :-( - 312. By Michi Henning
-
Removed scopes subdir for installation, so scopes are installed in /usr/lib/
<arch>/ unity-scopes.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:unity-scopes-api