1
=== modified file 'CONFIGFILES'
2
--- CONFIGFILES	2014-07-21 06:34:24 +0000
3
+++ CONFIGFILES	2014-07-28 11:21:43 +0000
4
@@ -92,7 +92,7 @@
5
92
92
6
93
- DataDir
93
- DataDir
7
94
94
9
95
  The parent directory under the run time writes scope-specific data files
95
  The parent directory under which the run time writes scope-specific data files
10
96
  (such as settings).
96
  (such as settings).
11
97
97
12
98
  The default value is $HOME/.local/share/unity-scopes.
98
  The default value is $HOME/.local/share/unity-scopes.
13
99
99
14
=== modified file 'HACKING'
15
--- HACKING	2014-06-26 15:53:22 +0000
16
+++ HACKING	2014-07-28 11:21:43 +0000
17
@@ -193,12 +193,17 @@
18
193
Running the test manually is simple. After building and installing the
193
Running the test manually is simple. After building and installing the
19
194
new packages, just run 'sh debian/tests/scopebuild'.
194
new packages, just run 'sh debian/tests/scopebuild'.
20
195
195
30
196
When making API breaks, make sure to check if autopkg test scripts
196
To run the autopkg tests the same way Jenkins does, without installing
31
197
need changing. The point of autopkg is not to exercise the API
197
the packages, follow the instructions here:
32
198
thoroughly, so it should not need changing all that often.
198
33
199
199
http://packaging.ubuntu.com/html/auto-pkg-test.html
34
200
At the moment it is unclear if these tests are executed during Jenkins
200
35
201
builds.  This will lead to autopkgtest failing later if scopes' API is
201
When adding new tests to debian/tests, be sure that the new tests
36
202
changed in a backwards incompatible way. If this happens the test
202
are built and run by adding them to tests/autopkg. Doing this doesn't
37
203
needs to be fixed either by updating the test or backing out the API
203
run the tests exactly the same way as on Jenkins because they will
38
204
breaking change.
204
be built and run against the headers and library in the build area,
39
205
rather than against the installed packages. But it provides a basic
40
206
sanity check for them. Without this, it's very easy to make a breaking
41
207
change to the API and forgetting to update the autopkg tests too,
42
208
meaning that the failure will show up only in Jenkins, but not
43
209
when running the tests locally.
44
205
210
45
=== modified file 'RELEASE_NOTES.md'
46
--- RELEASE_NOTES.md	2014-07-24 12:12:13 +0000
47
+++ RELEASE_NOTES.md	2014-07-28 11:21:43 +0000
48
@@ -3,8 +3,23 @@
49
3
3
50
4
Changes in version 0.6.0
4
Changes in version 0.6.0
51
5
========================
5
========================
52
6
  - Added cache_directory() method to ScopeBase, so a scope can find out where it can write its files.
53
7
54
8
  - Refactored scoperunner and ScopeLoader. ScopeLoader no longer knows about the registry and
55
9
    scoperunner now calls RuntimeImpl::run_scope() to set the scope running, instead of duplicating
56
10
    lots of functionality.
57
11
58
12
  - Removed registry parameter from ScopeBase::start(). The registry is now available via a registry()
59
13
    accessor on ScopeBase. The original start() method is still present, but deprecated. The default
60
14
    implementation of the new start() method forwards to the old one so, if a scope implements only the
61
15
    old one but not the new one, things still work.
62
16
63
17
  - Made methods on ScopeBase virtual, so the testing framework can override them in a test scope.
64
18
65
6
  - Added support for additional query reply info.
19
  - Added support for additional query reply info.
66
20
67
7
  - Introduced QueryMetadata base for shared functionality of *Metadata classes.
21
  - Introduced QueryMetadata base for shared functionality of *Metadata classes.
68
22
69
8
  - Added set_internet_connectivity() and internet_connectivity() to QueryMetadata.
23
  - Added set_internet_connectivity() and internet_connectivity() to QueryMetadata.
70
9
24
71
10
Changes in version 0.5.2
25
Changes in version 0.5.2
72
11
26
73
=== modified file 'debian/changelog'
74
--- debian/changelog	2014-07-28 10:02:00 +0000
75
+++ debian/changelog	2014-07-28 11:21:43 +0000
76
@@ -1,10 +1,13 @@
77
1
unity-scopes-api (0.6.0-0ubuntu1) UNRELEASED; urgency=medium
1
unity-scopes-api (0.6.0-0ubuntu1) UNRELEASED; urgency=medium
78
2
2
80
3
  * Added support for additional query reply info.
3
  * Added cache_directory() method and refactored scoperunner and RuntimeImpl.
81
4
82
5
  [ Marcus Tomlinson ]
83
4
  * Introduced QueryMetadata base for shared functionality of *Metadata classes.
6
  * Introduced QueryMetadata base for shared functionality of *Metadata classes.
84
5
  * Added set_internet_connectivity() and internet_connectivity() to QueryMetadata.
7
  * Added set_internet_connectivity() and internet_connectivity() to QueryMetadata.
85
8
  * Added support for additional query reply info.
86
6
9
88
7
 -- Marcus Tomlinson <marcus.tomlinson@canonical.com>  Mon, 21 Jul 2014 09:14:39 +0200
10
 -- Michi Henning <michi.henning@canonical.com>  Mon, 07 Jul 2014 14:34:04 +1000
89
8
11
90
9
unity-scopes-api (0.5.2+14.10.20140723-0ubuntu1) utopic; urgency=low
12
unity-scopes-api (0.5.2+14.10.20140723-0ubuntu1) utopic; urgency=low
91
10
13
92
11
14
93
=== modified file 'debian/libunity-scopes2.symbols'
94
--- debian/libunity-scopes2.symbols	2014-07-28 10:02:00 +0000
95
+++ debian/libunity-scopes2.symbols	2014-07-28 11:21:43 +0000
96
@@ -408,8 +408,10 @@
97
408
 (c++)"unity::scopes::testing::Benchmark::Result::load_from(std::basic_istream<char, std::char_traits<char> >&)@Base" 0.4.0+14.04.20140312.1
408
 (c++)"unity::scopes::testing::Benchmark::Result::load_from(std::basic_istream<char, std::char_traits<char> >&)@Base" 0.4.0+14.04.20140312.1
98
409
 (c++)"unity::scopes::testing::operator==(unity::scopes::testing::Benchmark::Result const&, unity::scopes::testing::Benchmark::Result const&)@Base" 0.4.0+14.04.20140312.1
409
 (c++)"unity::scopes::testing::operator==(unity::scopes::testing::Benchmark::Result const&, unity::scopes::testing::Benchmark::Result const&)@Base" 0.4.0+14.04.20140312.1
99
410
 (c++)"unity::scopes::testing::operator<<(std::basic_ostream<char, std::char_traits<char> >&, unity::scopes::testing::Benchmark::Result const&)@Base" 0.4.0+14.04.20140312.1
410
 (c++)"unity::scopes::testing::operator<<(std::basic_ostream<char, std::char_traits<char> >&, unity::scopes::testing::Benchmark::Result const&)@Base" 0.4.0+14.04.20140312.1
101
411
 (c++)"unity::scopes::Category::Category(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::CategoryRenderer const&)@Base" 0.4.0+14.04.20140312.1
411
 (c++)"unity::scopes::Category::Category(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::CategoryRenderer const&)@Base" 0replaceme
102
412
 (c++)"unity::scopes::Category::Category(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::CannedQuery const> const&, unity::scopes::CategoryRenderer const&)@Base" 0replaceme
103
412
 (c++)"unity::scopes::Category::Category(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::Variant, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::Variant> > > const&)@Base" 0.4.0+14.04.20140312.1
413
 (c++)"unity::scopes::Category::Category(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::Variant, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::Variant> > > const&)@Base" 0.4.0+14.04.20140312.1
104
414
 (c++)"unity::scopes::Category::Category(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::CategoryRenderer const&)@Base" 0replaceme
105
413
 (c++)"unity::scopes::Category::Category(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::CannedQuery const> const&, unity::scopes::CategoryRenderer const&)@Base" 0.5.2+14.10.20140709.2
415
 (c++)"unity::scopes::Category::Category(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::CannedQuery const> const&, unity::scopes::CategoryRenderer const&)@Base" 0.5.2+14.10.20140709.2
106
414
 (c++)"unity::scopes::Category::Category(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::Variant, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::Variant> > > const&)@Base" 0.4.0+14.04.20140312.1
416
 (c++)"unity::scopes::Category::Category(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::Variant, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::Variant> > > const&)@Base" 0.4.0+14.04.20140312.1
107
415
 (c++)"unity::scopes::Category::~Category()@Base" 0.4.0+14.04.20140312.1
417
 (c++)"unity::scopes::Category::~Category()@Base" 0.4.0+14.04.20140312.1
108
@@ -424,11 +426,11 @@
109
424
 (c++)"unity::scopes::internal::ScopeConfig::parse_appearance_attribute(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::Variant, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::Variant> > >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.2+14.10.20140709.2
426
 (c++)"unity::scopes::internal::ScopeConfig::parse_appearance_attribute(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::Variant, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::Variant> > >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.2+14.10.20140709.2
110
425
 (c++)"unity::scopes::internal::ScopeConfig::ScopeConfig(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
427
 (c++)"unity::scopes::internal::ScopeConfig::ScopeConfig(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
111
426
 (c++)"unity::scopes::internal::ScopeConfig::~ScopeConfig()@Base" 0.4.0+14.04.20140312.1
428
 (c++)"unity::scopes::internal::ScopeConfig::~ScopeConfig()@Base" 0.4.0+14.04.20140312.1
113
427
 (c++)"unity::scopes::internal::ScopeLoader::load(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::Registry> const&)@Base" 0.5.2+14.10.20140709.2
429
 (c++)"unity::scopes::internal::ScopeLoader::load(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
114
428
 (c++)"unity::scopes::internal::ScopeLoader::stop()@Base" 0.4.0+14.04.20140312.1
430
 (c++)"unity::scopes::internal::ScopeLoader::stop()@Base" 0.4.0+14.04.20140312.1
115
429
 (c++)"unity::scopes::internal::ScopeLoader::start()@Base" 0.4.0+14.04.20140312.1
431
 (c++)"unity::scopes::internal::ScopeLoader::start()@Base" 0.4.0+14.04.20140312.1
116
430
 (c++)"unity::scopes::internal::ScopeLoader::unload()@Base" 0.4.0+14.04.20140312.1
432
 (c++)"unity::scopes::internal::ScopeLoader::unload()@Base" 0.4.0+14.04.20140312.1
118
431
 (c++)"unity::scopes::internal::ScopeLoader::ScopeLoader(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::Registry> const&)@Base" 0.5.2+14.10.20140709.2
433
 (c++)"unity::scopes::internal::ScopeLoader::ScopeLoader(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
119
432
 (c++)"unity::scopes::internal::ScopeLoader::~ScopeLoader()@Base" 0.4.0+14.04.20140312.1
434
 (c++)"unity::scopes::internal::ScopeLoader::~ScopeLoader()@Base" 0.4.0+14.04.20140312.1
120
433
 (c++)"unity::scopes::internal::ScopeObject::perform_action(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0.4.0+14.04.20140312.1
435
 (c++)"unity::scopes::internal::ScopeObject::perform_action(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0.4.0+14.04.20140312.1
121
434
 (c++)"unity::scopes::internal::ScopeObject::query(std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::MiddlewareBase*, std::function<std::shared_ptr<unity::scopes::QueryBase> ()> const&, std::function<std::shared_ptr<unity::scopes::internal::QueryObjectBase> (std::shared_ptr<unity::scopes::QueryBase>, std::shared_ptr<unity::scopes::internal::MWQueryCtrl>)> const&)@Base" 0.4.0+14.04.20140312.1
436
 (c++)"unity::scopes::internal::ScopeObject::query(std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::MiddlewareBase*, std::function<std::shared_ptr<unity::scopes::QueryBase> ()> const&, std::function<std::shared_ptr<unity::scopes::internal::QueryObjectBase> (std::shared_ptr<unity::scopes::QueryBase>, std::shared_ptr<unity::scopes::internal::MWQueryCtrl>)> const&)@Base" 0.4.0+14.04.20140312.1
122
@@ -545,7 +547,7 @@
123
545
 (c++)"unity::scopes::ScopeBase::runtime_version(int&, int&, int&)@Base" 0.4.0+14.04.20140312.1
547
 (c++)"unity::scopes::ScopeBase::runtime_version(int&, int&, int&)@Base" 0.4.0+14.04.20140312.1
124
546
 (c++)"unity::scopes::ScopeBase::run()@Base" 0.4.0+14.04.20140312.1
548
 (c++)"unity::scopes::ScopeBase::run()@Base" 0.4.0+14.04.20140312.1
125
547
 (c++)"unity::scopes::ScopeBase::stop()@Base" 0.5.0+14.10.20140619
549
 (c++)"unity::scopes::ScopeBase::stop()@Base" 0.5.0+14.10.20140619
127
548
 (c++)"unity::scopes::ScopeBase::start(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::Registry> const&)@Base" 0.5.0+14.10.20140619
550
 (c++)"unity::scopes::ScopeBase::start(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
128
549
 (c++)"unity::scopes::ScopeBase::activate(unity::scopes::Result const&, unity::scopes::ActionMetadata const&)@Base" 0.4.0+14.04.20140312.1
551
 (c++)"unity::scopes::ScopeBase::activate(unity::scopes::Result const&, unity::scopes::ActionMetadata const&)@Base" 0.4.0+14.04.20140312.1
129
550
 (c++)"unity::scopes::ScopeBase::ScopeBase()@Base" 0.4.0+14.04.20140312.1
552
 (c++)"unity::scopes::ScopeBase::ScopeBase()@Base" 0.4.0+14.04.20140312.1
130
551
 (c++)"unity::scopes::ScopeBase::~ScopeBase()@Base" 0.4.0+14.04.20140312.1
553
 (c++)"unity::scopes::ScopeBase::~ScopeBase()@Base" 0.4.0+14.04.20140312.1
131
@@ -733,6 +735,7 @@
132
733
 (c++)"unity::scopes::internal::RuntimeImpl::reply_reaper() const@Base" 0.4.0+14.04.20140312.1
735
 (c++)"unity::scopes::internal::RuntimeImpl::reply_reaper() const@Base" 0.4.0+14.04.20140312.1
133
734
 (c++)"unity::scopes::internal::RuntimeImpl::ss_configfile() const@Base" 0.4.4+14.10.20140508
736
 (c++)"unity::scopes::internal::RuntimeImpl::ss_configfile() const@Base" 0.4.4+14.10.20140508
134
735
 (c++)"unity::scopes::internal::RuntimeImpl::waiter_thread(std::shared_ptr<unity::scopes::internal::ThreadSafeQueue<std::future<void> > > const&) const@Base" 0.4.3+14.10.20140428
737
 (c++)"unity::scopes::internal::RuntimeImpl::waiter_thread(std::shared_ptr<unity::scopes::internal::ThreadSafeQueue<std::future<void> > > const&) const@Base" 0.4.3+14.10.20140428
135
738
 (c++)"unity::scopes::internal::RuntimeImpl::find_cache_dir() const@Base" 0replaceme
136
736
 (c++)"unity::scopes::internal::RuntimeImpl::proxy_to_string(std::shared_ptr<unity::scopes::Object> const&) const@Base" 0.4.0+14.04.20140312.1
739
 (c++)"unity::scopes::internal::RuntimeImpl::proxy_to_string(std::shared_ptr<unity::scopes::Object> const&) const@Base" 0.4.0+14.04.20140312.1
137
737
 (c++)"unity::scopes::internal::RuntimeImpl::string_to_proxy(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.4.0+14.04.20140312.1
740
 (c++)"unity::scopes::internal::RuntimeImpl::string_to_proxy(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.4.0+14.04.20140312.1
138
738
 (c++)"unity::scopes::internal::RuntimeImpl::registry_identity() const@Base" 0.4.0+14.04.20140312.1
741
 (c++)"unity::scopes::internal::RuntimeImpl::registry_identity() const@Base" 0.4.0+14.04.20140312.1
139
@@ -815,9 +818,11 @@
140
815
 (c++)"unity::scopes::internal::JsonSettingsSchema::definitions() const@Base" 0.5.2+14.10.20140709.2
818
 (c++)"unity::scopes::internal::JsonSettingsSchema::definitions() const@Base" 0.5.2+14.10.20140709.2
141
816
 (c++)"unity::scopes::internal::StateReceiverObject::state_received() const@Base" 0.4.2+14.04.20140404.2
819
 (c++)"unity::scopes::internal::StateReceiverObject::state_received() const@Base" 0.4.2+14.04.20140404.2
142
817
 (c++)"unity::scopes::QueryBase::valid() const@Base" 0.4.3+14.10.20140428
820
 (c++)"unity::scopes::QueryBase::valid() const@Base" 0.4.3+14.10.20140428
144
818
 (c++)"unity::scopes::QueryBase::settings() const@Base" 0.5.2+14.10.20140709.2
821
 (c++)"unity::scopes::QueryBase::settings() const@Base" 0replaceme
145
822
 (c++)"unity::scopes::ScopeBase::cache_directory() const@Base" 0replaceme
146
819
 (c++)"unity::scopes::ScopeBase::scope_directory() const@Base" 0.4.2+14.04.20140404.2
823
 (c++)"unity::scopes::ScopeBase::scope_directory() const@Base" 0.4.2+14.04.20140404.2
148
820
 (c++)"unity::scopes::ScopeBase::settings() const@Base" 0.5.2+14.10.20140709.2
824
 (c++)"unity::scopes::ScopeBase::registry() const@Base" 0replaceme
149
825
 (c++)"unity::scopes::ScopeBase::settings() const@Base" 0replaceme
150
821
 (c++)"typeinfo for unity::scopes::FilterBase@Base" 0.4.0+14.04.20140312.1
826
 (c++)"typeinfo for unity::scopes::FilterBase@Base" 0.4.0+14.04.20140312.1
151
822
 (c++)"typeinfo for unity::scopes::SearchReply@Base" 0.4.0+14.04.20140312.1
827
 (c++)"typeinfo for unity::scopes::SearchReply@Base" 0.4.0+14.04.20140312.1
152
823
 (c++)"typeinfo for unity::scopes::ListenerBase@Base" 0.4.0+14.04.20140312.1
828
 (c++)"typeinfo for unity::scopes::ListenerBase@Base" 0.4.0+14.04.20140312.1
153
@@ -838,6 +843,7 @@
154
838
 (c++)"typeinfo for unity::scopes::CategoryRenderer@Base" 0.4.0+14.04.20140312.1
843
 (c++)"typeinfo for unity::scopes::CategoryRenderer@Base" 0.4.0+14.04.20140312.1
155
839
 (c++)"typeinfo for unity::scopes::PreviewQueryBase@Base" 0.4.0+14.04.20140312.1
844
 (c++)"typeinfo for unity::scopes::PreviewQueryBase@Base" 0.4.0+14.04.20140312.1
156
840
 (c++)"typeinfo for unity::scopes::TimeoutException@Base" 0.4.0+14.04.20140312.1
845
 (c++)"typeinfo for unity::scopes::TimeoutException@Base" 0.4.0+14.04.20140312.1
157
846
 (c++)"typeinfo for unity::scopes::AbstractScopeBase@Base" 0replaceme
158
841
 (c++)"typeinfo for unity::scopes::CategorisedResult@Base" 0.4.0+14.04.20140312.1
847
 (c++)"typeinfo for unity::scopes::CategorisedResult@Base" 0.4.0+14.04.20140312.1
159
842
 (c++)"typeinfo for unity::scopes::NotFoundException@Base" 0.4.0+14.04.20140312.1
848
 (c++)"typeinfo for unity::scopes::NotFoundException@Base" 0.4.0+14.04.20140312.1
160
843
 (c++)"typeinfo for unity::scopes::SearchListenerBase@Base" 0.4.0+14.04.20140312.1
849
 (c++)"typeinfo for unity::scopes::SearchListenerBase@Base" 0.4.0+14.04.20140312.1
161
@@ -883,6 +889,7 @@
162
883
 (c++)"typeinfo name for unity::scopes::CategoryRenderer@Base" 0.4.0+14.04.20140312.1
889
 (c++)"typeinfo name for unity::scopes::CategoryRenderer@Base" 0.4.0+14.04.20140312.1
163
884
 (c++)"typeinfo name for unity::scopes::PreviewQueryBase@Base" 0.4.0+14.04.20140312.1
890
 (c++)"typeinfo name for unity::scopes::PreviewQueryBase@Base" 0.4.0+14.04.20140312.1
164
885
 (c++)"typeinfo name for unity::scopes::TimeoutException@Base" 0.4.0+14.04.20140312.1
891
 (c++)"typeinfo name for unity::scopes::TimeoutException@Base" 0.4.0+14.04.20140312.1
165
892
 (c++)"typeinfo name for unity::scopes::AbstractScopeBase@Base" 0replaceme
166
886
 (c++)"typeinfo name for unity::scopes::CategorisedResult@Base" 0.4.0+14.04.20140312.1
893
 (c++)"typeinfo name for unity::scopes::CategorisedResult@Base" 0.4.0+14.04.20140312.1
167
887
 (c++)"typeinfo name for unity::scopes::NotFoundException@Base" 0.4.0+14.04.20140312.1
894
 (c++)"typeinfo name for unity::scopes::NotFoundException@Base" 0.4.0+14.04.20140312.1
168
888
 (c++)"typeinfo name for unity::scopes::SearchListenerBase@Base" 0.4.0+14.04.20140312.1
895
 (c++)"typeinfo name for unity::scopes::SearchListenerBase@Base" 0.4.0+14.04.20140312.1
169
@@ -939,6 +946,7 @@
170
939
 (c++)"vtable for unity::scopes::CategoryRenderer@Base" 0.4.0+14.04.20140312.1
946
 (c++)"vtable for unity::scopes::CategoryRenderer@Base" 0.4.0+14.04.20140312.1
171
940
 (c++)"vtable for unity::scopes::PreviewQueryBase@Base" 0.4.0+14.04.20140312.1
947
 (c++)"vtable for unity::scopes::PreviewQueryBase@Base" 0.4.0+14.04.20140312.1
172
941
 (c++)"vtable for unity::scopes::TimeoutException@Base" 0.4.0+14.04.20140312.1
948
 (c++)"vtable for unity::scopes::TimeoutException@Base" 0.4.0+14.04.20140312.1
173
949
 (c++)"vtable for unity::scopes::AbstractScopeBase@Base" 0replaceme
174
942
 (c++)"vtable for unity::scopes::CategorisedResult@Base" 0.4.0+14.04.20140312.1
950
 (c++)"vtable for unity::scopes::CategorisedResult@Base" 0.4.0+14.04.20140312.1
175
943
 (c++)"vtable for unity::scopes::NotFoundException@Base" 0.4.0+14.04.20140312.1
951
 (c++)"vtable for unity::scopes::NotFoundException@Base" 0.4.0+14.04.20140312.1
176
944
 (c++)"vtable for unity::scopes::SearchListenerBase@Base" 0.4.0+14.04.20140312.1
952
 (c++)"vtable for unity::scopes::SearchListenerBase@Base" 0.4.0+14.04.20140312.1
177
945
953
178
=== modified file 'debian/tests/scopebuild'
179
--- debian/tests/scopebuild	2014-06-03 12:49:04 +0000
180
+++ debian/tests/scopebuild	2014-07-28 11:21:43 +0000
181
@@ -9,60 +9,11 @@
182
9
9
183
10
WORKDIR=$(mktemp -d)
10
WORKDIR=$(mktemp -d)
184
11
trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
11
trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
185
12
cp scopetest.cpp $WORKDIR
186
12
cd $WORKDIR
13
cd $WORKDIR
239
13
cat <<EOF > scopetest.cpp
14
240
14
#include <unity/scopes/ScopeBase.h>
15
g++ -std=c++11 -o scopetest scopetest.cpp `pkg-config --cflags --libs libunity-scopes`
189
15
#include <unity/scopes/QueryBase.h>
190
16
#include <unity/scopes/ReplyProxyFwd.h>
191
17
#include <unity/scopes/QueryBase.h>
192
18
#include <unity/scopes/PreviewQueryBase.h>
193
19
194
20
class DemoScope : public unity::scopes::ScopeBase
195
21
{
196
22
public:
197
23
    virtual int start(std::string const&, unity::scopes::RegistryProxy const&) override;
198
24
199
25
    virtual void stop() override;
200
26
201
27
    unity::scopes::PreviewQueryBase::UPtr preview(const unity::scopes::Result&,
202
28
            const unity::scopes::ActionMetadata&) override;
203
29
204
30
    virtual unity::scopes::SearchQueryBase::UPtr search(unity::scopes::CannedQuery const& q,
205
31
            unity::scopes::SearchMetadata const&) override;
206
32
};
207
33
208
34
using namespace unity::scopes;
209
35
210
36
int DemoScope::start(std::string const&, unity::scopes::RegistryProxy const&)
211
37
{
212
38
    return 0;
213
39
}
214
40
215
41
void DemoScope::stop()
216
42
{
217
43
}
218
44
219
45
SearchQueryBase::UPtr DemoScope::search(unity::scopes::CannedQuery const &q,
220
46
        unity::scopes::SearchMetadata const&)
221
47
{
222
48
    unity::scopes::SearchQueryBase::UPtr query(nullptr);
223
49
    return query;
224
50
}
225
51
226
52
PreviewQueryBase::UPtr DemoScope::preview(Result const& result, ActionMetadata const& /*metadata*/) {
227
53
    unity::scopes::PreviewQueryBase::UPtr preview(nullptr);
228
54
    return preview;
229
55
}
230
56
231
57
int main(int, char**)
232
58
{
233
59
    DemoScope d;
234
60
    return 0;
235
61
}
236
62
EOF
237
63
238
64
g++ -std=c++11 -o scopebin scopetest.cpp `pkg-config --cflags --libs libunity-scopes`
241
65
echo "Scope build: OK"
16
echo "Scope build: OK"
244
66
[ -x scopebin ]
17
[ -x scopetest ]
245
67
./scopebin
18
./scopetest
246
68
echo "Scope run: OK"
19
echo "Scope run: OK"
247
69
20
248
=== added file 'debian/tests/scopetest.cpp'
249
--- debian/tests/scopetest.cpp	1970-01-01 00:00:00 +0000
250
+++ debian/tests/scopetest.cpp	2014-07-28 11:21:43 +0000
251
@@ -0,0 +1,62 @@
252
1
/*
253
2
 * Copyright (C) 2014 Canonical Ltd
254
3
 *
255
4
 * This program is free software: you can redistribute it and/or modify
256
5
 * it under the terms of the GNU Lesser General Public License version 3 as
257
6
 * published by the Free Software Foundation.
258
7
 *
259
8
 * This program is distributed in the hope that it will be useful,
260
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
261
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
262
11
 * GNU Lesser General Public License for more details.
263
12
 *
264
13
 * You should have received a copy of the GNU Lesser General Public License
265
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
266
15
 */
267
16
268
17
#include <unity/scopes/PreviewQueryBase.h>
269
18
#include <unity/scopes/QueryBase.h>
270
19
#include <unity/scopes/ReplyProxyFwd.h>
271
20
#include <unity/scopes/ScopeBase.h>
272
21
273
22
class DemoScope : public unity::scopes::ScopeBase
274
23
{
275
24
public:
276
25
    virtual void start(std::string const&) override;
277
26
278
27
    virtual void stop() override;
279
28
280
29
    virtual unity::scopes::PreviewQueryBase::UPtr preview(const unity::scopes::Result&,
281
30
                                                          const unity::scopes::ActionMetadata&) override;
282
31
283
32
    virtual unity::scopes::SearchQueryBase::UPtr search(unity::scopes::CannedQuery const& q,
284
33
                                                        unity::scopes::SearchMetadata const&) override;
285
34
};
286
35
287
36
using namespace unity::scopes;
288
37
289
38
void DemoScope::start(std::string const&)
290
39
{
291
40
}
292
41
293
42
void DemoScope::stop()
294
43
{
295
44
}
296
45
297
46
SearchQueryBase::UPtr DemoScope::search(unity::scopes::CannedQuery const& /*q*/,
298
47
        unity::scopes::SearchMetadata const&)
299
48
{
300
49
    unity::scopes::SearchQueryBase::UPtr query(nullptr);
301
50
    return query;
302
51
}
303
52
304
53
PreviewQueryBase::UPtr DemoScope::preview(Result const& /*result*/, ActionMetadata const& /*metadata*/) {
305
54
    unity::scopes::PreviewQueryBase::UPtr preview(nullptr);
306
55
    return preview;
307
56
}
308
57
309
58
int main(int, char**)
310
59
{
311
60
    DemoScope d;
312
61
    return 0;
313
62
}
314
0
63
315
=== modified file 'demo/click/scope-click/scope-click.cpp'
316
--- demo/click/scope-click/scope-click.cpp	2014-06-17 11:20:48 +0000
317
+++ demo/click/scope-click/scope-click.cpp	2014-07-28 11:21:43 +0000
318
@@ -56,7 +56,7 @@
319
56
class MyScope : public ScopeBase
56
class MyScope : public ScopeBase
320
57
{
57
{
321
58
public:
58
public:
323
59
    virtual void start(string const&, RegistryProxy const&) override {}
59
    virtual void start(string const&) override {}
324
60
60
325
61
    virtual void stop() override {}
61
    virtual void stop() override {}
326
62
62
327
63
63
328
=== modified file 'demo/scopes/scope-A/scope-A.cpp'
329
--- demo/scopes/scope-A/scope-A.cpp	2014-06-25 16:41:51 +0000
330
+++ demo/scopes/scope-A/scope-A.cpp	2014-07-28 11:21:43 +0000
331
@@ -160,7 +160,7 @@
332
160
class MyScope : public ScopeBase
160
class MyScope : public ScopeBase
333
161
{
161
{
334
162
public:
162
public:
336
163
    virtual void start(string const& scope_id, RegistryProxy const&) override
163
    virtual void start(string const& scope_id) override
337
164
    {
164
    {
338
165
        scope_id_ = scope_id;
165
        scope_id_ = scope_id;
339
166
    }
166
    }
340
167
167
341
=== modified file 'demo/scopes/scope-B/scope-B.cpp'
342
--- demo/scopes/scope-B/scope-B.cpp	2014-06-17 11:20:48 +0000
343
+++ demo/scopes/scope-B/scope-B.cpp	2014-07-28 11:21:43 +0000
344
@@ -140,18 +140,18 @@
345
140
class MyScope : public ScopeBase
140
class MyScope : public ScopeBase
346
141
{
141
{
347
142
public:
142
public:
349
143
    virtual void start(string const& scope_id, RegistryProxy const& registry) override
143
    virtual void start(string const& scope_id) override
350
144
    {
144
    {
351
145
        scope_id_ = scope_id;
145
        scope_id_ = scope_id;
352
146
146
354
147
        if (!registry)
147
        if (!registry())
355
148
        {
148
        {
356
149
            throw ConfigException(scope_id + ": No registry available, cannot locate child scopes");
149
            throw ConfigException(scope_id + ": No registry available, cannot locate child scopes");
357
150
        }
150
        }
358
151
        // Lock up scopes C and D in the registry and remember their proxies.
151
        // Lock up scopes C and D in the registry and remember their proxies.
360
152
        auto meta_c = registry->get_metadata("scope-C");
152
        auto meta_c = registry()->get_metadata("scope-C");
361
153
        scope_c_ = meta_c.proxy();
153
        scope_c_ = meta_c.proxy();
363
154
        auto meta_d = registry->get_metadata("scope-D");
154
        auto meta_d = registry()->get_metadata("scope-D");
364
155
        scope_d_ = meta_d.proxy();
155
        scope_d_ = meta_d.proxy();
365
156
    }
156
    }
366
157
157
367
158
158
368
=== modified file 'demo/scopes/scope-C/scope-C.cpp'
369
--- demo/scopes/scope-C/scope-C.cpp	2014-06-17 11:20:48 +0000
370
+++ demo/scopes/scope-C/scope-C.cpp	2014-07-28 11:21:43 +0000
371
@@ -184,7 +184,7 @@
372
184
class MyScope : public ScopeBase
184
class MyScope : public ScopeBase
373
185
{
185
{
374
186
public:
186
public:
376
187
    virtual void start(string const& scope_id, RegistryProxy const&) override
187
    virtual void start(string const& scope_id) override
377
188
    {
188
    {
378
189
        scope_id_ = scope_id;
189
        scope_id_ = scope_id;
379
190
    }
190
    }
380
191
191
381
=== modified file 'demo/scopes/scope-D/scope-D.cpp'
382
--- demo/scopes/scope-D/scope-D.cpp	2014-06-17 11:20:48 +0000
383
+++ demo/scopes/scope-D/scope-D.cpp	2014-07-28 11:21:43 +0000
384
@@ -183,7 +183,7 @@
385
183
class MyScope : public ScopeBase
183
class MyScope : public ScopeBase
386
184
{
184
{
387
185
public:
185
public:
389
186
    virtual void start(string const& scope_id, RegistryProxy const&) override
186
    virtual void start(string const& scope_id) override
390
187
    {
187
    {
391
188
        scope_id_ = scope_id;
188
        scope_id_ = scope_id;
392
189
    }
189
    }
393
190
190
394
=== modified file 'demo/scopes/scope-N/scope-N.cpp'
395
--- demo/scopes/scope-N/scope-N.cpp	2014-06-17 11:20:48 +0000
396
+++ demo/scopes/scope-N/scope-N.cpp	2014-07-28 11:21:43 +0000
397
@@ -68,7 +68,7 @@
398
68
class MyScope : public ScopeBase
68
class MyScope : public ScopeBase
399
69
{
69
{
400
70
public:
70
public:
402
71
    virtual void start(string const& scope_id, RegistryProxy const&) override
71
    virtual void start(string const& scope_id) override
403
72
    {
72
    {
404
73
        scope_id_ = scope_id;
73
        scope_id_ = scope_id;
405
74
    }
74
    }
406
75
75
407
=== modified file 'demo/scopes/scope-S/scope-S.cpp'
408
--- demo/scopes/scope-S/scope-S.cpp	2014-06-17 11:20:48 +0000
409
+++ demo/scopes/scope-S/scope-S.cpp	2014-07-28 11:21:43 +0000
410
@@ -85,7 +85,7 @@
411
85
class MyScope : public ScopeBase
85
class MyScope : public ScopeBase
412
86
{
86
{
413
87
public:
87
public:
415
88
    virtual void start(string const& scope_id, RegistryProxy const&) override
88
    virtual void start(string const& scope_id) override
416
89
    {
89
    {
417
90
        scope_id_ = scope_id;
90
        scope_id_ = scope_id;
418
91
    }
91
    }
419
92
92
420
=== modified file 'doc/tutorial.dox'
421
--- doc/tutorial.dox	2014-07-22 10:38:18 +0000
422
+++ doc/tutorial.dox	2014-07-28 11:21:43 +0000
423
@@ -615,10 +615,10 @@
424
615
With the above classes a test case that checks if MyScope calls appropriate methods of unity::scopes::SearchReply may look like this (note that it just checks
615
With the above classes a test case that checks if MyScope calls appropriate methods of unity::scopes::SearchReply may look like this (note that it just checks
425
616
if proper methods get called and uses _ matchers that match any values; put actual values in there for stricts checks):
616
if proper methods get called and uses _ matchers that match any values; put actual values in there for stricts checks):
426
617
\code{.cpp}
617
\code{.cpp}
428
618
typedef unity::scopes::testing::TypedScopeFixture<MyScope> TestScopeFixutre;
618
typedef unity::scopes::testing::TypedScopeFixture<MyScope> TestScopeFixture;
429
619
using namespace ::testing;
619
using namespace ::testing;
430
620
620
432
621
TEST_F(TestScopeFixutre, search_results)
621
TEST_F(TestScopeFixture, search_results)
433
622
{
622
{
434
623
    const unity::scopes::CategoryRenderer renderer;
623
    const unity::scopes::CategoryRenderer renderer;
435
624
624
436
@@ -724,7 +724,7 @@
437
724
The `ScopeConfig` group is mandatory and must contain settings for at least `DisplayName`, `Description`, and `Author`.
724
The `ScopeConfig` group is mandatory and must contain settings for at least `DisplayName`, `Description`, and `Author`.
438
725
`DisplayName` and `Description` can (and should) be localized. For example:
725
`DisplayName` and `Description` can (and should) be localized. For example:
439
726
726
441
727
`Description[de] = Fu&szlig;ballergebnisse`
727
`Description[de_DE] = Fu&szlig;ballergebnisse`
442
728
728
443
729
In addition to allowing the registry to make the scope available, this information controls how the scope appears
729
In addition to allowing the registry to make the scope available, this information controls how the scope appears
444
730
in the "Scopes" scope.
730
in the "Scopes" scope.
445
731
731
446
=== added file 'include/unity/scopes/AbstractScopeBase.h'
447
--- include/unity/scopes/AbstractScopeBase.h	1970-01-01 00:00:00 +0000
448
+++ include/unity/scopes/AbstractScopeBase.h	2014-07-28 11:21:43 +0000
449
@@ -0,0 +1,65 @@
450
1
/*
451
2
 * Copyright (C) 2014 Canonical Ltd
452
3
 *
453
4
 * This program is free software: you can redistribute it and/or modify
454
5
 * it under the terms of the GNU Lesser General Public License version 3 as
455
6
 * published by the Free Software Foundation.
456
7
 *
457
8
 * This program is distributed in the hope that it will be useful,
458
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
459
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
460
11
 * GNU Lesser General Public License for more details.
461
12
 *
462
13
 * You should have received a copy of the GNU Lesser General Public License
463
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
464
15
 *
465
16
 * Authored by: Michi Henning <michi.henning@canonical.com>
466
17
 */
467
18
468
19
#ifndef UNITY_SCOPES_ABSTRACTSCOPEBASE_H
469
20
#define UNITY_SCOPES_ABSTRACTSCOPEBASE_H
470
21
471
22
#include <unity/scopes/ActivationQueryBase.h>
472
23
#include <unity/scopes/PreviewQueryBase.h>
473
24
#include <unity/scopes/Registry.h>
474
25
#include <unity/scopes/SearchQueryBase.h>
475
26
476
27
namespace unity
477
28
{
478
29
479
30
namespace scopes
480
31
{
481
32
482
33
/**
483
34
\brief Abstract base class for a scope implementation.
484
35
485
36
This class allows a scope to be replaced by a mock implementation.
486
37
See unity::scopes::ScopeBase for documentation of the member functions.
487
38
*/
488
39
489
40
class AbstractScopeBase
490
41
{
491
42
public:
492
43
/// @cond
493
44
    virtual void start(std::string const& scope_id) = 0;
494
45
    virtual void stop() = 0;
495
46
    virtual void run() = 0;
496
47
    virtual SearchQueryBase::UPtr search(CannedQuery const& query, SearchMetadata const& metadata) = 0;
497
48
    virtual ActivationQueryBase::UPtr activate(Result const& result, ActionMetadata const& metadata) = 0;
498
49
    virtual ActivationQueryBase::UPtr perform_action(Result const& result,
499
50
                                                     ActionMetadata const& metadata,
500
51
                                                     std::string const& widget_id,
501
52
                                                     std::string const& action_id) = 0;
502
53
    virtual PreviewQueryBase::UPtr preview(Result const& result, ActionMetadata const& metadata) = 0;
503
54
    virtual std::string scope_directory() const = 0;
504
55
    virtual std::string cache_directory() const = 0;
505
56
    virtual unity::scopes::RegistryProxy registry() const = 0;
506
57
    virtual VariantMap settings() const = 0;
507
58
/// @endcond
508
59
};
509
60
510
61
} // namespace scopes
511
62
512
63
} // namespace unity
513
64
514
65
#endif
515
0
66
516
=== modified file 'include/unity/scopes/ScopeBase.h'
517
--- include/unity/scopes/ScopeBase.h	2014-06-24 11:11:11 +0000
518
+++ include/unity/scopes/ScopeBase.h	2014-07-28 11:21:43 +0000
519
@@ -19,14 +19,10 @@
520
19
#ifndef UNITY_SCOPES_SCOPEBASE_H
19
#ifndef UNITY_SCOPES_SCOPEBASE_H
521
20
#define UNITY_SCOPES_SCOPEBASE_H
20
#define UNITY_SCOPES_SCOPEBASE_H
522
21
21
529
22
#include <unity/scopes/SearchQueryBase.h>
22
#include <unity/scopes/AbstractScopeBase.h>
524
23
#include <unity/scopes/PreviewQueryBase.h>
525
24
#include <unity/scopes/RegistryProxyFwd.h>
526
25
#include <unity/scopes/ActivationQueryBase.h>
527
26
#include <unity/scopes/Version.h>
528
27
#include <unity/scopes/Result.h>
530
28
#include <unity/scopes/ActionMetadata.h>
23
#include <unity/scopes/ActionMetadata.h>
531
29
#include <unity/scopes/SearchMetadata.h>
24
#include <unity/scopes/SearchMetadata.h>
532
25
#include <unity/scopes/Version.h>
533
30
26
534
31
/**
27
/**
535
32
\brief Expands to the identifier of the scope create function. @hideinitializer
28
\brief Expands to the identifier of the scope create function. @hideinitializer
536
@@ -68,9 +64,10 @@
537
68
64
538
69
namespace internal
65
namespace internal
539
70
{
66
{
540
67
541
71
class ScopeBaseImpl;
68
class ScopeBaseImpl;
542
72
class ScopeLoader;
543
73
class RuntimeImpl;
69
class RuntimeImpl;
544
70
545
74
}
71
}
546
75
72
547
76
/**
73
/**
548
@@ -90,9 +87,9 @@
549
90
    MyScope();
87
    MyScope();
550
91
    virtual ~MyScope();
88
    virtual ~MyScope();
551
92
89
555
93
    virtual void start();   // Optional
90
    virtual void start(std::string const& scope_id);   // Optional
556
94
    virtual void stop();    // Optional
91
    virtual void stop();                               // Optional
557
95
    virtual void run();     // Optional
92
    virtual void run();                                // Optional
558
96
};
93
};
559
97
~~~
94
~~~
560
98
95
561
@@ -134,7 +131,7 @@
562
134
call to stop() in a timely manner.
131
call to stop() in a timely manner.
563
135
*/
132
*/
564
136
133
566
137
class ScopeBase
134
class ScopeBase : public AbstractScopeBase
567
138
{
135
{
568
139
public:
136
public:
569
140
    /// @cond
137
    /// @cond
570
@@ -150,11 +147,8 @@
571
150
    The call to start() is made by the same thread that calls the create function.
147
    The call to start() is made by the same thread that calls the create function.
572
151
148
573
152
    \param scope_id The name of the scope as defined by the scope's configuration file.
149
    \param scope_id The name of the scope as defined by the scope's configuration file.
574
153
575
154
    \param registry A proxy to the scope registry. This parameter is provided for aggregating
576
155
    scopes that need to retrieve proxies to their child scopes.
577
156
    */
150
    */
579
157
    virtual void start(std::string const& scope_id, RegistryProxy const& registry);
151
    virtual void start(std::string const& scope_id);
580
158
152
581
159
    /**
153
    /**
582
160
    \brief Called by the scopes run time when the scope should shut down.
154
    \brief Called by the scopes run time when the scope should shut down.
583
@@ -184,7 +178,7 @@
584
184
    /**
178
    /**
585
185
    \brief Called by the scopes run time when a scope needs to instantiate a query.
179
    \brief Called by the scopes run time when a scope needs to instantiate a query.
586
186
180
588
187
    This method must return an instance that is derived from QueryBase. The implementation
181
    This method must return an instance that is derived from `QueryBase`. The implementation
589
188
    of this method must return in a timely manner, that is, it should perform only minimal
182
    of this method must return in a timely manner, that is, it should perform only minimal
590
189
    initialization that is guaranteed to complete quickly. The call to search() is made
183
    initialization that is guaranteed to complete quickly. The call to search() is made
591
190
    by an arbitrary thread.
184
    by an arbitrary thread.
592
@@ -197,7 +191,7 @@
593
197
    /**
191
    /**
594
198
    \brief Called by the scopes run time when a scope needs to respond to a result activation request.
192
    \brief Called by the scopes run time when a scope needs to respond to a result activation request.
595
199
193
597
200
    This method must return an instance that is derived from ActivationQueryBase. The implementation
194
    This method must return an instance that is derived from `ActivationQueryBase`. The implementation
598
201
    of this method must return in a timely manner, that is, it should perform only minimal
195
    of this method must return in a timely manner, that is, it should perform only minimal
599
202
    initialization that is guaranteed to complete quickly. The call to activate() is made
196
    initialization that is guaranteed to complete quickly. The call to activate() is made
600
203
    by an arbitrary thread.
197
    by an arbitrary thread.
601
@@ -206,13 +200,13 @@
602
206
    \param result The result that should be activated.
200
    \param result The result that should be activated.
603
207
    \param metadata additional data sent by the client.
201
    \param metadata additional data sent by the client.
604
208
    \return The activation instance.
202
    \return The activation instance.
606
209
     */
203
    */
607
210
    virtual ActivationQueryBase::UPtr activate(Result const& result, ActionMetadata const& metadata);
204
    virtual ActivationQueryBase::UPtr activate(Result const& result, ActionMetadata const& metadata);
608
211
205
609
212
    /**
206
    /**
610
213
    \brief Invoked when a scope is requested to handle a preview action.
207
    \brief Invoked when a scope is requested to handle a preview action.
611
214
208
613
215
    This method must return an instance that is derived from ActivationQueryBase. The implementation
209
    This method must return an instance that is derived from `ActivationQueryBase`. The implementation
614
216
    of this method must return in a timely manner, that is, it should perform only minimal
210
    of this method must return in a timely manner, that is, it should perform only minimal
615
217
    initialization that is guaranteed to complete quickly. The call to activate() is made
211
    initialization that is guaranteed to complete quickly. The call to activate() is made
616
218
    by an arbitrary thread.
212
    by an arbitrary thread.
617
@@ -223,20 +217,23 @@
618
223
    \param widget_id The identifier of the 'actions' widget of the activated action.
217
    \param widget_id The identifier of the 'actions' widget of the activated action.
619
224
    \param action_id The identifier of the action that was activated.
218
    \param action_id The identifier of the action that was activated.
620
225
    \return The activation instance.
219
    \return The activation instance.
623
226
     */
220
    */
624
227
    virtual ActivationQueryBase::UPtr perform_action(Result const& result, ActionMetadata const& metadata, std::string const& widget_id, std::string const& action_id);
221
    virtual ActivationQueryBase::UPtr perform_action(Result const& result,
625
222
                                                     ActionMetadata const& metadata,
626
223
                                                     std::string const& widget_id,
627
224
                                                     std::string const& action_id);
628
228
225
629
229
    /**
226
    /**
630
230
    \brief Invoked when a scope is requested to create a preview for a particular result.
227
    \brief Invoked when a scope is requested to create a preview for a particular result.
631
231
228
633
232
    This method must return an instance that is derived from PreviewQueryBase. The implementation
229
    This method must return an instance that is derived from `PreviewQueryBase`. The implementation
634
233
    of this method must return in a timely manner, that is, it should perform only minimal
230
    of this method must return in a timely manner, that is, it should perform only minimal
635
234
    initialization that is guaranteed to complete quickly. The call to activate() is made
231
    initialization that is guaranteed to complete quickly. The call to activate() is made
636
235
    by an arbitrary thread.
232
    by an arbitrary thread.
637
236
    \param result The result that should be previewed.
233
    \param result The result that should be previewed.
638
237
    \param metadata Additional data sent by the client.
234
    \param metadata Additional data sent by the client.
639
238
    \return The preview instance.
235
    \return The preview instance.
641
239
     */
236
    */
642
240
    virtual PreviewQueryBase::UPtr preview(Result const& result, ActionMetadata const& metadata) = 0;
237
    virtual PreviewQueryBase::UPtr preview(Result const& result, ActionMetadata const& metadata) = 0;
643
241
238
644
242
    /**
239
    /**
645
@@ -251,8 +248,34 @@
646
251
    call this method from the constructor!
248
    call this method from the constructor!
647
252
249
648
253
    \return The scope's configuration directory.
250
    \return The scope's configuration directory.
651
254
    */
251
    \throws LogicException if called from the constructor of this instance.
652
255
    std::string scope_directory() const;
252
    */
653
253
    virtual std::string scope_directory() const final;
654
254
655
255
    /**
656
256
    \brief Returns a directory that is (exclusively) writable for the scope.
657
257
658
258
    This directory allows scopes to store persistent information, such
659
259
    as cached content or similar.
660
260
661
261
    \note The cache directory is available only after this ScopeBase is instantiated; do not
662
262
    call this method from the constructor!
663
263
664
264
    \return The root directory of the filesystem sub-tree that is writable for the scope.
665
265
    \throws LogicException if called from the constructor of this instance.
666
266
    */
667
267
    virtual std::string cache_directory() const final;
668
268
669
269
    /**
670
270
    \brief Returns the proxy to the registry.
671
271
672
272
    \note The registr proxy is available only after this ScopeBase is instantiated; do not
673
273
    call this method from the constructor!
674
274
675
275
    \return The proxy to the registry.
676
276
    \throws LogicException if called from the constructor of this instance.
677
277
    */
678
278
    virtual unity::scopes::RegistryProxy registry() const final;
679
256
279
680
257
    /**
280
    /**
681
258
    \brief Returns a dictionary with the scope's current settings.
281
    \brief Returns a dictionary with the scope's current settings.
682
@@ -266,8 +289,9 @@
683
266
    call this method from the constructor!
289
    call this method from the constructor!
684
267
290
685
268
    \return The scope's current settings.
291
    \return The scope's current settings.
686
292
    \throws LogicException if called from the constructor of this instance.
687
269
    */
293
    */
689
270
    VariantMap settings() const;
294
    virtual VariantMap settings() const final;
690
271
295
691
272
protected:
296
protected:
692
273
    /// @cond
297
    /// @cond
693
@@ -275,9 +299,8 @@
694
275
private:
299
private:
695
276
    std::unique_ptr<internal::ScopeBaseImpl> p;
300
    std::unique_ptr<internal::ScopeBaseImpl> p;
696
277
301
698
278
    friend class internal::ScopeLoader;
302
    friend class internal::RuntimeImpl;
699
279
    friend class internal::ScopeObject;
303
    friend class internal::ScopeObject;
700
280
    friend class internal::RuntimeImpl;
701
281
    /// @endcond
304
    /// @endcond
702
282
};
305
};
703
283
306
704
@@ -287,13 +310,17 @@
705
287
310
706
288
/**
311
/**
707
289
\brief The function called by the scopes run time to initialize the scope.
312
\brief The function called by the scopes run time to initialize the scope.
709
290
It must return a pointer to an instance derived from ScopeBase. The returned
313
It must return a pointer to an instance derived from `ScopeBase`. The returned
710
291
instance need not be heap-allocated, but must remain in scope until the
314
instance need not be heap-allocated, but must remain in scope until the
711
292
destroy function is called by the scopes run time.
315
destroy function is called by the scopes run time.
712
293
316
713
294
If this function throws an exception, the destroy function will _not_ be called. If this function returns NULL,
317
If this function throws an exception, the destroy function will _not_ be called. If this function returns NULL,
714
295
the destroy function _will_ be called with NULL as its argument.
318
the destroy function _will_ be called with NULL as its argument.
715
296
319
716
320
\note The only purpose of the create function is to return the an instance.
717
321
Do not do anything in the implementation that might block, and do
718
322
not attempt to call any methods on `ScopeBase` from the constructor.
719
323
720
297
\return The pointer to the ScopeBase instance.
324
\return The pointer to the ScopeBase instance.
721
298
*/
325
*/
722
299
extern "C" unity::scopes::ScopeBase* UNITY_SCOPE_CREATE_FUNCTION();
326
extern "C" unity::scopes::ScopeBase* UNITY_SCOPE_CREATE_FUNCTION();
723
300
327
724
=== modified file 'include/unity/scopes/internal/DfltConfig.h.in'
725
--- include/unity/scopes/internal/DfltConfig.h.in	2014-07-21 06:34:24 +0000
726
+++ include/unity/scopes/internal/DfltConfig.h.in	2014-07-28 11:21:43 +0000
727
@@ -39,6 +39,7 @@
728
39
static constexpr char const* DFLT_MIDDLEWARE_INI = DFLT_ZMQ_MIDDLEWARE_INI;
39
static constexpr char const* DFLT_MIDDLEWARE_INI = DFLT_ZMQ_MIDDLEWARE_INI;
729
40
static constexpr char const* DFLT_SCOPE_INSTALL_DIR = "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_PREFIX@/@UNITY_SCOPES_LIB@";
40
static constexpr char const* DFLT_SCOPE_INSTALL_DIR = "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_PREFIX@/@UNITY_SCOPES_LIB@";
730
41
static constexpr char const* DFLT_OEM_INSTALL_DIR = "/custom/@LIB_INSTALL_PREFIX@/@UNITY_SCOPES_LIB@";
41
static constexpr char const* DFLT_OEM_INSTALL_DIR = "/custom/@LIB_INSTALL_PREFIX@/@UNITY_SCOPES_LIB@";
731
42
static constexpr char const* DFLT_CONFINEMENT_TYPE = "leaf-net";
732
42
43
733
43
static constexpr int DFLT_SS_HTTP_TIMEOUT = 20;              // seconds
44
static constexpr int DFLT_SS_HTTP_TIMEOUT = 20;              // seconds
734
44
static constexpr int DFLT_SS_REG_REFRESH_RATE = 86400;       // 24 hours as seconds
45
static constexpr int DFLT_SS_REG_REFRESH_RATE = 86400;       // 24 hours as seconds
735
45
46
736
=== modified file 'include/unity/scopes/internal/RuntimeImpl.h'
737
--- include/unity/scopes/internal/RuntimeImpl.h	2014-06-24 03:05:19 +0000
738
+++ include/unity/scopes/internal/RuntimeImpl.h	2014-07-28 11:21:43 +0000
739
@@ -64,6 +64,7 @@
740
64
private:
64
private:
741
65
    RuntimeImpl(std::string const& scope_id, std::string const& configfile);
65
    RuntimeImpl(std::string const& scope_id, std::string const& configfile);
742
66
    void waiter_thread(ThreadSafeQueue<std::future<void>>::SPtr const& queue) const noexcept;
66
    void waiter_thread(ThreadSafeQueue<std::future<void>>::SPtr const& queue) const noexcept;
743
67
    std::string find_cache_dir() const;
744
67
68
745
68
    bool destroyed_;
69
    bool destroyed_;
746
69
    std::string scope_id_;
70
    std::string scope_id_;
747
70
71
748
=== modified file 'include/unity/scopes/internal/ScopeBaseImpl.h'
749
--- include/unity/scopes/internal/ScopeBaseImpl.h	2014-06-24 03:05:19 +0000
750
+++ include/unity/scopes/internal/ScopeBaseImpl.h	2014-07-28 11:21:43 +0000
751
@@ -19,9 +19,9 @@
752
19
#ifndef UNITY_SCOPES_INTERNAL_SCOPEBASEIMPL_H
19
#ifndef UNITY_SCOPES_INTERNAL_SCOPEBASEIMPL_H
753
20
#define UNITY_SCOPES_INTERNAL_SCOPEBASEIMPL_H
20
#define UNITY_SCOPES_INTERNAL_SCOPEBASEIMPL_H
754
21
21
755
22
#include <unity/scopes/RegistryProxyFwd.h>
756
22
#include <unity/scopes/Variant.h>
23
#include <unity/scopes/Variant.h>
757
23
24
758
24
#include <memory>
759
25
#include <mutex>
25
#include <mutex>
760
26
#include <string>
26
#include <string>
761
27
27
762
@@ -39,17 +39,35 @@
763
39
class ScopeBaseImpl final
39
class ScopeBaseImpl final
764
40
{
40
{
765
41
public:
41
public:
767
42
    ScopeBaseImpl() = default;
42
    ScopeBaseImpl();
768
43
    ~ScopeBaseImpl() = default;
43
    ~ScopeBaseImpl() = default;
770
44
    void set_scope_directory(std::string const &path);
44
771
45
    void set_scope_directory(std::string const& path);
772
45
    std::string scope_directory() const;
46
    std::string scope_directory() const;
773
47
774
48
    void set_cache_directory(std::string const& path);
775
49
    std::string cache_directory() const;
776
50
777
51
    void set_registry(RegistryProxy const& registry);
778
52
    RegistryProxy registry() const;
779
53
780
46
    std::shared_ptr<unity::scopes::internal::SettingsDB> settings_db() const;
54
    std::shared_ptr<unity::scopes::internal::SettingsDB> settings_db() const;
781
47
    void set_settings_db(std::shared_ptr<unity::scopes::internal::SettingsDB> const& db);
55
    void set_settings_db(std::shared_ptr<unity::scopes::internal::SettingsDB> const& db);
782
48
    unity::scopes::VariantMap settings() const;
56
    unity::scopes::VariantMap settings() const;
783
49
57
784
50
private:
58
private:
785
51
    std::string scope_directory_;
59
    std::string scope_directory_;
786
60
    bool scope_dir_initialized_;
787
61
788
62
    std::string cache_directory_;
789
63
    bool cache_dir_initialized_;
790
64
791
65
    unity::scopes::RegistryProxy registry_;
792
66
    bool registry_initialized_;
793
67
794
52
    std::shared_ptr<unity::scopes::internal::SettingsDB> db_;
68
    std::shared_ptr<unity::scopes::internal::SettingsDB> db_;
795
69
    bool settings_db_initialized_;
796
70
797
53
    mutable std::mutex mutex_;
71
    mutable std::mutex mutex_;
798
54
};
72
};
799
55
73
800
56
74
801
=== modified file 'include/unity/scopes/internal/ScopeConfig.h'
802
--- include/unity/scopes/internal/ScopeConfig.h	2014-06-26 12:49:46 +0000
803
+++ include/unity/scopes/internal/ScopeConfig.h	2014-07-28 11:21:43 +0000
804
@@ -39,18 +39,18 @@
805
39
    ScopeConfig(std::string const& configfile);
39
    ScopeConfig(std::string const& configfile);
806
40
    ~ScopeConfig();
40
    ~ScopeConfig();
807
41
41
820
42
    bool overrideable() const;           // Optional, returns false if not present
42
    bool overrideable() const;             // Optional, returns false if not present
821
43
    std::string display_name() const;    // Mandatory, localizable
43
    std::string display_name() const;      // Mandatory, localizable
822
44
    std::string description() const;     // Mandatory, localizable
44
    std::string description() const;       // Mandatory, localizable
823
45
    std::string author() const;          // Mandatory
45
    std::string author() const;            // Mandatory
824
46
    std::string art() const;             // Optional, throws NotFoundException if not present
46
    std::string art() const;               // Optional, throws NotFoundException if not present
825
47
    std::string icon() const;            // Optional, throws NotFoundException if not present
47
    std::string icon() const;              // Optional, throws NotFoundException if not present
826
48
    std::string search_hint() const;     // Optional, localizable, throws NotFoundException if not present
48
    std::string search_hint() const;       // Optional, localizable, throws NotFoundException if not present
827
49
    std::string hot_key() const;         // Optional, throws NotFoundException if not present
49
    std::string hot_key() const;           // Optional, throws NotFoundException if not present
828
50
    bool invisible() const;              // Optional, returns false if not present
50
    bool invisible() const;                // Optional, returns false if not present
829
51
    bool location_data_needed() const;   // Optional, returns false if not present
51
    bool location_data_needed() const;     // Optional, returns false if not present
830
52
    std::string scope_runner() const;    // Optional, throws NotFoundException if not present
52
    std::string scope_runner() const;      // Optional, throws NotFoundException if not present
831
53
    int idle_timeout() const;            // Optional, returns default value if not present
53
    int idle_timeout() const;              // Optional, returns default value if not present
832
54
    ScopeMetadata::ResultsTtlType results_ttl_type() const;  // Optional, returns none if not present
54
    ScopeMetadata::ResultsTtlType results_ttl_type() const;  // Optional, returns none if not present
833
55
55
834
56
    VariantMap appearance_attributes() const; // Optional, returns empty map if no attributes are present
56
    VariantMap appearance_attributes() const; // Optional, returns empty map if no attributes are present
835
57
57
836
=== modified file 'include/unity/scopes/internal/ScopeLoader.h'
837
--- include/unity/scopes/internal/ScopeLoader.h	2014-07-02 05:17:19 +0000
838
+++ include/unity/scopes/internal/ScopeLoader.h	2014-07-28 11:21:43 +0000
839
@@ -40,12 +40,8 @@
840
40
    NONCOPYABLE(ScopeLoader);
40
    NONCOPYABLE(ScopeLoader);
841
41
    UNITY_DEFINES_PTRS(ScopeLoader);
41
    UNITY_DEFINES_PTRS(ScopeLoader);
842
42
42
849
43
    // Creates a ScopeLoader for a scope with the given ID, library, and settings dir. We pass in the registry proxy
43
    // Creates a ScopeLoader for a scope with the given ID and library.
850
44
    // so we can pass it to the scope's start method.
44
    static UPtr load(std::string const& scope_id, std::string const& libpath);
845
45
    static UPtr load(std::string const& scope_id,
846
46
                     std::string const& libpath,
847
47
                     std::string const& data_dir,
848
48
                     RegistryProxy const& registry);
851
49
45
852
50
    // unload() explicitly finalizes the scope. This is called by the destructor too, but calling it explicity
46
    // unload() explicitly finalizes the scope. This is called by the destructor too, but calling it explicity
853
51
    // allows the caller to receive any exceptions that may have been produced by the scope thread.
47
    // allows the caller to receive any exceptions that may have been produced by the scope thread.
854
@@ -67,14 +63,10 @@
855
67
    ~ScopeLoader();
63
    ~ScopeLoader();
856
68
64
857
69
private:
65
private:
862
70
    ScopeLoader(std::string const& scope_id,
66
    ScopeLoader(std::string const& scope_id, std::string const& path);
859
71
                std::string const& libpath,
860
72
                std::string const& data_dir,
861
73
                RegistryProxy const& registry);
863
74
67
864
75
    std::string scope_id_;
68
    std::string scope_id_;
865
76
    unity::scopes::internal::DynamicLoader::UPtr dyn_loader_;
69
    unity::scopes::internal::DynamicLoader::UPtr dyn_loader_;
866
77
    unity::scopes::RegistryProxy registry_;
867
78
    std::exception_ptr exception_;
70
    std::exception_ptr exception_;
868
79
71
869
80
    std::thread scope_thread_;
72
    std::thread scope_thread_;
870
81
73
871
=== modified file 'include/unity/scopes/testing/TypedScopeFixture.h'
872
--- include/unity/scopes/testing/TypedScopeFixture.h	2014-06-17 09:27:49 +0000
873
+++ include/unity/scopes/testing/TypedScopeFixture.h	2014-07-28 11:21:43 +0000
874
@@ -46,9 +46,9 @@
875
46
        return "unknown";
46
        return "unknown";
876
47
    }
47
    }
877
48
48
879
49
    inline static std::shared_ptr<Scope> construct()
49
    inline static std::shared_ptr<Scope> construct(RegistryProxy const& r)
880
50
    {
50
    {
882
51
        return std::make_shared<Scope>();
51
        return std::make_shared<Scope>(r);
883
52
    }
52
    }
884
53
};
53
};
885
54
54
886
@@ -57,14 +57,14 @@
887
57
{
57
{
888
58
public:
58
public:
889
59
    TypedScopeFixture()
59
    TypedScopeFixture()
892
60
        : scope(ScopeTraits<Scope>::construct()),
60
        : registry_proxy(&registry, [](unity::scopes::Registry*) {})
893
61
          registry_proxy(&registry, [](unity::scopes::Registry*) {})
61
        , scope(ScopeTraits<Scope>::construct(registry_proxy))
894
62
    {
62
    {
895
63
    }
63
    }
896
64
64
897
65
    void SetUp()
65
    void SetUp()
898
66
    {
66
    {
900
67
        EXPECT_NO_THROW(scope->start(ScopeTraits<Scope>::name(), registry_proxy));
67
        EXPECT_NO_THROW(scope->start(ScopeTraits<Scope>::name()));
901
68
        EXPECT_NO_THROW(scope->run());
68
        EXPECT_NO_THROW(scope->run());
902
69
    }
69
    }
903
70
70
904
@@ -74,9 +74,9 @@
905
74
    }
74
    }
906
75
75
907
76
protected:
76
protected:
908
77
    std::shared_ptr<Scope> scope;
909
78
    unity::scopes::testing::MockRegistry registry;
77
    unity::scopes::testing::MockRegistry registry;
910
79
    unity::scopes::RegistryProxy registry_proxy;
78
    unity::scopes::RegistryProxy registry_proxy;
911
79
    std::shared_ptr<Scope> scope;
912
80
};
80
};
913
81
81
914
82
/// @endcond
82
/// @endcond
915
83
83
916
=== modified file 'scoperegistry/scoperegistry.cpp'
917
--- scoperegistry/scoperegistry.cpp	2014-07-22 10:48:57 +0000
918
+++ scoperegistry/scoperegistry.cpp	2014-07-28 11:21:43 +0000
919
@@ -35,7 +35,6 @@
920
35
35
921
36
#include <boost/algorithm/string.hpp>
36
#include <boost/algorithm/string.hpp>
922
37
#include <boost/filesystem/operations.hpp>
37
#include <boost/filesystem/operations.hpp>
923
38
#include <boost/filesystem/path.hpp>
924
39
38
925
40
#include <algorithm>
39
#include <algorithm>
926
41
#include <cassert>
40
#include <cassert>
927
@@ -43,11 +42,8 @@
928
43
#include <iostream>
42
#include <iostream>
929
44
#include <map>
43
#include <map>
930
45
#include <set>
44
#include <set>
936
46
#include <sstream>
45
937
47
46
#include <sys/stat.h>  // TODO: remove this once hack for creating data root dir is removed
933
48
#include <libgen.h>
934
49
#include <unistd.h>
935
50
938
51
47
939
52
using namespace scoperegistry;
48
using namespace scoperegistry;
940
53
using namespace std;
49
using namespace std;
941
@@ -464,11 +460,23 @@
942
464
        SignalThreadWrapper signal_handler_wrapper;
460
        SignalThreadWrapper signal_handler_wrapper;
943
465
461
944
466
        // And finally creating our runtime.
462
        // And finally creating our runtime.
950
467
        RuntimeConfig rt_config(config_file);
463
        string identity;
951
468
        RuntimeImpl::UPtr runtime = RuntimeImpl::create(rt_config.registry_identity(), config_file);
464
        string ss_reg_id;
952
469
465
        RuntimeImpl::UPtr runtime;
953
470
        string identity = runtime->registry_identity();
466
        {
954
471
        string ss_reg_id = runtime->ss_registry_identity();
467
            RuntimeConfig rt_config(config_file);
955
468
            runtime = RuntimeImpl::create(rt_config.registry_identity(), config_file);
956
469
957
470
            identity = runtime->registry_identity();
958
471
            ss_reg_id = runtime->ss_registry_identity();
959
472
960
473
            // TODO: HACK: We create the root of the data directory for confined scopes,
961
474
            //       in case the scope is confined and the dir doesn't exist
962
475
            //       yet. This really should be done by the click-installation but,
963
476
            //       prior to RTM, we don't rely on that.
964
477
            string data_root = rt_config.data_directory() + "/leaf-net";
965
478
            ::mkdir(data_root.c_str(), 0700);
966
479
        } // Release memory for config parser
967
472
480
968
473
        // Collect the registry config data.
481
        // Collect the registry config data.
969
474
482
970
@@ -539,9 +547,8 @@
971
539
        }
547
        }
972
540
548
973
541
        // Configure watches for scope install directories
549
        // Configure watches for scope install directories
977
542
        ScopesWatcher local_scopes_watcher(registry,
550
        auto local_watch_lambda = [registry, &middleware, &scoperunner_path, &config_file, process_timeout]
978
543
                                           [registry, &middleware, &scoperunner_path, &config_file, process_timeout]
551
                                  (pair<string, string> const& scope)
976
544
                                           (pair<string, string> const& scope)
979
545
        {
552
        {
980
546
            try
553
            try
981
547
            {
554
            {
982
@@ -551,13 +558,13 @@
983
551
            {
558
            {
984
552
                error("ignoring installed scope \"" + scope.first + "\": cannot create metadata: " + e.what());
559
                error("ignoring installed scope \"" + scope.first + "\": cannot create metadata: " + e.what());
985
553
            }
560
            }
987
554
        });
561
        };
988
562
        ScopesWatcher local_scopes_watcher(registry, local_watch_lambda);
989
555
        local_scopes_watcher.add_install_dir(scope_installdir);
563
        local_scopes_watcher.add_install_dir(scope_installdir);
990
556
        local_scopes_watcher.add_install_dir(oem_installdir);
564
        local_scopes_watcher.add_install_dir(oem_installdir);
991
557
565
995
558
        ScopesWatcher click_scopes_watcher(registry,
566
        auto click_watch_lambda = [registry, &middleware, &scoperunner_path, &config_file, process_timeout]
996
559
                                           [registry, &middleware, &scoperunner_path, &config_file, process_timeout]
567
                                  (pair<string, string> const& scope)
994
560
                                           (pair<string, string> const& scope)
997
561
        {
568
        {
998
562
            try
569
            try
999
563
            {
570
            {
1000
@@ -567,7 +574,8 @@
1001
567
            {
574
            {
1002
568
                error("ignoring installed scope \"" + scope.first + "\": cannot create metadata: " + e.what());
575
                error("ignoring installed scope \"" + scope.first + "\": cannot create metadata: " + e.what());
1003
569
            }
576
            }
1005
570
        });
577
        };
1006
578
        ScopesWatcher click_scopes_watcher(registry, click_watch_lambda);
1007
571
        click_scopes_watcher.add_install_dir(click_installdir);
579
        click_scopes_watcher.add_install_dir(click_installdir);
1008
572
580
1009
573
        // Let's add the registry's state receiver to the middleware so that scopes can inform
581
        // Let's add the registry's state receiver to the middleware so that scopes can inform
1010
574
582
1011
=== modified file 'scoperunner/scoperunner.cpp'
1012
--- scoperunner/scoperunner.cpp	2014-07-21 15:37:57 +0000
1013
+++ scoperunner/scoperunner.cpp	2014-07-28 11:21:43 +0000
1014
@@ -38,8 +38,6 @@
1015
38
#include <unordered_map>
38
#include <unordered_map>
1016
39
#include <vector>
39
#include <vector>
1017
40
40
1018
41
#include <libgen.h>
1019
42
1020
43
using namespace std;
41
using namespace std;
1021
44
using namespace unity::scopes;
42
using namespace unity::scopes;
1022
45
using namespace unity::scopes::internal;
43
using namespace unity::scopes::internal;
1023
@@ -59,7 +57,7 @@
1024
59
// Run the scope specified by the config_file in a separate thread and wait for the thread to finish.
57
// Run the scope specified by the config_file in a separate thread and wait for the thread to finish.
1025
60
// Return exit status for main to use.
58
// Return exit status for main to use.
1026
61
59
1028
62
int run_scope(std::string const& runtime_config, std::string const& scope_configfile)
60
int run_scope(std::string const& runtime_config, std::string const& scope_config)
1029
63
{
61
{
1030
64
    auto trap = core::posix::trap_signals_for_all_subsequent_threads(
62
    auto trap = core::posix::trap_signals_for_all_subsequent_threads(
1031
65
    {
63
    {
1032
@@ -69,16 +67,11 @@
1033
69
67
1034
70
    std::thread trap_worker([trap]() { trap->run(); });
68
    std::thread trap_worker([trap]() { trap->run(); });
1035
71
69
1044
72
    // Retrieve the registry middleware and create a proxy to its state receiver
70
    // Figure out what the scope ID is from the name of the scope config file.
1045
73
    RuntimeConfig rt_config(runtime_config);
71
    filesystem::path scope_config_path(scope_config);
1038
74
    RegistryConfig reg_conf(rt_config.registry_identity(), rt_config.registry_configfile());
1039
75
    auto reg_runtime = RuntimeImpl::create(rt_config.registry_identity(), runtime_config);
1040
76
    auto reg_mw = reg_runtime->factory()->find(reg_runtime->registry_identity(), reg_conf.mw_kind());
1041
77
    auto reg_state_receiver = reg_mw->create_state_receiver_proxy("StateReceiver");
1042
78
1043
79
    filesystem::path scope_config_path(scope_configfile);
1046
80
    string lib_dir = scope_config_path.parent_path().native();
72
    string lib_dir = scope_config_path.parent_path().native();
1047
81
    string scope_id = scope_config_path.stem().native();
73
    string scope_id = scope_config_path.stem().native();
1048
74
1049
82
    if (!lib_dir.empty())
75
    if (!lib_dir.empty())
1050
83
    {
76
    {
1051
84
      lib_dir += '/';
77
      lib_dir += '/';
1052
@@ -87,11 +80,6 @@
1053
87
    int exit_status = 1;
80
    int exit_status = 1;
1054
88
    try
81
    try
1055
89
    {
82
    {
1056
90
        // Instantiate the run time, create the middleware, load the scope from its
1057
91
        // shared library, and call the scope's start() method.
1058
92
        auto rt = RuntimeImpl::create(scope_id, runtime_config);
1059
93
        auto mw = rt->factory()->create(scope_id, reg_conf.mw_kind(), reg_conf.mw_configfile());
1060
94
1061
95
        // For a scope_id "Fred", we look for the library as "libFred.so", "Fred.so", and "scope.so".
83
        // For a scope_id "Fred", we look for the library as "libFred.so", "Fred.so", and "scope.so".
1062
96
        vector<string> libs;
84
        vector<string> libs;
1063
97
        libs.push_back(lib_dir + "lib" + scope_id + ".so");
85
        libs.push_back(lib_dir + "lib" + scope_id + ".so");
1064
@@ -104,7 +92,7 @@
1065
104
        {
92
        {
1066
105
            try
93
            try
1067
106
            {
94
            {
1069
107
                loader = ScopeLoader::load(scope_id, lib, rt_config.data_directory(), rt->registry());
95
                loader = ScopeLoader::load(scope_id, lib);
1070
108
            }
96
            }
1071
109
            catch (unity::ResourceException& e)
97
            catch (unity::ResourceException& e)
1072
110
            {
98
            {
1073
@@ -123,35 +111,24 @@
1074
123
            e.remember(ep);
111
            e.remember(ep);
1075
124
            throw e;
112
            throw e;
1076
125
        }
113
        }
1089
126
        loader->start();
114
1090
127
115
        static mutex rt_mutex;
1091
128
        // Give a thread to the scope to do with as it likes. If the scope doesn't want to use it and
116
        RuntimeImpl::SPtr rt;
1092
129
        // immediately returns from run(), that's fine.
117
1093
130
        auto run_future = std::async(launch::async, [loader] { loader->scope_base()->run(); });
118
        // Signal handler to shut down the run time on receipt of a signal.
1094
131
119
        trap->signal_raised().connect([rt](core::posix::Signal)
1083
132
        // Create a servant for the scope and register the servant.
1084
133
        ScopeConfig scope_config(scope_configfile);
1085
134
        auto scope = unique_ptr<ScopeObject>(new ScopeObject(rt.get(), loader->scope_base()));
1086
135
        auto proxy = mw->add_scope_object(scope_id, move(scope), scope_config.idle_timeout() * 1000);
1087
136
1088
137
        trap->signal_raised().connect([mw](core::posix::Signal)
1095
138
        {
120
        {
1097
139
            mw->stop();
121
            lock_guard<mutex> lock(rt_mutex);
1098
122
            rt->destroy();
1099
140
        });
123
        });
1100
141
124
1114
142
        // Inform the registry that this scope is now ready to process requests
125
        // Instantiate the run time and run the scope.
1115
143
        reg_state_receiver->push_state(scope_id, StateReceiverObject::State::ScopeReady);
126
        {
1116
144
127
            lock_guard<mutex> lock(rt_mutex);
1117
145
        mw->wait_for_shutdown();
128
            rt = RuntimeImpl::create(scope_id, runtime_config);
1118
146
129
        }
1119
147
        // Inform the registry that this scope is shutting down
130
1120
148
        reg_state_receiver->push_state(scope_id, StateReceiverObject::State::ScopeStopping);
131
        rt->run_scope(loader->scope_base(), runtime_config, scope_config);
1108
149
1109
150
        loader->stop();
1110
151
1111
152
        // Collect exit status from the run thread. If this throws, the ScopeLoader
1112
153
        // destructor will still call stop() on the scope.
1113
154
        run_future.get();
1121
155
132
1122
156
        exit_status = 0;
133
        exit_status = 0;
1123
157
    }
134
    }
1124
158
135
1125
=== modified file 'smartscopesproxy/smartscopesproxy.cpp'
1126
--- smartscopesproxy/smartscopesproxy.cpp	2014-06-30 07:20:30 +0000
1127
+++ smartscopesproxy/smartscopesproxy.cpp	2014-07-28 11:21:43 +0000
1128
@@ -27,9 +27,10 @@
1129
27
#include <core/posix/signal.h>
27
#include <core/posix/signal.h>
1130
28
28
1131
29
#include <cassert>
29
#include <cassert>
1132
30
#include <iostream>
1133
31
1134
32
#include <libgen.h>
1135
30
#include <signal.h>
33
#include <signal.h>
1136
31
#include <libgen.h>
1137
32
#include <iostream>
1138
33
#include <unistd.h>
34
#include <unistd.h>
1139
34
35
1140
35
using namespace unity::scopes;
36
using namespace unity::scopes;
1141
36
37
1142
=== modified file 'src/scopes/ScopeBase.cpp'
1143
--- src/scopes/ScopeBase.cpp	2014-06-24 11:11:11 +0000
1144
+++ src/scopes/ScopeBase.cpp	2014-07-28 11:21:43 +0000
1145
@@ -18,6 +18,7 @@
1146
18
18
1147
19
#include <unity/scopes/ScopeBase.h>
19
#include <unity/scopes/ScopeBase.h>
1148
20
#include <unity/scopes/ActivationQueryBase.h>
20
#include <unity/scopes/ActivationQueryBase.h>
1149
21
#include <unity/scopes/Registry.h>
1150
21
#include <unity/scopes/internal/ScopeBaseImpl.h>
22
#include <unity/scopes/internal/ScopeBaseImpl.h>
1151
22
23
1152
23
namespace unity
24
namespace unity
1153
@@ -39,7 +40,7 @@
1154
39
40
1155
40
//! @endcond
41
//! @endcond
1156
41
42
1158
42
void ScopeBase::start(std::string const&, RegistryProxy const&)
43
void ScopeBase::start(std::string const&)
1159
43
{
44
{
1160
44
    // Intentionally empty: default "do nothing" implementation.
45
    // Intentionally empty: default "do nothing" implementation.
1161
45
}
46
}
1162
@@ -76,6 +77,16 @@
1163
76
    return p->scope_directory();
77
    return p->scope_directory();
1164
77
}
78
}
1165
78
79
1166
80
std::string ScopeBase::cache_directory() const
1167
81
{
1168
82
    return p->cache_directory();
1169
83
}
1170
84
1171
85
RegistryProxy ScopeBase::registry() const
1172
86
{
1173
87
    return p->registry();
1174
88
}
1175
89
1176
79
unity::scopes::VariantMap ScopeBase::settings() const
90
unity::scopes::VariantMap ScopeBase::settings() const
1177
80
{
91
{
1178
81
    return p->settings();
92
    return p->settings();
1179
82
93
1180
=== modified file 'src/scopes/internal/RegistryConfig.cpp'
1181
--- src/scopes/internal/RegistryConfig.cpp	2014-05-09 06:36:46 +0000
1182
+++ src/scopes/internal/RegistryConfig.cpp	2014-07-28 11:21:43 +0000
1183
@@ -78,7 +78,7 @@
1184
78
        throw_ex("Illegal value (" + to_string(process_timeout_) + ") for " + process_timeout_key + ": value must be 10-5000 ms");
78
        throw_ex("Illegal value (" + to_string(process_timeout_) + ") for " + process_timeout_key + ": value must be 10-5000 ms");
1185
79
    }
79
    }
1186
80
80
1188
81
    const KnownEntries known_entries = {
81
    KnownEntries const known_entries = {
1189
82
                                          {  registry_config_group,
82
                                          {  registry_config_group,
1190
83
                                             {
83
                                             {
1191
84
                                                mw_kind_key,
84
                                                mw_kind_key,
1192
85
85
1193
=== modified file 'src/scopes/internal/RuntimeConfig.cpp'
1194
--- src/scopes/internal/RuntimeConfig.cpp	2014-07-07 05:22:26 +0000
1195
+++ src/scopes/internal/RuntimeConfig.cpp	2014-07-28 11:21:43 +0000
1196
@@ -104,7 +104,7 @@
1197
104
        }
104
        }
1198
105
    }
105
    }
1199
106
106
1201
107
    const KnownEntries known_entries = {
107
    KnownEntries const known_entries = {
1202
108
                                          {  runtime_config_group,
108
                                          {  runtime_config_group,
1203
109
                                             {
109
                                             {
1204
110
                                                registry_identity_key,
110
                                                registry_identity_key,
1205
111
111
1206
=== modified file 'src/scopes/internal/RuntimeImpl.cpp'
1207
--- src/scopes/internal/RuntimeImpl.cpp	2014-07-21 15:37:57 +0000
1208
+++ src/scopes/internal/RuntimeImpl.cpp	2014-07-28 11:21:43 +0000
1209
@@ -35,8 +35,7 @@
1210
35
35
1211
36
#include <boost/filesystem.hpp>
36
#include <boost/filesystem.hpp>
1212
37
37
1215
38
#include <signal.h>
38
#include <boost/filesystem.hpp>
1214
39
#include <libgen.h>
1216
40
39
1217
41
#include <cassert>
40
#include <cassert>
1218
42
#include <cstring>
41
#include <cstring>
1219
@@ -301,27 +300,37 @@
1220
301
    auto mw = factory()->create(scope_id_, reg_conf.mw_kind(), reg_conf.mw_configfile());
300
    auto mw = factory()->create(scope_id_, reg_conf.mw_kind(), reg_conf.mw_configfile());
1221
302
301
1222
303
    {
302
    {
1226
304
        boost::filesystem::path inip(scope_ini_file);
303
        boost::filesystem::path dir = boost::filesystem::path(scope_ini_file).parent_path();
1227
305
        boost::filesystem::path scope_dir(inip.parent_path());
304
        scope_base->p->set_scope_directory(dir.native());
1225
306
        scope_base->p->set_scope_directory(inip.native());
1228
307
    }
305
    }
1229
308
306
1230
309
    // Try to open the scope settings database, if any.
1231
310
    string settings_dir = data_dir_ + "/" + scope_id_;
1232
311
    string scope_dir = scope_base->scope_directory();
1233
312
    string settings_db = settings_dir + "/settings.db";
1234
313
    string settings_schema = scope_dir + "/" + scope_id_ + "-settings.ini";
1235
314
    if (boost::filesystem::exists(settings_schema))
1236
315
    {
307
    {
1240
316
        // Make sure the settings directories exist. (No permission for group and others; data might be sensitive.)
308
        // Try to open the scope settings database, if any.
1241
317
        ::mkdir(data_dir_.c_str(), 0700);
309
        string settings_dir = data_dir_ + "/" + scope_id_;
1242
318
        ::mkdir(settings_dir.c_str(), 0700);
310
        string scope_dir = scope_base->scope_directory();
1243
311
        string settings_db = settings_dir + "/settings.db";
1244
312
        string settings_schema = scope_dir + "/" + scope_id_ + "-settings.ini";
1245
313
        if (boost::filesystem::exists(settings_schema))
1246
314
        {
1247
315
            // Make sure the settings directories exist. (No permission for group and others; data might be sensitive.)
1248
316
            ::mkdir(data_dir_.c_str(), 0700);
1249
317
            ::mkdir(settings_dir.c_str(), 0700);
1250
319
318
1253
320
        shared_ptr<SettingsDB> db(SettingsDB::create_from_ini_file(settings_db, settings_schema));
319
            shared_ptr<SettingsDB> db(SettingsDB::create_from_ini_file(settings_db, settings_schema));
1254
321
        scope_base->p->set_settings_db(db);
320
            scope_base->p->set_settings_db(db);
1255
321
        }
1256
322
        else
1257
323
        {
1258
324
            scope_base->p->set_settings_db(nullptr);
1259
325
        }
1260
322
    }
326
    }
1261
323
327
1263
324
    scope_base->start(scope_id_, registry());
328
    scope_base->p->set_registry(registry_);
1264
329
1265
330
    scope_base->p->set_cache_directory(find_cache_dir());
1266
331
1267
332
    scope_base->start(scope_id_);
1268
333
1269
325
    // Ensure the scope gets stopped.
334
    // Ensure the scope gets stopped.
1270
326
    unique_ptr<ScopeBase, void(*)(ScopeBase*)> cleanup_scope(scope_base, [](ScopeBase *scope_base) { scope_base->stop(); });
335
    unique_ptr<ScopeBase, void(*)(ScopeBase*)> cleanup_scope(scope_base, [](ScopeBase *scope_base) { scope_base->stop(); });
1271
327
336
1272
@@ -332,15 +341,13 @@
1273
332
341
1274
333
    // Create a servant for the scope and register the servant.
342
    // Create a servant for the scope and register the servant.
1275
334
    auto scope = unique_ptr<internal::ScopeObject>(new internal::ScopeObject(this, scope_base));
343
    auto scope = unique_ptr<internal::ScopeObject>(new internal::ScopeObject(this, scope_base));
1276
344
    int idle_timeout_ms = 0;
1277
335
    if (!scope_ini_file.empty())
345
    if (!scope_ini_file.empty())
1278
336
    {
346
    {
1279
337
        ScopeConfig scope_config(scope_ini_file);
347
        ScopeConfig scope_config(scope_ini_file);
1286
338
        mw->add_scope_object(scope_id_, move(scope), scope_config.idle_timeout() * 1000);
348
        idle_timeout_ms = scope_config.idle_timeout() * 1000;
1287
339
    }
349
    }
1288
340
    else
350
    mw->add_scope_object(scope_id_, move(scope), idle_timeout_ms);
1283
341
    {
1284
342
        mw->add_scope_object(scope_id_, move(scope));
1285
343
    }
1289
344
351
1290
345
    // Inform the registry that this scope is now ready to process requests
352
    // Inform the registry that this scope is now ready to process requests
1291
346
    reg_state_receiver->push_state(scope_id_, StateReceiverObject::State::ScopeReady);
353
    reg_state_receiver->push_state(scope_id_, StateReceiverObject::State::ScopeReady);
1292
@@ -383,6 +390,42 @@
1293
383
    }
390
    }
1294
384
}
391
}
1295
385
392
1296
393
string RuntimeImpl::find_cache_dir() const
1297
394
{
1298
395
    // TODO: HACK: Until we get a fancier Apparmor query API, we try
1299
396
    //             to create the scope cache dir and figure out whether
1300
397
    //             whether we are confined or unconfined. We first try to
1301
398
    //             create <data_dir>/unconfined and <data_dir>/unconfined/<scope_id_>,
1302
399
    //             in case they don't exist. Then we try to create a file in
1303
400
    //             <data_dir>unconfined/<scope_id_>. If that works, we unlink
1304
401
    //             the file again and can conclude that the scope is unconfined.
1305
402
    //             Otherwise, the scope must be confined, in which case
1306
403
    //             we create <data_dir>/leaf-net and <data_dir>/leaf-net/<scope_id_>.
1307
404
1308
405
    string cache_dir = data_dir_ + "/unconfined/" + scope_id_;
1309
406
1310
407
    // The following two mkdir() calls will fail if the scope is confined or
1311
408
    // the directories exist already.
1312
409
    ::mkdir((data_dir_ + "/unconfined").c_str(), 0700);
1313
410
    ::mkdir(cache_dir.c_str(), 0700);
1314
411
    string tmp = cache_dir + "/.unconfined_scope_XXXXXX";
1315
412
    int fd = mkstemp(const_cast<char*>(tmp.c_str()));  // mkstemp() modifies its argument
1316
413
    if (fd != -1)
1317
414
    {
1318
415
        // If mkstemp succeeded, the scope is unconfined.
1319
416
        assert(::unlink(tmp.c_str()) == 0);
1320
417
        ::close(fd);
1321
418
    }
1322
419
    else
1323
420
    {
1324
421
        // mkstemp() failed, the scope must be confined.
1325
422
        ::mkdir((data_dir_ + "/leaf-net").c_str(), 0700);
1326
423
        ::mkdir(cache_dir.c_str(), 0700);
1327
424
        cache_dir = data_dir_ + "/leaf-net/" + scope_id_;
1328
425
    }
1329
426
    return cache_dir;
1330
427
}
1331
428
1332
386
} // namespace internal
429
} // namespace internal
1333
387
430
1334
388
} // namespace scopes
431
} // namespace scopes
1335
389
432
1336
=== modified file 'src/scopes/internal/ScopeBaseImpl.cpp'
1337
--- src/scopes/internal/ScopeBaseImpl.cpp	2014-06-24 03:05:19 +0000
1338
+++ src/scopes/internal/ScopeBaseImpl.cpp	2014-07-28 11:21:43 +0000
1339
@@ -17,8 +17,12 @@
1340
17
 */
17
 */
1341
18
18
1342
19
#include <unity/scopes/internal/ScopeBaseImpl.h>
19
#include <unity/scopes/internal/ScopeBaseImpl.h>
1343
20
1344
21
#include <unity/UnityExceptions.h>
1345
20
#include <unity/scopes/internal/SettingsDB.h>
22
#include <unity/scopes/internal/SettingsDB.h>
1346
23
#include <unity/scopes/ScopeExceptions.h>
1347
21
24
1348
25
using namespace unity;
1349
22
using namespace unity::scopes;
26
using namespace unity::scopes;
1350
23
using namespace std;
27
using namespace std;
1351
24
28
1352
@@ -31,21 +35,78 @@
1353
31
namespace internal
35
namespace internal
1354
32
{
36
{
1355
33
37
1357
34
void ScopeBaseImpl::set_scope_directory(std::string const &path)
38
ScopeBaseImpl::ScopeBaseImpl()
1358
39
    : scope_dir_initialized_(false)
1359
40
    , cache_dir_initialized_(false)
1360
41
    , registry_initialized_(false)
1361
42
    , settings_db_initialized_(false)
1362
43
{
1363
44
}
1364
45
1365
46
void ScopeBaseImpl::set_scope_directory(std::string const& path)
1366
35
{
47
{
1367
36
    lock_guard<mutex> lock(mutex_);
48
    lock_guard<mutex> lock(mutex_);
1368
37
    scope_directory_ = path;
49
    scope_directory_ = path;
1369
50
    scope_dir_initialized_ = true;
1370
38
}
51
}
1371
39
52
1372
40
std::string ScopeBaseImpl::scope_directory() const
53
std::string ScopeBaseImpl::scope_directory() const
1373
41
{
54
{
1374
42
    lock_guard<mutex> lock(mutex_);
55
    lock_guard<mutex> lock(mutex_);
1375
56
    if (!scope_dir_initialized_)
1376
57
    {
1377
58
        throw LogicException("ScopeBase::scope_directory() cannot be called from constructor");
1378
59
    }
1379
60
    // scope_dir_ is never empty, except for tests, so we don't throw if it is empty here.
1380
43
    return scope_directory_;
61
    return scope_directory_;
1381
44
}
62
}
1382
45
63
1383
64
void ScopeBaseImpl::set_cache_directory(std::string const& path)
1384
65
{
1385
66
    lock_guard<mutex> lock(mutex_);
1386
67
    cache_directory_ = path;
1387
68
    cache_dir_initialized_ = true;
1388
69
}
1389
70
1390
71
std::string ScopeBaseImpl::cache_directory() const
1391
72
{
1392
73
    lock_guard<mutex> lock(mutex_);
1393
74
    if (!cache_dir_initialized_)
1394
75
    {
1395
76
        throw LogicException("ScopeBase::cache_directory() cannot be called from constructor");
1396
77
    }
1397
78
    if (cache_directory_.empty())
1398
79
    {
1399
80
        throw ConfigException("ScopeBase::cache_directory(): no cache directory available");
1400
81
    }
1401
82
    return cache_directory_;
1402
83
}
1403
84
1404
85
void ScopeBaseImpl::set_registry(RegistryProxy const& registry)
1405
86
{
1406
87
    lock_guard<mutex> lock(mutex_);
1407
88
    registry_ = registry;
1408
89
    registry_initialized_ = true;
1409
90
}
1410
91
1411
92
RegistryProxy ScopeBaseImpl::registry() const
1412
93
{
1413
94
    lock_guard<mutex> lock(mutex_);
1414
95
    if (!registry_initialized_)
1415
96
    {
1416
97
        throw LogicException("ScopeBase::registry() cannot be called from constructor");
1417
98
    }
1418
99
    // registry_ can be a null proxy.
1419
100
    return registry_;
1420
101
}
1421
102
1422
46
SettingsDB::SPtr ScopeBaseImpl::settings_db() const
103
SettingsDB::SPtr ScopeBaseImpl::settings_db() const
1423
47
{
104
{
1424
48
    lock_guard<mutex> lock(mutex_);
105
    lock_guard<mutex> lock(mutex_);
1425
106
    if (!settings_db_initialized_)
1426
107
    {
1427
108
        throw LogicException("ScopeBase::settings_db() cannot be called from constructor");
1428
109
    }
1429
49
    return db_;
110
    return db_;
1430
50
}
111
}
1431
51
112
1432
@@ -53,11 +114,16 @@
1433
53
{
114
{
1434
54
    lock_guard<mutex> lock(mutex_);
115
    lock_guard<mutex> lock(mutex_);
1435
55
    db_ = db;
116
    db_ = db;
1436
117
    settings_db_initialized_ = true;
1437
56
}
118
}
1438
57
119
1439
58
VariantMap ScopeBaseImpl::settings() const
120
VariantMap ScopeBaseImpl::settings() const
1440
59
{
121
{
1441
60
    lock_guard<mutex> lock(mutex_);
122
    lock_guard<mutex> lock(mutex_);
1442
123
    if (!settings_db_initialized_)
1443
124
    {
1444
125
        throw LogicException("ScopeBase::settings_db() cannot be called from constructor");
1445
126
    }
1446
61
    return db_ ? db_->settings() : VariantMap();
127
    return db_ ? db_->settings() : VariantMap();
1447
62
}
128
}
1448
63
129
1449
64
130
1450
=== modified file 'src/scopes/internal/ScopeConfig.cpp'
1451
--- src/scopes/internal/ScopeConfig.cpp	2014-07-24 13:08:48 +0000
1452
+++ src/scopes/internal/ScopeConfig.cpp	2014-07-28 11:21:43 +0000
1453
@@ -54,7 +54,7 @@
1454
54
    const string location_data_needed_key = "LocationDataNeeded";
54
    const string location_data_needed_key = "LocationDataNeeded";
1455
55
    const string scoperunner_key = "ScopeRunner";
55
    const string scoperunner_key = "ScopeRunner";
1456
56
    const string idle_timeout_key = "IdleTimeout";
56
    const string idle_timeout_key = "IdleTimeout";
1458
57
    const string results_ttl_str = "ResultsTtlType";
57
    const string results_ttl_key = "ResultsTtlType";
1459
58
58
1460
59
    const string scope_appearance_group = "Appearance";
59
    const string scope_appearance_group = "Appearance";
1461
60
    const string fg_color_key = "ForegroundColor";
60
    const string fg_color_key = "ForegroundColor";
1462
@@ -141,8 +141,8 @@
1463
141
    // custom scope runner executable is optional
141
    // custom scope runner executable is optional
1464
142
    try
142
    try
1465
143
    {
143
    {
1468
144
        string key = parser()->get_string(scope_config_group, scoperunner_key);
144
        string scope_runner = parser()->get_string(scope_config_group, scoperunner_key);
1469
145
        scope_runner_.reset(new string(key));
145
        scope_runner_.reset(new string(scope_runner));
1470
146
    }
146
    }
1471
147
    catch (LogicException const&)
147
    catch (LogicException const&)
1472
148
    {
148
    {
1473
@@ -162,7 +162,7 @@
1474
162
    results_ttl_type_ = ScopeMetadata::ResultsTtlType::None;
162
    results_ttl_type_ = ScopeMetadata::ResultsTtlType::None;
1475
163
    try
163
    try
1476
164
    {
164
    {
1478
165
        string orig = parser()->get_string(scope_config_group, results_ttl_str);
165
        string orig = parser()->get_string(scope_config_group, results_ttl_key);
1479
166
        string ttl = orig;
166
        string ttl = orig;
1480
167
        to_lower(ttl);
167
        to_lower(ttl);
1481
168
        if (ttl.empty() || ttl == "none")
168
        if (ttl.empty() || ttl == "none")
1482
@@ -182,7 +182,7 @@
1483
182
        }
182
        }
1484
183
        else
183
        else
1485
184
        {
184
        {
1487
185
            throw_ex("Illegal value (" + orig + ") for " + results_ttl_str);
185
            throw_ex("Illegal value (\"" + orig + "\") for " + results_ttl_key);
1488
186
        }
186
        }
1489
187
    }
187
    }
1490
188
    catch (LogicException const&)
188
    catch (LogicException const&)
1491
@@ -201,7 +201,7 @@
1492
201
    {
201
    {
1493
202
    }
202
    }
1494
203
203
1496
204
    const KnownEntries known_entries = {
204
    KnownEntries const known_entries = {
1497
205
                                          {  scope_config_group,
205
                                          {  scope_config_group,
1498
206
                                             {
206
                                             {
1499
207
                                                overrideable_key,
207
                                                overrideable_key,
1500
@@ -216,7 +216,7 @@
1501
216
                                                location_data_needed_key,
216
                                                location_data_needed_key,
1502
217
                                                scoperunner_key,
217
                                                scoperunner_key,
1503
218
                                                idle_timeout_key,
218
                                                idle_timeout_key,
1505
219
                                                results_ttl_str
219
                                                results_ttl_key
1506
220
                                             }
220
                                             }
1507
221
                                          },
221
                                          },
1508
222
                                          {  scope_appearance_group,
222
                                          {  scope_appearance_group,
1509
223
223
1510
=== modified file 'src/scopes/internal/ScopeLoader.cpp'
1511
--- src/scopes/internal/ScopeLoader.cpp	2014-07-02 05:17:19 +0000
1512
+++ src/scopes/internal/ScopeLoader.cpp	2014-07-28 11:21:43 +0000
1513
@@ -23,11 +23,7 @@
1514
23
#include <unity/scopes/Version.h>
23
#include <unity/scopes/Version.h>
1515
24
#include <unity/UnityExceptions.h>
24
#include <unity/UnityExceptions.h>
1516
25
25
1517
26
#include <boost/filesystem.hpp>
1518
27
1519
28
#include <cassert>
26
#include <cassert>
1520
29
#include <libgen.h>
1521
30
#include <sys/stat.h>
1522
31
27
1523
32
using namespace std;
28
using namespace std;
1524
33
using namespace unity::scopes;
29
using namespace unity::scopes;
1525
@@ -42,13 +38,9 @@
1526
42
namespace internal
38
namespace internal
1527
43
{
39
{
1528
44
40
1533
45
ScopeLoader::ScopeLoader(string const& scope_id,
41
ScopeLoader::ScopeLoader(string const& scope_id, string const& libpath) :
1530
46
                         string const& libpath,
1531
47
                         string const& data_dir,
1532
48
                         RegistryProxy const& registry) :
1534
49
    scope_id_(scope_id),
42
    scope_id_(scope_id),
1535
50
    dyn_loader_(DynamicLoader::create(libpath, DynamicLoader::Binding::now, DynamicLoader::Unload::noclose)),
43
    dyn_loader_(DynamicLoader::create(libpath, DynamicLoader::Binding::now, DynamicLoader::Unload::noclose)),
1536
51
    registry_(registry),
1537
52
    scope_base_(nullptr, reinterpret_cast<DestroyFunction>(dyn_loader_->find_function(UNITY_SCOPE_DESTROY_SYMSTR))),
44
    scope_base_(nullptr, reinterpret_cast<DestroyFunction>(dyn_loader_->find_function(UNITY_SCOPE_DESTROY_SYMSTR))),
1538
53
    scope_state_(ScopeState::Stopped)
45
    scope_state_(ScopeState::Stopped)
1539
54
{
46
{
1540
@@ -62,26 +54,6 @@
1541
62
    {
54
    {
1542
63
        throw unity::ResourceException("Scope " + scope_id_ + " returned nullptr from " + UNITY_SCOPE_CREATE_SYMSTR);
55
        throw unity::ResourceException("Scope " + scope_id_ + " returned nullptr from " + UNITY_SCOPE_CREATE_SYMSTR);
1543
64
    }
56
    }
1544
65
1545
66
    {
1546
67
        boost::filesystem::path libp(libpath);
1547
68
        boost::filesystem::path scope_dir(libp.parent_path());
1548
69
        scope_base_->p->set_scope_directory(scope_dir.native());
1549
70
    }
1550
71
1551
72
    string settings_dir = data_dir + "/" + scope_id;
1552
73
    string scope_dir = scope_base_->scope_directory();
1553
74
    string settings_db = settings_dir + "/settings.db";
1554
75
    string settings_schema = scope_dir + "/" + scope_id + "-settings.ini";
1555
76
    if (boost::filesystem::exists(settings_schema))
1556
77
    {
1557
78
        // Make sure the settings directories exist. (No permission for group and others; data might be sensitive.)
1558
79
        ::mkdir(data_dir.c_str(), 0700);
1559
80
        ::mkdir(settings_dir.c_str(), 0700);
1560
81
1561
82
        shared_ptr<SettingsDB> db(SettingsDB::create_from_ini_file(settings_db, settings_schema));
1562
83
        scope_base_->p->set_settings_db(db);
1563
84
    }
1564
85
}
57
}
1565
86
58
1566
87
ScopeLoader::~ScopeLoader()
59
ScopeLoader::~ScopeLoader()
1567
@@ -95,12 +67,9 @@
1568
95
    }
67
    }
1569
96
}
68
}
1570
97
69
1575
98
ScopeLoader::UPtr ScopeLoader::load(string const& scope_id,
70
ScopeLoader::UPtr ScopeLoader::load(string const& scope_id, string const& libpath)
1572
99
                                    string const& libpath,
1573
100
                                    string const& data_dir,
1574
101
                                    RegistryProxy const& registry)
1576
102
{
71
{
1578
103
    return UPtr(new ScopeLoader(scope_id, libpath, data_dir, registry));
72
    return UPtr(new ScopeLoader(scope_id, libpath));
1579
104
}
73
}
1580
105
74
1581
106
void ScopeLoader::unload()
75
void ScopeLoader::unload()
1582
@@ -142,7 +111,7 @@
1583
142
111
1584
143
    try
112
    try
1585
144
    {
113
    {
1587
145
        scope_base_->start(scope_id_, registry_);
114
        scope_base_->start(scope_id_);
1588
146
    }
115
    }
1589
147
    catch (...)
116
    catch (...)
1590
148
    {
117
    {
1591
149
118
1592
=== modified file 'src/scopes/internal/zmq_middleware/ZmqConfig.cpp'
1593
--- src/scopes/internal/zmq_middleware/ZmqConfig.cpp	2014-07-22 04:01:45 +0000
1594
+++ src/scopes/internal/zmq_middleware/ZmqConfig.cpp	2014-07-28 11:21:43 +0000
1595
@@ -88,7 +88,7 @@
1596
88
    registry_endpoint_dir_ = get_optional_string(zmq_config_group, registry_endpoint_dir_key);
88
    registry_endpoint_dir_ = get_optional_string(zmq_config_group, registry_endpoint_dir_key);
1597
89
    ss_registry_endpoint_dir_ = get_optional_string(zmq_config_group, ss_registry_endpoint_dir_key);
89
    ss_registry_endpoint_dir_ = get_optional_string(zmq_config_group, ss_registry_endpoint_dir_key);
1598
90
90
1600
91
    const KnownEntries known_entries = {
91
    KnownEntries const known_entries = {
1601
92
                                          {  zmq_config_group,
92
                                          {  zmq_config_group,
1602
93
                                             {
93
                                             {
1603
94
                                                endpoint_dir_key,
94
                                                endpoint_dir_key,
1604
95
95
1605
=== modified file 'test/CMakeLists.txt'
1606
--- test/CMakeLists.txt	2014-07-07 23:53:36 +0000
1607
+++ test/CMakeLists.txt	2014-07-28 11:21:43 +0000
1608
@@ -4,3 +4,4 @@
1609
4
endif()
4
endif()
1610
5
add_subdirectory(copyright)
5
add_subdirectory(copyright)
1611
6
add_subdirectory(whitespace)
6
add_subdirectory(whitespace)
1612
7
add_subdirectory(autopkg)
1613
7
8
1614
=== added directory 'test/autopkg'
1615
=== added file 'test/autopkg/CMakeLists.txt'
1616
--- test/autopkg/CMakeLists.txt	1970-01-01 00:00:00 +0000
1617
+++ test/autopkg/CMakeLists.txt	2014-07-28 11:21:43 +0000
1618
@@ -0,0 +1,4 @@
1619
1
add_executable(scopetest ${CMAKE_SOURCE_DIR}/debian/tests/scopetest.cpp)
1620
2
target_link_libraries(scopetest ${UNITY_SCOPES_LIB} ${OTHER_LIBS})
1621
3
1622
4
add_test(autopkg-scopetest scopetest)
1623
0
5
1624
=== modified file 'test/gtest/scopes/Activation/TestScope.h'
1625
--- test/gtest/scopes/Activation/TestScope.h	2014-06-17 11:20:48 +0000
1626
+++ test/gtest/scopes/Activation/TestScope.h	2014-07-28 11:21:43 +0000
1627
@@ -98,7 +98,7 @@
1628
98
class TestScope : public ScopeBase
98
class TestScope : public ScopeBase
1629
99
{
99
{
1630
100
public:
100
public:
1632
101
    virtual void start(std::string const&, RegistryProxy const &) override {}
101
    virtual void start(std::string const&) override {}
1633
102
102
1634
103
    virtual void stop() override {}
103
    virtual void stop() override {}
1635
104
104
1636
105
105
1637
=== modified file 'test/gtest/scopes/IdleShutdown/SlowSearchScope.cpp'
1638
--- test/gtest/scopes/IdleShutdown/SlowSearchScope.cpp	2014-06-17 11:20:48 +0000
1639
+++ test/gtest/scopes/IdleShutdown/SlowSearchScope.cpp	2014-07-28 11:21:43 +0000
1640
@@ -50,7 +50,7 @@
1641
50
50
1642
51
}  // namespace
51
}  // namespace
1643
52
52
1645
53
void SlowSearchScope::start(string const&, RegistryProxy const &)
53
void SlowSearchScope::start(string const&)
1646
54
{
54
{
1647
55
}
55
}
1648
56
56
1649
57
57
1650
=== modified file 'test/gtest/scopes/IdleShutdown/SlowSearchScope.h'
1651
--- test/gtest/scopes/IdleShutdown/SlowSearchScope.h	2014-06-17 09:27:49 +0000
1652
+++ test/gtest/scopes/IdleShutdown/SlowSearchScope.h	2014-07-28 11:21:43 +0000
1653
@@ -27,7 +27,7 @@
1654
27
class SlowSearchScope : public ScopeBase
27
class SlowSearchScope : public ScopeBase
1655
28
{
28
{
1656
29
public:
29
public:
1658
30
    virtual void start(string const&, RegistryProxy const &) override;
30
    virtual void start(string const&) override;
1659
31
31
1660
32
    virtual void stop() override;
32
    virtual void stop() override;
1661
33
33
1662
34
34
1663
=== modified file 'test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.cpp'
1664
--- test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.cpp	2014-06-17 11:20:48 +0000
1665
+++ test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.cpp	2014-07-28 11:21:43 +0000
1666
@@ -64,7 +64,7 @@
1667
64
class MyScope : public ScopeBase
64
class MyScope : public ScopeBase
1668
65
{
65
{
1669
66
public:
66
public:
1671
67
    virtual void start(string const&, RegistryProxy const&) override {}
67
    virtual void start(string const&) override {}
1672
68
68
1673
69
    virtual void stop() override {}
69
    virtual void stop() override {}
1674
70
70
1675
71
71
1676
=== modified file 'test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.cpp'
1677
--- test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.cpp	2014-06-17 11:20:48 +0000
1678
+++ test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.cpp	2014-07-28 11:21:43 +0000
1679
@@ -77,7 +77,7 @@
1680
77
class MyScope : public ScopeBase
77
class MyScope : public ScopeBase
1681
78
{
78
{
1682
79
public:
79
public:
1684
80
    virtual void start(string const&, RegistryProxy const&) override {}
80
    virtual void start(string const&) override {}
1685
81
81
1686
82
    virtual void stop() override {}
82
    virtual void stop() override {}
1687
83
83
1688
84
84
1689
=== modified file 'test/gtest/scopes/Runtime/PusherScope.h'
1690
--- test/gtest/scopes/Runtime/PusherScope.h	2014-07-24 13:51:38 +0000
1691
+++ test/gtest/scopes/Runtime/PusherScope.h	2014-07-28 11:21:43 +0000
1692
@@ -21,14 +21,13 @@
1693
21
21
1694
22
#include <unity/scopes/ScopeBase.h>
22
#include <unity/scopes/ScopeBase.h>
1695
23
23
1700
24
using namespace std;
24
class PusherScope : public unity::scopes::ScopeBase
1697
25
using namespace unity::scopes;
1698
26
1699
27
class PusherScope : public ScopeBase
1701
28
{
25
{
1702
29
public:
26
public:
1705
30
    virtual SearchQueryBase::UPtr search(CannedQuery const&, SearchMetadata const&) override;
27
    virtual unity::scopes::SearchQueryBase::UPtr search(unity::scopes::CannedQuery const&,
1706
31
    virtual PreviewQueryBase::UPtr preview(Result const& result, ActionMetadata const& metadata) override;
28
                                                        unity::scopes::SearchMetadata const&) override;
1707
29
    virtual unity::scopes::PreviewQueryBase::UPtr preview(unity::scopes::Result const&,
1708
30
                                                          unity::scopes::ActionMetadata const&) override;
1709
32
};
31
};
1710
33
32
1711
34
#endif
33
#endif
1712
35
34
1713
=== modified file 'test/gtest/scopes/Runtime/SlowCreateScope.h'
1714
--- test/gtest/scopes/Runtime/SlowCreateScope.h	2014-07-24 13:51:38 +0000
1715
+++ test/gtest/scopes/Runtime/SlowCreateScope.h	2014-07-28 11:21:43 +0000
1716
@@ -21,14 +21,13 @@
1717
21
21
1718
22
#include <unity/scopes/ScopeBase.h>
22
#include <unity/scopes/ScopeBase.h>
1719
23
23
1724
24
using namespace std;
24
class SlowCreateScope : public unity::scopes::ScopeBase
1721
25
using namespace unity::scopes;
1722
26
1723
27
class SlowCreateScope : public ScopeBase
1725
28
{
25
{
1726
29
public:
26
public:
1729
30
    virtual SearchQueryBase::UPtr search(CannedQuery const&, SearchMetadata const&) override;
27
    virtual unity::scopes::SearchQueryBase::UPtr search(unity::scopes::CannedQuery const&,
1730
31
    virtual PreviewQueryBase::UPtr preview(Result const&, ActionMetadata const&) override;
28
                                                        unity::scopes::SearchMetadata const&) override;
1731
29
    virtual unity::scopes::PreviewQueryBase::UPtr preview(unity::scopes::Result const&,
1732
30
                                                          unity::scopes::ActionMetadata const&) override;
1733
32
};
31
};
1734
33
32
1735
34
#endif
33
#endif
1736
35
34
1737
=== modified file 'test/gtest/scopes/ScopeBase/ScopeBase_test.cpp'
1738
--- test/gtest/scopes/ScopeBase/ScopeBase_test.cpp	2014-07-07 23:53:36 +0000
1739
+++ test/gtest/scopes/ScopeBase/ScopeBase_test.cpp	2014-07-28 11:21:43 +0000
1740
@@ -65,7 +65,7 @@
1741
65
    EXPECT_EQ(UNITY_SCOPES_VERSION_MINOR, vminor);
65
    EXPECT_EQ(UNITY_SCOPES_VERSION_MINOR, vminor);
1742
66
    EXPECT_EQ(UNITY_SCOPES_VERSION_MICRO, vmicro);
66
    EXPECT_EQ(UNITY_SCOPES_VERSION_MICRO, vmicro);
1743
67
67
1745
68
    b->start("some_scope", nullptr);
68
    b->start("some_scope");
1746
69
    b->stop();
69
    b->stop();
1747
70
    destroy(b);
70
    destroy(b);
1748
71
}
71
}
1749
72
72
1750
=== modified file 'test/gtest/scopes/ScopeBase/scopelib.cpp'
1751
--- test/gtest/scopes/ScopeBase/scopelib.cpp	2014-06-17 09:27:49 +0000
1752
+++ test/gtest/scopes/ScopeBase/scopelib.cpp	2014-07-28 11:21:43 +0000
1753
@@ -25,7 +25,7 @@
1754
25
public:
25
public:
1755
26
    MyScope() {}
26
    MyScope() {}
1756
27
27
1758
28
    virtual void start(std::string const&, unity::scopes::RegistryProxy const&) override {}
28
    virtual void start(std::string const&) override {}
1759
29
    virtual void stop() override {}
29
    virtual void stop() override {}
1760
30
    virtual void run() override {}
30
    virtual void run() override {}
1761
31
31
1762
32
32
1763
=== modified file 'test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp'
1764
--- test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp	2014-06-27 02:19:43 +0000
1765
+++ test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp	2014-07-28 11:21:43 +0000
1766
@@ -125,7 +125,7 @@
1767
125
    }
125
    }
1768
126
    catch(ConfigException const& e)
126
    catch(ConfigException const& e)
1769
127
    {
127
    {
1771
128
        boost::regex r("unity::scopes::ConfigException: \".*\": Illegal value \\(blah\\) for ResultsTtlType");
128
        boost::regex r("unity::scopes::ConfigException: \".*\": Illegal value \\(\"blah\"\\) for ResultsTtlType");
1772
129
        EXPECT_TRUE(boost::regex_match(e.what(), r));
129
        EXPECT_TRUE(boost::regex_match(e.what(), r));
1773
130
    }
130
    }
1774
131
}
131
}
1775
132
132
1776
=== modified file 'test/gtest/scopes/internal/ScopeConfig/complete_config.ini.in'
1777
--- test/gtest/scopes/internal/ScopeConfig/complete_config.ini.in	2014-06-26 12:49:46 +0000
1778
+++ test/gtest/scopes/internal/ScopeConfig/complete_config.ini.in	2014-07-28 11:21:43 +0000
1779
@@ -15,6 +15,7 @@
1780
15
IdleTimeout = 300
15
IdleTimeout = 300
1781
16
ResultsTtlType = large
16
ResultsTtlType = large
1782
17
LocationDataNeeded = true
17
LocationDataNeeded = true
1783
18
ConfinementType = unconfined
1784
18
19
1785
19
[Appearance]
20
[Appearance]
1786
20
arbitrary_key = true
21
arbitrary_key = true
1787
21
22
1788
=== modified file 'test/gtest/scopes/internal/ScopeLoader/MyScope.h'
1789
--- test/gtest/scopes/internal/ScopeLoader/MyScope.h	2014-06-17 09:27:49 +0000
1790
+++ test/gtest/scopes/internal/ScopeLoader/MyScope.h	2014-07-28 11:21:43 +0000
1791
@@ -31,7 +31,7 @@
1792
31
    MyScope() {}
31
    MyScope() {}
1793
32
    virtual ~MyScope() {}
32
    virtual ~MyScope() {}
1794
33
33
1796
34
    virtual void start(std::string const&, unity::scopes::RegistryProxy const&) override
34
    virtual void start(std::string const&) override
1797
35
    {
35
    {
1798
36
        inc_start();
36
        inc_start();
1799
37
    }
37
    }
1800
38
38
1801
=== modified file 'test/gtest/scopes/internal/ScopeLoader/ScopeA.cpp'
1802
--- test/gtest/scopes/internal/ScopeLoader/ScopeA.cpp	2014-06-17 09:27:49 +0000
1803
+++ test/gtest/scopes/internal/ScopeLoader/ScopeA.cpp	2014-07-28 11:21:43 +0000
1804
@@ -30,7 +30,7 @@
1805
30
class ScopeA : public MyScope
30
class ScopeA : public MyScope
1806
31
{
31
{
1807
32
public:
32
public:
1809
33
    virtual void start(std::string const&, unity::scopes::RegistryProxy const&) override
33
    virtual void start(std::string const&) override
1810
34
    {
34
    {
1811
35
        inc_start();
35
        inc_start();
1812
36
    }
36
    }
1813
37
37
1814
=== modified file 'test/gtest/scopes/internal/ScopeLoader/ScopeB.cpp'
1815
--- test/gtest/scopes/internal/ScopeLoader/ScopeB.cpp	2014-06-17 09:27:49 +0000
1816
+++ test/gtest/scopes/internal/ScopeLoader/ScopeB.cpp	2014-07-28 11:21:43 +0000
1817
@@ -30,7 +30,7 @@
1818
30
class ScopeA : public MyScope
30
class ScopeA : public MyScope
1819
31
{
31
{
1820
32
public:
32
public:
1822
33
    virtual void start(std::string const&, unity::scopes::RegistryProxy const&) override
33
    virtual void start(std::string const&) override
1823
34
    {
34
    {
1824
35
        inc_start();
35
        inc_start();
1825
36
    }
36
    }
1826
37
37
1827
=== modified file 'test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp'
1828
--- test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp	2014-07-01 08:39:17 +0000
1829
+++ test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp	2014-07-28 11:21:43 +0000
1830
@@ -47,11 +47,6 @@
1831
47
char const* scopeB = TEST_DIR "/libScopeB.so";
47
char const* scopeB = TEST_DIR "/libScopeB.so";
1832
48
}
48
}
1833
49
49
1834
50
// Need to make a dummy registry proxy because, if we pass a null shared_ptr to load(),
1835
51
// load() throws an exception.
1836
52
1837
53
RegistryProxy registry(make_shared<RegistryImpl>(nullptr, (RuntimeImpl*)0x1));
1838
54
1839
55
// Basic test.
50
// Basic test.
1840
56
51
1841
57
TEST(ScopeLoader, basic)
52
TEST(ScopeLoader, basic)
1842
@@ -59,13 +54,12 @@
1843
59
    reset_counters();
54
    reset_counters();
1844
60
55
1845
61
    {
56
    {
1847
62
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib, TEST_DIR, registry);
57
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib);
1848
63
        EXPECT_EQ(1, num_create());
58
        EXPECT_EQ(1, num_create());
1849
64
        EXPECT_EQ(0, num_destroy());
59
        EXPECT_EQ(0, num_destroy());
1850
65
60
1851
66
        EXPECT_EQ("testScope", sl->scope_id());
61
        EXPECT_EQ("testScope", sl->scope_id());
1852
67
        EXPECT_EQ(scope_lib, sl->libpath());
62
        EXPECT_EQ(scope_lib, sl->libpath());
1853
68
        EXPECT_EQ(TEST_DIR, sl->scope_base()->scope_directory());
1854
69
    }
63
    }
1855
70
    EXPECT_EQ(1, num_create());
64
    EXPECT_EQ(1, num_create());
1856
71
    EXPECT_EQ(1, num_destroy());
65
    EXPECT_EQ(1, num_destroy());
1857
@@ -78,7 +72,7 @@
1858
78
    reset_counters();
72
    reset_counters();
1859
79
73
1860
80
    {
74
    {
1862
81
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib, TEST_DIR, registry);
75
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib);
1863
82
76
1864
83
        // Check that calling stop on a stopped thread does nothing.
77
        // Check that calling stop on a stopped thread does nothing.
1865
84
        sl->stop();
78
        sl->stop();
1866
@@ -116,7 +110,7 @@
1867
116
    reset_counters();
110
    reset_counters();
1868
117
111
1869
118
    {
112
    {
1871
119
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib, TEST_DIR, registry);
113
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib);
1872
120
114
1873
121
        sl->start();
115
        sl->start();
1874
122
        EXPECT_EQ(1, num_start());
116
        EXPECT_EQ(1, num_start());
1875
@@ -136,7 +130,7 @@
1876
136
130
1877
137
    try
131
    try
1878
138
    {
132
    {
1880
139
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", "no_such_lib", TEST_DIR, registry);
133
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", "no_such_lib");
1881
140
        FAIL();
134
        FAIL();
1882
141
    }
135
    }
1883
142
    catch (unity::Exception const& e)
136
    catch (unity::Exception const& e)
1884
@@ -156,7 +150,7 @@
1885
156
150
1886
157
    try
151
    try
1887
158
    {
152
    {
1889
159
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", no_destroy_lib, TEST_DIR, registry);
153
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", no_destroy_lib);
1890
160
        FAIL();
154
        FAIL();
1891
161
    }
155
    }
1892
162
    catch (unity::Exception const& e)
156
    catch (unity::Exception const& e)
1893
@@ -176,7 +170,7 @@
1894
176
170
1895
177
    try
171
    try
1896
178
    {
172
    {
1898
179
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", null_return_lib, TEST_DIR, registry);
173
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", null_return_lib);
1899
180
        FAIL();
174
        FAIL();
1900
181
    }
175
    }
1901
182
    catch (unity::Exception const& e)
176
    catch (unity::Exception const& e)
1902
@@ -197,7 +191,7 @@
1903
197
191
1904
198
    try
192
    try
1905
199
    {
193
    {
1907
200
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", null_return_lib, TEST_DIR, registry);
194
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", null_return_lib);
1908
201
        sl->unload();
195
        sl->unload();
1909
202
        FAIL();
196
        FAIL();
1910
203
    }
197
    }
1911
@@ -217,7 +211,7 @@
1912
217
{
211
{
1913
218
    reset_counters();
212
    reset_counters();
1914
219
    {
213
    {
1916
220
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_start_lib, TEST_DIR, registry);
214
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_start_lib);
1917
221
        try
215
        try
1918
222
        {
216
        {
1919
223
            sl->start();
217
            sl->start();
1920
@@ -242,7 +236,7 @@
1921
242
{
236
{
1922
243
    reset_counters();
237
    reset_counters();
1923
244
    {
238
    {
1925
245
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_start_lib, TEST_DIR, registry);
239
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_start_lib);
1926
246
        try
240
        try
1927
247
        {
241
        {
1928
248
            sl->start();
242
            sl->start();
1929
@@ -266,7 +260,7 @@
1930
266
{
260
{
1931
267
    reset_counters();
261
    reset_counters();
1932
268
    {
262
    {
1934
269
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unknown_ex_from_start_lib, TEST_DIR, registry);
263
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unknown_ex_from_start_lib);
1935
270
        try
264
        try
1936
271
        {
265
        {
1937
272
            sl->start();
266
            sl->start();
1938
@@ -293,7 +287,7 @@
1939
293
    reset_counters();
287
    reset_counters();
1940
294
    try
288
    try
1941
295
    {
289
    {
1943
296
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_stop_lib, TEST_DIR, registry);
290
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_stop_lib);
1944
297
        sl->start();
291
        sl->start();
1945
298
        sl->stop();
292
        sl->stop();
1946
299
        EXPECT_EQ(1, num_start());
293
        EXPECT_EQ(1, num_start());
1947
@@ -319,7 +313,7 @@
1948
319
    reset_counters();
313
    reset_counters();
1949
320
    try
314
    try
1950
321
    {
315
    {
1952
322
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_std_ex_from_stop_lib, TEST_DIR, registry);
316
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_std_ex_from_stop_lib);
1953
323
        sl->start();
317
        sl->start();
1954
324
        sl->stop();
318
        sl->stop();
1955
325
        EXPECT_EQ(1, num_start());
319
        EXPECT_EQ(1, num_start());
1956
@@ -345,7 +339,7 @@
1957
345
    reset_counters();
339
    reset_counters();
1958
346
    try
340
    try
1959
347
    {
341
    {
1961
348
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unknown_ex_from_stop_lib, TEST_DIR, registry);
342
        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unknown_ex_from_stop_lib);
1962
349
        sl->start();
343
        sl->start();
1963
350
        sl->stop();
344
        sl->stop();
1964
351
        EXPECT_EQ(1, num_start());
345
        EXPECT_EQ(1, num_start());
1965
@@ -369,7 +363,7 @@
1966
369
{
363
{
1967
370
    reset_counters();
364
    reset_counters();
1968
371
365
1970
372
    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib, TEST_DIR, registry);
366
    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib);
1971
373
    sl->start();
367
    sl->start();
1972
374
    sl->stop();
368
    sl->stop();
1973
375
    sl->unload();
369
    sl->unload();
1974
@@ -387,7 +381,7 @@
1975
387
{
381
{
1976
388
    reset_counters();
382
    reset_counters();
1977
389
383
1979
390
    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_stop_lib, TEST_DIR, registry);
384
    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_stop_lib);
1980
391
    sl->start();
385
    sl->start();
1981
392
    try
386
    try
1982
393
    {
387
    {
1983
@@ -418,7 +412,7 @@
1984
418
{
412
{
1985
419
    reset_counters();
413
    reset_counters();
1986
420
414
1988
421
    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib, TEST_DIR, registry);
415
    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib);
1989
422
    sl->start();
416
    sl->start();
1990
423
    sl->unload();
417
    sl->unload();
1991
424
    try
418
    try
1992
@@ -438,7 +432,7 @@
1993
438
{
432
{
1994
439
    reset_counters();
433
    reset_counters();
1995
440
434
1997
441
    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib, TEST_DIR, registry);
435
    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib);
1998
442
    sl->start();
436
    sl->start();
1999
443
    sl->unload();
437
    sl->unload();
2000
444
    try
438
    try
2001
@@ -458,7 +452,7 @@
2002
458
{
452
{
2003
459
    reset_counters();
453
    reset_counters();
2004
460
454
2006
461
    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_start_lib, TEST_DIR, registry);
455
    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_start_lib);
2007
462
    try
456
    try
2008
463
    {
457
    {
2009
464
        sl->start();
458
        sl->start();
2010
@@ -495,12 +489,12 @@
2011
495
    reset_counters();
489
    reset_counters();
2012
496
    clear_vars();
490
    clear_vars();
2013
497
491
2015
498
    ScopeLoader::UPtr slA = ScopeLoader::load("scopeA", scopeA, TEST_DIR, registry);
492
    ScopeLoader::UPtr slA = ScopeLoader::load("scopeA", scopeA);
2016
499
    slA->start();
493
    slA->start();
2017
500
    EXPECT_EQ(1, num_create());
494
    EXPECT_EQ(1, num_create());
2018
501
    EXPECT_EQ(1, num_start());
495
    EXPECT_EQ(1, num_start());
2019
502
496
2021
503
    ScopeLoader::UPtr slB = ScopeLoader::load("scopeB", scopeB, TEST_DIR, registry);
497
    ScopeLoader::UPtr slB = ScopeLoader::load("scopeB", scopeB);
2022
504
    slB->start();
498
    slB->start();
2023
505
    EXPECT_EQ(2, num_create());
499
    EXPECT_EQ(2, num_create());
2024
506
    EXPECT_EQ(2, num_start());
500
    EXPECT_EQ(2, num_start());
2025
507
501
2026
=== modified file 'test/gtest/scopes/internal/ScopeLoader/ThrowUnityExFromStart.cpp'
2027
--- test/gtest/scopes/internal/ScopeLoader/ThrowUnityExFromStart.cpp	2014-06-17 09:27:49 +0000
2028
+++ test/gtest/scopes/internal/ScopeLoader/ThrowUnityExFromStart.cpp	2014-07-28 11:21:43 +0000
2029
@@ -29,7 +29,7 @@
2030
29
class EXPORT MyThrowingScope : public MyScope
29
class EXPORT MyThrowingScope : public MyScope
2031
30
{
30
{
2032
31
public:
31
public:
2034
32
    virtual void start(std::string const&, unity::scopes::RegistryProxy const&) override
32
    virtual void start(std::string const&) override
2035
33
    {
33
    {
2036
34
        inc_start();
34
        inc_start();
2037
35
        throw unity::LogicException("start failure");
35
        throw unity::LogicException("start failure");
2038
36
36
2039
=== modified file 'test/gtest/scopes/internal/ScopeLoader/ThrowUnknownExFromStart.cpp'
2040
--- test/gtest/scopes/internal/ScopeLoader/ThrowUnknownExFromStart.cpp	2014-06-17 09:27:49 +0000
2041
+++ test/gtest/scopes/internal/ScopeLoader/ThrowUnknownExFromStart.cpp	2014-07-28 11:21:43 +0000
2042
@@ -28,7 +28,7 @@
2043
28
class EXPORT MyThrowingScope : public MyScope
28
class EXPORT MyThrowingScope : public MyScope
2044
29
{
29
{
2045
30
public:
30
public:
2047
31
    virtual void start(std::string const&, unity::scopes::RegistryProxy const&) override
31
    virtual void start(std::string const&) override
2048
32
    {
32
    {
2049
33
        inc_start();
33
        inc_start();
2050
34
        throw 42;
34
        throw 42;
2051
35
35
2052
=== modified file 'test/gtest/scopes/testing/IsolatedScope/scope.cpp'
2053
--- test/gtest/scopes/testing/IsolatedScope/scope.cpp	2014-06-18 09:50:21 +0000
2054
+++ test/gtest/scopes/testing/IsolatedScope/scope.cpp	2014-07-28 11:21:43 +0000
2055
@@ -91,7 +91,8 @@
2056
91
{
91
{
2057
92
public:
92
public:
2058
93
    Query(unity::scopes::CannedQuery const& query, unity::scopes::SearchMetadata const& metadata, unity::scopes::RegistryProxy const& registry)
93
    Query(unity::scopes::CannedQuery const& query, unity::scopes::SearchMetadata const& metadata, unity::scopes::RegistryProxy const& registry)
2060
94
        : unity::scopes::SearchQueryBase(query, metadata), registry_(registry)
94
        : unity::scopes::SearchQueryBase(query, metadata)
2061
95
        , registry_(registry)
2062
95
    {
96
    {
2063
96
    }
97
    }
2064
97
98
2065
@@ -167,9 +168,15 @@
2066
167
168
2067
168
} // namespace testing
169
} // namespace testing
2068
169
170
2072
170
void testing::Scope::start(std::string const&, unity::scopes::RegistryProxy const &registry)
171
testing::Scope::Scope(unity::scopes::RegistryProxy const& r)
2073
171
{
172
    : registry_(r)
2074
172
    registry_ = registry;
173
{
2075
174
}
2076
175
2077
176
testing::Scope::~Scope() = default;
2078
177
2079
178
void testing::Scope::start(std::string const&)
2080
179
{
2081
173
}
180
}
2082
174
181
2083
175
void testing::Scope::stop()
182
void testing::Scope::stop()
2084
@@ -184,7 +191,7 @@
2085
184
        unity::scopes::CannedQuery const& query,
191
        unity::scopes::CannedQuery const& query,
2086
185
        unity::scopes::SearchMetadata const &metadata)
192
        unity::scopes::SearchMetadata const &metadata)
2087
186
{
193
{
2089
187
    return unity::scopes::SearchQueryBase::UPtr(new testing::Query(query, metadata, registry_));
194
    return unity::scopes::SearchQueryBase::UPtr(new testing::Query(query, metadata, registry()));
2090
188
}
195
}
2091
189
196
2092
190
unity::scopes::ActivationQueryBase::UPtr testing::Scope::activate(
197
unity::scopes::ActivationQueryBase::UPtr testing::Scope::activate(
2093
@@ -209,3 +216,23 @@
2094
209
{
216
{
2095
210
    return unity::scopes::PreviewQueryBase::UPtr(new testing::Preview(result, metadata));
217
    return unity::scopes::PreviewQueryBase::UPtr(new testing::Preview(result, metadata));
2096
211
}
218
}
2097
219
2098
220
std::string testing::Scope::scope_directory() const
2099
221
{
2100
222
    return "";
2101
223
}
2102
224
2103
225
std::string testing::Scope::cache_directory() const
2104
226
{
2105
227
    return "";
2106
228
}
2107
229
2108
230
unity::scopes::RegistryProxy testing::Scope::registry() const
2109
231
{
2110
232
    return registry_;
2111
233
}
2112
234
2113
235
unity::scopes::VariantMap testing::Scope::settings() const
2114
236
{
2115
237
    return unity::scopes::VariantMap();
2116
238
}
2117
212
239
2118
=== modified file 'test/gtest/scopes/testing/IsolatedScope/scope.h'
2119
--- test/gtest/scopes/testing/IsolatedScope/scope.h	2014-06-18 09:50:21 +0000
2120
+++ test/gtest/scopes/testing/IsolatedScope/scope.h	2014-07-28 11:21:43 +0000
2121
@@ -17,15 +17,19 @@
2122
17
 *              Thomas Voß <thomas.voss@canonical.com>
17
 *              Thomas Voß <thomas.voss@canonical.com>
2123
18
 */
18
 */
2124
19
19
2126
20
#include <unity/scopes/ScopeBase.h>
20
#include <unity/scopes/AbstractScopeBase.h>
2127
21
#include <unity/scopes/testing/MockRegistry.h>
2128
21
22
2129
22
namespace testing
23
namespace testing
2130
23
{
24
{
2131
24
25
2133
25
class Scope : public unity::scopes::ScopeBase
26
class Scope : public unity::scopes::AbstractScopeBase
2134
26
{
27
{
2135
27
public:
28
public:
2137
28
    void start(std::string const&, unity::scopes::RegistryProxy const &) override;
29
    Scope(unity::scopes::RegistryProxy const&);
2138
30
    virtual ~Scope();
2139
31
2140
32
    void start(std::string const&) override;
2141
29
33
2142
30
    void stop() override;
34
    void stop() override;
2143
31
35
2144
@@ -49,6 +53,14 @@
2145
49
            unity::scopes::Result const&,
53
            unity::scopes::Result const&,
2146
50
            unity::scopes::ActionMetadata const &) override;
54
            unity::scopes::ActionMetadata const &) override;
2147
51
55
2148
56
    std::string scope_directory() const override;
2149
57
2150
58
    std::string cache_directory() const override;
2151
59
2152
60
    unity::scopes::RegistryProxy registry() const override;
2153
61
2154
62
    unity::scopes::VariantMap settings() const override;
2155
63
2156
52
    unity::scopes::RegistryProxy registry_;
64
    unity::scopes::RegistryProxy registry_;
2157
53
};
65
};
2158
54
66
2159
55
67
2160
=== modified file 'test/gtest/scopes/testing/IsolatedScopeBenchmark/IsolatedScopeBenchmark_test.cpp'
2161
--- test/gtest/scopes/testing/IsolatedScopeBenchmark/IsolatedScopeBenchmark_test.cpp	2014-04-03 12:57:25 +0000
2162
+++ test/gtest/scopes/testing/IsolatedScopeBenchmark/IsolatedScopeBenchmark_test.cpp	2014-07-28 11:21:43 +0000
2163
@@ -55,7 +55,7 @@
2164
55
        return "BenchmarkingScope";
55
        return "BenchmarkingScope";
2165
56
    }
56
    }
2166
57
57
2168
58
    inline static std::shared_ptr<::testing::Scope> construct()
58
    inline static std::shared_ptr<::testing::Scope> construct(unity::scopes::RegistryProxy const&)
2169
59
    {
59
    {
2170
60
        return std::make_shared<::testing::Scope>(mean, variance);
60
        return std::make_shared<::testing::Scope>(mean, variance);
2171
61
    }
61
    }
2172
62
62
2173
=== modified file 'test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.cpp'
2174
--- test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.cpp	2014-06-17 11:20:48 +0000
2175
+++ test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.cpp	2014-07-28 11:21:43 +0000
2176
@@ -155,7 +155,7 @@
2177
155
{
155
{
2178
156
}
156
}
2179
157
157
2181
158
void testing::Scope::start(std::string const&, unity::scopes::RegistryProxy const &)
158
void testing::Scope::start(std::string const&)
2182
159
{
159
{
2183
160
}
160
}
2184
161
161
2185
162
162
2186
=== modified file 'test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.h'
2187
--- test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.h	2014-06-17 09:27:49 +0000
2188
+++ test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.h	2014-07-28 11:21:43 +0000
2189
@@ -30,7 +30,7 @@
2190
30
public:
30
public:
2191
31
    Scope(const std::chrono::milliseconds& mean, const std::chrono::milliseconds& variance);
31
    Scope(const std::chrono::milliseconds& mean, const std::chrono::milliseconds& variance);
2192
32
32
2194
33
    void start(std::string const&, unity::scopes::RegistryProxy const &) override;
33
    void start(std::string const&) override;
2195
34
34
2196
35
    void stop() override;
35
    void stop() override;
2197
36
36
2198
37
37
2199
=== modified file 'test/headers/CMakeLists.txt'
2200
--- test/headers/CMakeLists.txt	2014-01-24 09:55:09 +0000
2201
+++ test/headers/CMakeLists.txt	2014-07-28 11:21:43 +0000
2202
@@ -6,6 +6,7 @@
2203
6
6
2204
7
set(subdirs
7
set(subdirs
2205
8
    unity/scopes
8
    unity/scopes
2206
9
    unity/scopes/testing
2207
9
)
10
)
2208
10
foreach(dir ${OTHER_INCLUDE_DIRS})
11
foreach(dir ${OTHER_INCLUDE_DIRS})
2209
11
    set(other_inc_dirs "${other_inc_dirs} -I${dir}")
12
    set(other_inc_dirs "${other_inc_dirs} -I${dir}")
2210
@@ -26,9 +27,11 @@
2211
26
            ${public_inc_dir} ${CMAKE_CXX_COMPILER} "${CMAKE_CXX_COMPILER_ARG1} -fsyntax-only -I${root_inc_dir} -I${public_inc_dir} ${other_inc_dirs} ${CMAKE_CXX_FLAGS}")
27
            ${public_inc_dir} ${CMAKE_CXX_COMPILER} "${CMAKE_CXX_COMPILER_ARG1} -fsyntax-only -I${root_inc_dir} -I${public_inc_dir} ${other_inc_dirs} ${CMAKE_CXX_FLAGS}")
2212
27
28
2213
28
    # Test that each internal header compiles stand-alone.
29
    # Test that each internal header compiles stand-alone.
2217
29
    add_test(stand-alone-${location}-internal-headers
30
    if (IS_DIRECTORY ${internal_inc_dir})
2218
30
        ${CMAKE_CURRENT_SOURCE_DIR}/compile_headers.py
31
        add_test(stand-alone-${location}-internal-headers
2219
31
            ${internal_inc_dir} ${CMAKE_CXX_COMPILER} "${CMAKE_CXX_COMPILER_ARG1} -fsyntax-only -I${root_inc_dir} -I${internal_inc_dir} ${other_inc_dirs} ${CMAKE_CXX_FLAGS}")
32
            ${CMAKE_CURRENT_SOURCE_DIR}/compile_headers.py
2220
33
                ${internal_inc_dir} ${CMAKE_CXX_COMPILER} "${CMAKE_CXX_COMPILER_ARG1} -fsyntax-only -I${root_inc_dir} -I${internal_inc_dir} ${other_inc_dirs} ${CMAKE_CXX_FLAGS}")
2221
34
    endif()
2222
32
35
2223
33
    # Test that no public header includes an internal header
36
    # Test that no public header includes an internal header
2224
34
    add_test(clean-public-${location}-headers ${CMAKE_CURRENT_SOURCE_DIR}/check_public_headers.py ${public_inc_dir})
37
    add_test(clean-public-${location}-headers ${CMAKE_CURRENT_SOURCE_DIR}/check_public_headers.py ${public_inc_dir})
2225
35
38
2226
=== modified file 'test/headers/check_public_headers.py'
2227
--- test/headers/check_public_headers.py	2013-06-27 08:38:02 +0000
2228
+++ test/headers/check_public_headers.py	2014-07-28 11:21:43 +0000
2229
@@ -53,7 +53,7 @@
2230
53
    for hdr in hdrs:
53
    for hdr in hdrs:
2231
54
        try:
54
        try:
2232
55
            hdr_name = os.path.join(hdr_dir, hdr)
55
            hdr_name = os.path.join(hdr_dir, hdr)
2234
56
            file = open(hdr_name, "r")
56
            file = open(hdr_name, 'r', encoding = 'utf=8')
2235
57
        except OSError as e:
57
        except OSError as e:
2236
58
            error("cannot open \"" + hdr_name + "\": " + e.strerror)
58
            error("cannot open \"" + hdr_name + "\": " + e.strerror)
2237
59
            sys.exit(1)
59
            sys.exit(1)
Reviewer	Review Type	Date Requested	Status
Michal Hruby (community)		2014-07-07	Approve on 2014-07-28
PS Jenkins bot (community)	continuous-integration		Approve on 2014-07-28
Jamie Strandboge		2014-07-08	Approve on 2014-07-18
Review via email: mp+225773@code.launchpad.net