MirAL

Merge lp:~alan-griffiths/miral/update-symbols-map-generator into lp:miral

  1. update-symbols-map-generator
  2. Merge into trunk
Proposed by Alan Griffiths on 2016-09-27
Status: Merged
Approved by: Gerry Boland on 2016-09-28
Approved revision: 367
Merged at revision: 368
Proposed branch: lp:~alan-griffiths/miral/update-symbols-map-generator
Merge into: lp:miral
Diff against target: 312 lines (+294/-6)
1 file modified
scripts/process_doxygen_xml.py (+294/-6)
To merge this branch: bzr merge lp:~alan-griffiths/miral/update-symbols-map-generator
Reviewer Review Type Date Requested Status
Gerry Boland Approve on 2016-09-28
Kevin DuBois (community) 2016-09-27 Approve on 2016-09-28
Review via email: mp+306912@code.launchpad.net

Commit Message

Update the scripts/process_doxygen_xml.py that (re)generates symbols.map to be aware of the released MIRAL_0.1 symbols.

To post a comment you must log in.
Kevin DuBois (kdub) wrote :

lgtm

review: Approve
Gerry Boland (gerboland) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/process_doxygen_xml.py'
2--- scripts/process_doxygen_xml.py 2016-08-02 09:05:46 +0000
3+++ scripts/process_doxygen_xml.py 2016-09-27 16:02:49 +0000
4@@ -76,14 +76,302 @@
5 if publish: print ' PUBLISH: {}'.format(symbol)
6 else : print 'NOPUBLISH: {}'.format(symbol)
7
8+old_stanzas = '''MIRAL_0.1 {
9+global:
10+ extern "C++" {
11+ miral::ActiveOutputsListener::?ActiveOutputsListener*;
12+ miral::ActiveOutputsListener::ActiveOutputsListener*;
13+ miral::ActiveOutputsListener::advise_output_begin*;
14+ miral::ActiveOutputsListener::advise_output_create*;
15+ miral::ActiveOutputsListener::advise_output_delete*;
16+ miral::ActiveOutputsListener::advise_output_end*;
17+ miral::ActiveOutputsListener::advise_output_update*;
18+ miral::ActiveOutputsListener::operator*;
19+ miral::ActiveOutputsMonitor::?ActiveOutputsMonitor*;
20+ miral::ActiveOutputsMonitor::ActiveOutputsMonitor*;
21+ miral::ActiveOutputsMonitor::add_listener*;
22+ miral::ActiveOutputsMonitor::delete_listener*;
23+ miral::ActiveOutputsMonitor::for_each_output*;
24+ miral::ActiveOutputsMonitor::operator*;
25+ miral::AddInitCallback::?AddInitCallback*;
26+ miral::AddInitCallback::AddInitCallback*;
27+ miral::AddInitCallback::operator*;
28+ miral::AppendEventFilter::AppendEventFilter*;
29+ miral::AppendEventFilter::operator*;
30+ miral::ApplicationAuthorizer::?ApplicationAuthorizer*;
31+ miral::ApplicationAuthorizer::ApplicationAuthorizer*;
32+ miral::ApplicationAuthorizer::operator*;
33+ miral::ApplicationCredentials::ApplicationCredentials*;
34+ miral::ApplicationCredentials::gid*;
35+ miral::ApplicationCredentials::pid*;
36+ miral::ApplicationCredentials::uid*;
37+ miral::ApplicationInfo::?ApplicationInfo*;
38+ miral::ApplicationInfo::ApplicationInfo*;
39+ miral::ApplicationInfo::add_window*;
40+ miral::ApplicationInfo::application*;
41+ miral::ApplicationInfo::operator*;
42+ miral::ApplicationInfo::remove_window*;
43+ miral::ApplicationInfo::userdata*;
44+ miral::ApplicationInfo::windows*;
45+ miral::BasicSetApplicationAuthorizer::?BasicSetApplicationAuthorizer*;
46+ miral::BasicSetApplicationAuthorizer::BasicSetApplicationAuthorizer*;
47+ miral::BasicSetApplicationAuthorizer::operator*;
48+ miral::BasicSetApplicationAuthorizer::the_application_authorizer*;
49+ miral::CanonicalWindowManagerPolicy::CanonicalWindowManagerPolicy*;
50+ miral::CanonicalWindowManagerPolicy::advise_focus_gained*;
51+ miral::CanonicalWindowManagerPolicy::handle_modify_window*;
52+ miral::CanonicalWindowManagerPolicy::handle_raise_window*;
53+ miral::CanonicalWindowManagerPolicy::handle_window_ready*;
54+ miral::CanonicalWindowManagerPolicy::place_new_surface*;
55+ miral::InternalClientLauncher::?InternalClientLauncher*;
56+ miral::InternalClientLauncher::InternalClientLauncher*;
57+ miral::InternalClientLauncher::launch*;
58+ miral::InternalClientLauncher::operator*;
59+ miral::MirRunner::?MirRunner*;
60+ miral::MirRunner::MirRunner*;
61+ miral::MirRunner::add_start_callback*;
62+ miral::MirRunner::add_stop_callback*;
63+ miral::MirRunner::run_with*;
64+ miral::MirRunner::set_exception_handler*;
65+ miral::MirRunner::stop*;
66+ miral::Output::?Output*;
67+ miral::Output::Output*;
68+ miral::Output::connected*;
69+ miral::Output::extents*;
70+ miral::Output::form_factor*;
71+ miral::Output::is_same_output*;
72+ miral::Output::operator*;
73+ miral::Output::orientation*;
74+ miral::Output::physical_size_mm*;
75+ miral::Output::pixel_format*;
76+ miral::Output::power_mode*;
77+ miral::Output::refresh_rate*;
78+ miral::Output::scale*;
79+ miral::Output::type*;
80+ miral::Output::used*;
81+ miral::Output::valid*;
82+ miral::SetCommandLineHandler::?SetCommandLineHandler*;
83+ miral::SetCommandLineHandler::SetCommandLineHandler*;
84+ miral::SetCommandLineHandler::operator*;
85+ miral::SetTerminator::?SetTerminator*;
86+ miral::SetTerminator::SetTerminator*;
87+ miral::SetTerminator::operator*;
88+ miral::SetWindowManagmentPolicy::?SetWindowManagmentPolicy*;
89+ miral::SetWindowManagmentPolicy::SetWindowManagmentPolicy*;
90+ miral::SetWindowManagmentPolicy::operator*;
91+ miral::StartupInternalClient::?StartupInternalClient*;
92+ miral::StartupInternalClient::StartupInternalClient*;
93+ miral::StartupInternalClient::operator*;
94+ miral::Window::?Window*;
95+ miral::Window::Window*;
96+ miral::Window::application*;
97+ miral::Window::move_to*;
98+ miral::Window::operator*;
99+ miral::Window::resize*;
100+ miral::Window::size*;
101+ miral::Window::top_left*;
102+ miral::WindowInfo::?WindowInfo*;
103+ miral::WindowInfo::WindowInfo*;
104+ miral::WindowInfo::add_child*;
105+ miral::WindowInfo::can_be_active*;
106+ miral::WindowInfo::can_morph_to*;
107+ miral::WindowInfo::children*;
108+ miral::WindowInfo::constrain_resize*;
109+ miral::WindowInfo::has_name*;
110+ miral::WindowInfo::has_output_id*;
111+ miral::WindowInfo::height_inc*;
112+ miral::WindowInfo::is_visible*;
113+ miral::WindowInfo::max_aspect*;
114+ miral::WindowInfo::max_height*;
115+ miral::WindowInfo::max_width*;
116+ miral::WindowInfo::min_aspect*;
117+ miral::WindowInfo::min_height*;
118+ miral::WindowInfo::min_width*;
119+ miral::WindowInfo::must_have_parent*;
120+ miral::WindowInfo::must_not_have_parent*;
121+ miral::WindowInfo::name*;
122+ miral::WindowInfo::needs_titlebar*;
123+ miral::WindowInfo::operator*;
124+ miral::WindowInfo::output_id*;
125+ miral::WindowInfo::parent*;
126+ miral::WindowInfo::preferred_orientation*;
127+ miral::WindowInfo::remove_child*;
128+ miral::WindowInfo::restore_rect*;
129+ miral::WindowInfo::state*;
130+ miral::WindowInfo::type*;
131+ miral::WindowInfo::userdata*;
132+ miral::WindowInfo::width_inc*;
133+ miral::WindowInfo::window*;
134+ miral::WindowManagementPolicy::?WindowManagementPolicy*;
135+ miral::WindowManagementPolicy::WindowManagementPolicy*;
136+ miral::WindowManagementPolicy::advise_begin*;
137+ miral::WindowManagementPolicy::advise_delete_app*;
138+ miral::WindowManagementPolicy::advise_delete_window*;
139+ miral::WindowManagementPolicy::advise_end*;
140+ miral::WindowManagementPolicy::advise_focus_gained*;
141+ miral::WindowManagementPolicy::advise_focus_lost*;
142+ miral::WindowManagementPolicy::advise_move_to*;
143+ miral::WindowManagementPolicy::advise_new_app*;
144+ miral::WindowManagementPolicy::advise_new_window*;
145+ miral::WindowManagementPolicy::advise_raise*;
146+ miral::WindowManagementPolicy::advise_resize*;
147+ miral::WindowManagementPolicy::advise_state_change*;
148+ miral::WindowManagementPolicy::operator*;
149+ miral::WindowManagerOptions::WindowManagerOptions*;
150+ miral::WindowManagerOptions::operator*;
151+ miral::WindowManagerTools::?WindowManagerTools*;
152+ miral::WindowManagerTools::WindowManagerTools*;
153+ miral::WindowManagerTools::active_display*;
154+ miral::WindowManagerTools::active_window*;
155+ miral::WindowManagerTools::ask_client_to_close*;
156+ miral::WindowManagerTools::count_applications*;
157+ miral::WindowManagerTools::drag_active_window*;
158+ miral::WindowManagerTools::find_application*;
159+ miral::WindowManagerTools::focus_next_application*;
160+ miral::WindowManagerTools::focus_next_within_application*;
161+ miral::WindowManagerTools::for_each_application*;
162+ miral::WindowManagerTools::id_for_window*;
163+ miral::WindowManagerTools::info_for*;
164+ miral::WindowManagerTools::info_for_window_id*;
165+ miral::WindowManagerTools::invoke_under_lock*;
166+ miral::WindowManagerTools::modify_window*;
167+ miral::WindowManagerTools::operator*;
168+ miral::WindowManagerTools::raise_tree*;
169+ miral::WindowManagerTools::select_active_window*;
170+ miral::WindowManagerTools::window_at*;
171+ miral::WindowSpecification::?WindowSpecification*;
172+ miral::WindowSpecification::WindowSpecification*;
173+ miral::WindowSpecification::aux_rect*;
174+ miral::WindowSpecification::aux_rect_placement_gravity*;
175+ miral::WindowSpecification::aux_rect_placement_offset*;
176+ miral::WindowSpecification::height_inc*;
177+ miral::WindowSpecification::input_mode*;
178+ miral::WindowSpecification::input_shape*;
179+ miral::WindowSpecification::max_aspect*;
180+ miral::WindowSpecification::max_height*;
181+ miral::WindowSpecification::max_width*;
182+ miral::WindowSpecification::min_aspect*;
183+ miral::WindowSpecification::min_height*;
184+ miral::WindowSpecification::min_width*;
185+ miral::WindowSpecification::name*;
186+ miral::WindowSpecification::operator*;
187+ miral::WindowSpecification::output_id*;
188+ miral::WindowSpecification::parent*;
189+ miral::WindowSpecification::placement_hints*;
190+ miral::WindowSpecification::preferred_orientation*;
191+ miral::WindowSpecification::shell_chrome*;
192+ miral::WindowSpecification::size*;
193+ miral::WindowSpecification::state*;
194+ miral::WindowSpecification::top_left*;
195+ miral::WindowSpecification::type*;
196+ miral::WindowSpecification::update*;
197+ miral::WindowSpecification::width_inc*;
198+ miral::WindowSpecification::window_placement_gravity*;
199+ miral::display_configuration_options*;
200+ miral::equivalent_display_area*;
201+ miral::kill*;
202+ miral::operator*;
203+ miral::toolkit::Connection::Connection*;
204+ miral::toolkit::Surface::Surface*;
205+ non-virtual?thunk?to?miral::ActiveOutputsListener::?ActiveOutputsListener*;
206+ non-virtual?thunk?to?miral::ActiveOutputsListener::advise_output_begin*;
207+ non-virtual?thunk?to?miral::ActiveOutputsListener::advise_output_create*;
208+ non-virtual?thunk?to?miral::ActiveOutputsListener::advise_output_delete*;
209+ non-virtual?thunk?to?miral::ActiveOutputsListener::advise_output_end*;
210+ non-virtual?thunk?to?miral::ActiveOutputsListener::advise_output_update*;
211+ non-virtual?thunk?to?miral::ApplicationAuthorizer::?ApplicationAuthorizer*;
212+ non-virtual?thunk?to?miral::CanonicalWindowManagerPolicy::advise_focus_gained*;
213+ non-virtual?thunk?to?miral::CanonicalWindowManagerPolicy::handle_modify_window*;
214+ non-virtual?thunk?to?miral::CanonicalWindowManagerPolicy::handle_raise_window*;
215+ non-virtual?thunk?to?miral::CanonicalWindowManagerPolicy::handle_window_ready*;
216+ non-virtual?thunk?to?miral::CanonicalWindowManagerPolicy::place_new_surface*;
217+ non-virtual?thunk?to?miral::WindowManagementPolicy::?WindowManagementPolicy*;
218+ non-virtual?thunk?to?miral::WindowManagementPolicy::advise_begin*;
219+ non-virtual?thunk?to?miral::WindowManagementPolicy::advise_delete_app*;
220+ non-virtual?thunk?to?miral::WindowManagementPolicy::advise_delete_window*;
221+ non-virtual?thunk?to?miral::WindowManagementPolicy::advise_end*;
222+ non-virtual?thunk?to?miral::WindowManagementPolicy::advise_focus_gained*;
223+ non-virtual?thunk?to?miral::WindowManagementPolicy::advise_focus_lost*;
224+ non-virtual?thunk?to?miral::WindowManagementPolicy::advise_move_to*;
225+ non-virtual?thunk?to?miral::WindowManagementPolicy::advise_new_app*;
226+ non-virtual?thunk?to?miral::WindowManagementPolicy::advise_new_window*;
227+ non-virtual?thunk?to?miral::WindowManagementPolicy::advise_raise*;
228+ non-virtual?thunk?to?miral::WindowManagementPolicy::advise_resize*;
229+ non-virtual?thunk?to?miral::WindowManagementPolicy::advise_state_change*;
230+ typeinfo?for?miral::ActiveOutputsListener;
231+ typeinfo?for?miral::ActiveOutputsMonitor;
232+ typeinfo?for?miral::AddInitCallback;
233+ typeinfo?for?miral::AppendEventFilter;
234+ typeinfo?for?miral::ApplicationAuthorizer;
235+ typeinfo?for?miral::ApplicationCredentials;
236+ typeinfo?for?miral::ApplicationInfo;
237+ typeinfo?for?miral::BasicSetApplicationAuthorizer;
238+ typeinfo?for?miral::CanonicalWindowManagerPolicy;
239+ typeinfo?for?miral::InternalClientLauncher;
240+ typeinfo?for?miral::MirRunner;
241+ typeinfo?for?miral::Output;
242+ typeinfo?for?miral::Output::PhysicalSizeMM;
243+ typeinfo?for?miral::SetCommandLineHandler;
244+ typeinfo?for?miral::SetTerminator;
245+ typeinfo?for?miral::SetWindowManagmentPolicy;
246+ typeinfo?for?miral::StartupInternalClient;
247+ typeinfo?for?miral::Window;
248+ typeinfo?for?miral::WindowInfo;
249+ typeinfo?for?miral::WindowManagementPolicy;
250+ typeinfo?for?miral::WindowManagerOption;
251+ typeinfo?for?miral::WindowManagerOptions;
252+ typeinfo?for?miral::WindowManagerTools;
253+ typeinfo?for?miral::WindowSpecification;
254+ typeinfo?for?miral::WindowSpecification::AspectRatio;
255+ typeinfo?for?miral::toolkit::Connection;
256+ typeinfo?for?miral::toolkit::PersistentId;
257+ typeinfo?for?miral::toolkit::Surface;
258+ typeinfo?for?miral::toolkit::SurfaceSpec;
259+ vtable?for?miral::ActiveOutputsListener;
260+ vtable?for?miral::ActiveOutputsMonitor;
261+ vtable?for?miral::AddInitCallback;
262+ vtable?for?miral::AppendEventFilter;
263+ vtable?for?miral::ApplicationAuthorizer;
264+ vtable?for?miral::ApplicationCredentials;
265+ vtable?for?miral::ApplicationInfo;
266+ vtable?for?miral::BasicSetApplicationAuthorizer;
267+ vtable?for?miral::CanonicalWindowManagerPolicy;
268+ vtable?for?miral::InternalClientLauncher;
269+ vtable?for?miral::MirRunner;
270+ vtable?for?miral::Output;
271+ vtable?for?miral::Output::PhysicalSizeMM;
272+ vtable?for?miral::SetCommandLineHandler;
273+ vtable?for?miral::SetTerminator;
274+ vtable?for?miral::SetWindowManagmentPolicy;
275+ vtable?for?miral::StartupInternalClient;
276+ vtable?for?miral::Window;
277+ vtable?for?miral::WindowInfo;
278+ vtable?for?miral::WindowManagementPolicy;
279+ vtable?for?miral::WindowManagerOption;
280+ vtable?for?miral::WindowManagerOptions;
281+ vtable?for?miral::WindowManagerTools;
282+ vtable?for?miral::WindowSpecification;
283+ vtable?for?miral::WindowSpecification::AspectRatio;
284+ vtable?for?miral::toolkit::Connection;
285+ vtable?for?miral::toolkit::PersistentId;
286+ vtable?for?miral::toolkit::Surface;
287+ vtable?for?miral::toolkit::SurfaceSpec;
288+ };
289+local: *;
290+};
291+
292+MIRAL_0.2 {
293+global:
294+ extern "C++" {'''
295+
296 def print_report():
297- print 'MIRAL_0.1 {'
298- print 'global:'
299- print ' extern "C++" {'
300- for symbol in sorted(symbols['public']): print ' {};'.format(symbol)
301+ print old_stanzas
302+ for symbol in sorted(symbols['public']):
303+ formatted_symbol = ' {};'.format(symbol)
304+ if not formatted_symbol in old_stanzas:
305+ print formatted_symbol
306 print ' };'
307- print 'local: *;'
308- print '};'
309+ print '} MIRAL_0.1;'
310
311 def print_debug_info(node, attributes):
312 if not debug: return

Subscribers

People subscribed via source and target branches