wxruby3 0.9.0.pre.beta.14-x64-mingw-ucrt → 0.9.0.pre.rc.2-x64-mingw-ucrt
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.yardopts +1 -0
- data/INSTALL.md +51 -22
- data/README.md +81 -6
- data/assets/hello_button-macos.png +0 -0
- data/assets/hello_button-msw.png +0 -0
- data/assets/hello_button.png +0 -0
- data/assets/hello_button_clicked-macos.png +0 -0
- data/assets/hello_button_clicked-msw.png +0 -0
- data/assets/hello_button_clicked.png +0 -0
- data/assets/hello_button_clicked_combi.png +0 -0
- data/assets/hello_world-macos.png +0 -0
- data/assets/hello_world-msw.png +0 -0
- data/assets/hello_world.png +0 -0
- data/assets/hello_world_combi.png +0 -0
- data/assets/repo-social-preview.png +0 -0
- data/ext/wxbase32u_gcc_custom.dll +0 -0
- data/ext/wxbase32u_net_gcc_custom.dll +0 -0
- data/ext/wxbase32u_xml_gcc_custom.dll +0 -0
- data/ext/wxmsw32u_aui_gcc_custom.dll +0 -0
- data/ext/wxmsw32u_core_gcc_custom.dll +0 -0
- data/ext/wxmsw32u_gl_gcc_custom.dll +0 -0
- data/ext/wxmsw32u_html_gcc_custom.dll +0 -0
- data/ext/wxmsw32u_media_gcc_custom.dll +0 -0
- data/ext/wxmsw32u_propgrid_gcc_custom.dll +0 -0
- data/ext/wxmsw32u_qa_gcc_custom.dll +0 -0
- data/ext/wxmsw32u_ribbon_gcc_custom.dll +0 -0
- data/ext/wxmsw32u_richtext_gcc_custom.dll +0 -0
- data/ext/wxmsw32u_stc_gcc_custom.dll +0 -0
- data/ext/wxmsw32u_webview_gcc_custom.dll +0 -0
- data/ext/wxmsw32u_xrc_gcc_custom.dll +0 -0
- data/lib/wx/core/art_locator.rb +2 -2
- data/lib/wx/core/artprovider.rb +2 -2
- data/lib/wx/core/bitmap.rb +6 -5
- data/lib/wx/core/bitmap_combobox.rb +34 -0
- data/lib/wx/core/brush.rb +6 -0
- data/lib/wx/core/controlwithitems.rb +52 -14
- data/lib/wx/core/cursor.rb +1 -1
- data/lib/wx/core/dc.rb +0 -20
- data/lib/wx/core/event_blocker.rb +14 -0
- data/lib/wx/core/events/evt_list.rb +19 -0
- data/lib/wx/core/evthandler.rb +48 -2
- data/lib/wx/core/find_replace_dialog.rb +24 -0
- data/lib/wx/core/font.rb +22 -14
- data/lib/wx/core/helpprovider.rb +2 -2
- data/lib/wx/core/icon.rb +1 -1
- data/lib/wx/core/image.rb +1 -1
- data/lib/wx/core/menu.rb +5 -0
- data/lib/wx/core/paintdc.rb +8 -0
- data/lib/wx/core/pen.rb +6 -0
- data/lib/wx/core/text_entry.rb +15 -0
- data/lib/wx/core/v_list_box.rb +13 -0
- data/lib/wx/core/window.rb +29 -2
- data/lib/wx/doc/app.rb +40 -0
- data/lib/wx/doc/brush.rb +17 -0
- data/lib/wx/doc/busy_info.rb +21 -0
- data/lib/wx/doc/client_dc.rb +28 -0
- data/lib/wx/doc/controlwithitems.rb +11 -0
- data/lib/wx/doc/dc.rb +0 -14
- data/lib/wx/doc/event_blocker.rb +27 -0
- data/lib/wx/doc/evthandler.rb +4 -0
- data/lib/wx/doc/extra/02_lifecycles.md +49 -0
- data/lib/wx/doc/extra/10_art.md +1 -1
- data/lib/wx/doc/extra/11_drawing_and_dc.md +62 -0
- data/lib/wx/doc/font.rb +27 -0
- data/lib/wx/doc/gen/about_dialog_info.rb +27 -24
- data/lib/wx/doc/gen/accelerator.rb +11 -12
- data/lib/wx/doc/gen/activity_indicator.rb +65 -0
- data/lib/wx/doc/gen/app.rb +6 -3
- data/lib/wx/doc/gen/art_provider.rb +53 -29
- data/lib/wx/doc/gen/aui/aui_manager.rb +4 -0
- data/lib/wx/doc/gen/aui/aui_mdi_child_frame.rb +1 -1
- data/lib/wx/doc/gen/aui/aui_pane_info.rb +2 -0
- data/lib/wx/doc/gen/aui/aui_tab_ctrl.rb +2 -0
- data/lib/wx/doc/gen/aui/aui_tool_bar.rb +2 -2
- data/lib/wx/doc/gen/bitmap.rb +25 -25
- data/lib/wx/doc/gen/bitmap_combo_box.rb +157 -0
- data/lib/wx/doc/gen/box_sizer.rb +6 -8
- data/lib/wx/doc/gen/brush.rb +2 -0
- data/lib/wx/doc/gen/busy_info.rb +52 -46
- data/lib/wx/doc/gen/caret.rb +0 -4
- data/lib/wx/doc/gen/check_list_box.rb +0 -2
- data/lib/wx/doc/gen/choice.rb +1 -5
- data/lib/wx/doc/gen/client_dc.rb +13 -18
- data/lib/wx/doc/gen/clipboard.rb +30 -27
- data/lib/wx/doc/gen/collapsible_pane.rb +11 -9
- data/lib/wx/doc/gen/colour.rb +6 -3
- data/lib/wx/doc/gen/colour_dialog.rb +111 -23
- data/lib/wx/doc/gen/combo_box.rb +2 -4
- data/lib/wx/doc/gen/context_help_button.rb +48 -0
- data/lib/wx/doc/gen/control.rb +20 -18
- data/lib/wx/doc/gen/core.rb +2 -2
- data/lib/wx/doc/gen/cursor.rb +18 -50
- data/lib/wx/doc/gen/data_format.rb +0 -2
- data/lib/wx/doc/gen/data_object.rb +37 -44
- data/lib/wx/doc/gen/dc.rb +16 -24
- data/lib/wx/doc/gen/defs.rb +3 -40
- data/lib/wx/doc/gen/dialog.rb +21 -17
- data/lib/wx/doc/gen/dir_dialog.rb +10 -8
- data/lib/wx/doc/gen/event.rb +2 -2
- data/lib/wx/doc/gen/event_blocker.rb +51 -0
- data/lib/wx/doc/gen/event_filter.rb +88 -0
- data/lib/wx/doc/gen/event_list.rb +23 -2
- data/lib/wx/doc/gen/events.rb +103 -112
- data/lib/wx/doc/gen/evt_handler.rb +28 -52
- data/lib/wx/doc/gen/file_dialog.rb +53 -50
- data/lib/wx/doc/gen/find_replace_dialog.rb +1 -1
- data/lib/wx/doc/gen/font.rb +19 -2
- data/lib/wx/doc/gen/font_data.rb +2 -0
- data/lib/wx/doc/gen/font_dialog.rb +1 -1
- data/lib/wx/doc/gen/frame.rb +4 -3
- data/lib/wx/doc/gen/fs_file.rb +8 -0
- data/lib/wx/doc/gen/gcdc.rb +2 -22
- data/lib/wx/doc/gen/gdi_common.rb +18 -2
- data/lib/wx/doc/gen/gdi_object.rb +2 -0
- data/lib/wx/doc/gen/graphics_context.rb +4 -43
- data/lib/wx/doc/gen/graphics_object.rb +2 -0
- data/lib/wx/doc/gen/grid/grid_cell_attr.rb +2 -1
- data/lib/wx/doc/gen/grid/grid_ctrl.rb +4 -2
- data/lib/wx/doc/gen/grid/grid_table_message.rb +2 -0
- data/lib/wx/doc/gen/grid_bag_sizer.rb +4 -0
- data/lib/wx/doc/gen/help_controller.rb +4 -1
- data/lib/wx/doc/gen/html/html_cell.rb +4 -1
- data/lib/wx/doc/gen/html/html_help_controller.rb +4 -1
- data/lib/wx/doc/gen/html/html_help_data.rb +4 -0
- data/lib/wx/doc/gen/html/html_help_window.rb +2 -1
- data/lib/wx/doc/gen/html/html_list_box.rb +138 -11
- data/lib/wx/doc/gen/html/html_window.rb +9 -3
- data/lib/wx/doc/gen/hyperlink_ctrl.rb +147 -0
- data/lib/wx/doc/gen/hyperlink_event.rb +43 -0
- data/lib/wx/doc/gen/icon.rb +7 -1
- data/lib/wx/doc/gen/icon_location.rb +2 -0
- data/lib/wx/doc/gen/image.rb +15 -8
- data/lib/wx/doc/gen/keyboard_state.rb +6 -0
- data/lib/wx/doc/gen/list_box.rb +0 -11
- data/lib/wx/doc/gen/list_ctrl.rb +10 -13
- data/lib/wx/doc/gen/locale.rb +7 -3
- data/lib/wx/doc/gen/log.rb +6 -2
- data/lib/wx/doc/gen/mdi_frame.rb +2 -0
- data/lib/wx/doc/gen/media_ctrl.rb +2 -0
- data/lib/wx/doc/gen/memory_dc.rb +105 -18
- data/lib/wx/doc/gen/menu.rb +4 -2
- data/lib/wx/doc/gen/menu_bar.rb +0 -8
- data/lib/wx/doc/gen/menu_item.rb +9 -3
- data/lib/wx/doc/gen/message_dialog.rb +6 -3
- data/lib/wx/doc/gen/mirror_dc.rb +2 -8
- data/lib/wx/doc/gen/mouse_state.rb +2 -0
- data/lib/wx/doc/gen/multi_choice_dialog.rb +0 -2
- data/lib/wx/doc/gen/non_owned_window.rb +2 -1
- data/lib/wx/doc/gen/notebook.rb +4 -2
- data/lib/wx/doc/gen/paint_dc.rb +2 -6
- data/lib/wx/doc/gen/palette.rb +3 -3
- data/lib/wx/doc/gen/pen.rb +6 -1
- data/lib/wx/doc/gen/pg/pg_editor.rb +2 -1
- data/lib/wx/doc/gen/pg/pg_multi_button.rb +4 -0
- data/lib/wx/doc/gen/pg/pg_properties.rb +30 -3
- data/lib/wx/doc/gen/pg/pg_property.rb +30 -4
- data/lib/wx/doc/gen/pg/pg_validation_info.rb +2 -0
- data/lib/wx/doc/gen/pg/property_grid.rb +5 -2
- data/lib/wx/doc/gen/pg/property_grid_interface.rb +6 -2
- data/lib/wx/doc/gen/pg/property_grid_manager.rb +2 -0
- data/lib/wx/doc/gen/pg/property_grid_page_state.rb +2 -0
- data/lib/wx/doc/gen/picker_base.rb +2 -1
- data/lib/wx/doc/gen/platform_info.rb +4 -1
- data/lib/wx/doc/gen/property_sheet_dialog.rb +2 -0
- data/lib/wx/doc/gen/prt/post_script_dc.rb +2 -8
- data/lib/wx/doc/gen/prt/print_data.rb +6 -0
- data/lib/wx/doc/gen/prt/printer.rb +0 -3
- data/lib/wx/doc/gen/prt/printer_dc.rb +2 -6
- data/lib/wx/doc/gen/radio_box.rb +2 -10
- data/lib/wx/doc/gen/rbn/ribbon_art_provider.rb +6 -0
- data/lib/wx/doc/gen/rbn/ribbon_panel.rb +1 -1
- data/lib/wx/doc/gen/region.rb +2 -0
- data/lib/wx/doc/gen/rtc/rich_text_buffer.rb +6 -0
- data/lib/wx/doc/gen/rtc/rich_text_ctrl.rb +0 -4
- data/lib/wx/doc/gen/rtc/rich_text_header_footer_data.rb +2 -0
- data/lib/wx/doc/gen/rtc/rich_text_html_handler.rb +2 -1
- data/lib/wx/doc/gen/rtc/symbol_picker_dialog.rb +2 -0
- data/lib/wx/doc/gen/screen_dc.rb +2 -0
- data/lib/wx/doc/gen/scroll_bar.rb +2 -1
- data/lib/wx/doc/gen/scrolled_canvas.rb +4 -8
- data/lib/wx/doc/gen/scrolled_control.rb +4 -8
- data/lib/wx/doc/gen/scrolled_window.rb +4 -8
- data/lib/wx/doc/gen/search_ctrl.rb +131 -0
- data/lib/wx/doc/gen/single_choice_dialog.rb +0 -2
- data/lib/wx/doc/gen/sizer.rb +14 -3
- data/lib/wx/doc/gen/splash_screen.rb +2 -0
- data/lib/wx/doc/gen/static_box.rb +6 -3
- data/lib/wx/doc/gen/static_box_sizer.rb +2 -1
- data/lib/wx/doc/gen/status_bar.rb +0 -5
- data/lib/wx/doc/gen/stc/styled_text_ctrl.rb +4 -5
- data/lib/wx/doc/gen/svg_file_dc.rb +10 -11
- data/lib/wx/doc/gen/text_ctrl.rb +10 -3
- data/lib/wx/doc/gen/text_entry.rb +8 -3
- data/lib/wx/doc/gen/text_entry_dialog.rb +4 -2
- data/lib/wx/doc/gen/timer_event.rb +2 -0
- data/lib/wx/doc/gen/tool_bar.rb +8 -4
- data/lib/wx/doc/gen/top_level_window.rb +5 -2
- data/lib/wx/doc/gen/tree_ctrl.rb +0 -6
- data/lib/wx/doc/gen/ui_action_simulator.rb +100 -0
- data/lib/wx/doc/gen/utils.rb +1 -1
- data/lib/wx/doc/gen/v_list_box.rb +36 -26
- data/lib/wx/doc/gen/validator.rb +2 -1
- data/lib/wx/doc/gen/variant.rb +10 -0
- data/lib/wx/doc/gen/window.rb +38 -17
- data/lib/wx/doc/gen/window_dc.rb +2 -0
- data/lib/wx/doc/gen/window_disabler.rb +2 -0
- data/lib/wx/doc/gen/wizard_page_simple.rb +2 -0
- data/lib/wx/doc/gen/xml_node.rb +6 -0
- data/lib/wx/doc/gen/xml_resource.rb +4 -1
- data/lib/wx/doc/memory_dc.rb +75 -0
- data/lib/wx/doc/mirror_dc.rb +16 -0
- data/lib/wx/doc/pen.rb +17 -0
- data/lib/wx/doc/prt/printer_dc.rb +26 -0
- data/lib/wx/doc/radio_box.rb +20 -0
- data/lib/wx/doc/screen_dc.rb +10 -6
- data/lib/wx/doc/svg_file_dc.rb +20 -0
- data/lib/wx/doc/v_list_box.rb +9 -0
- data/lib/wx/doc/window.rb +27 -0
- data/lib/wx/doc/window_disabler.rb +10 -0
- data/lib/wx/html/keyword_defs.rb +6 -7
- data/lib/wx/html/require.rb +1 -0
- data/lib/wx/html/simple_html_listbox.rb +105 -0
- data/lib/wx/keyword_defs.rb +83 -75
- data/lib/wx/prt/keyword_defs.rb +5 -1
- data/lib/wx/version.rb +1 -1
- data/lib/wx/wxruby/cmd/test.rb +1 -1
- data/lib/wxruby_aui.so +0 -0
- data/lib/wxruby_core.so +0 -0
- data/lib/wxruby_grid.so +0 -0
- data/lib/wxruby_html.so +0 -0
- data/lib/wxruby_pg.so +0 -0
- data/lib/wxruby_prt.so +0 -0
- data/lib/wxruby_rbn.so +0 -0
- data/lib/wxruby_rtc.so +0 -0
- data/lib/wxruby_stc.so +0 -0
- data/rakelib/install.rb +20 -7
- data/rakelib/lib/config/linux.rb +4 -2
- data/rakelib/lib/config/macosx.rb +120 -1
- data/rakelib/lib/config/mingw.rb +6 -1
- data/rakelib/lib/config/unixish.rb +26 -11
- data/rakelib/lib/config.rb +15 -6
- data/rakelib/yard/yard/relative_markdown_links.rb +5 -1
- data/samples/aui/aui.rb +432 -363
- data/samples/bigdemo/wxArtProvider.rbw +5 -4
- data/samples/controls/controls.rb +2 -2
- data/samples/controls/htlbox.rb +411 -0
- data/samples/controls/tn_htlbox.png +0 -0
- data/samples/drawing/graphics_drawing.rb +1 -2
- data/samples/drawing/{svgtest.rb → image_prt.rb} +49 -18
- data/samples/drawing/tn_image_prt.png +0 -0
- data/samples/propgrid/propgrid.rb +26 -21
- data/samples/ribbon/ribbon.rb +47 -46
- data/samples/sampler/editor.rb +33 -25
- data/samples/sampler/sample.rb +2 -2
- data/samples/sampler/stc_editor.rb +4 -2
- data/tests/lib/item_container_tests.rb +82 -0
- data/tests/lib/text_entry_tests.rb +80 -0
- data/tests/lib/wxapp_runner.rb +15 -3
- data/tests/lib/wxframe_runner.rb +144 -0
- data/tests/test_app_event_filter.rb +74 -0
- data/tests/test_art_provider.rb +52 -0
- data/tests/test_clipboard.rb +2 -1
- data/tests/test_event_handling.rb +199 -16
- data/tests/test_events.rb +4 -11
- data/tests/test_ext_controls.rb +28 -0
- data/tests/test_font.rb +239 -0
- data/tests/test_gdi_object.rb +161 -0
- data/tests/test_intl.rb +16 -15
- data/tests/test_item_data.rb +33 -1
- data/tests/test_std_controls.rb +373 -0
- data/tests/test_window.rb +340 -0
- metadata +61 -8
- data/lib/wx/doc/gen/auto_buffered_paint_dc.rb +0 -47
- data/lib/wx/doc/gen/buffered_dc.rb +0 -95
- data/lib/wx/doc/gen/buffered_paint_dc.rb +0 -55
- data/lib/wx/doc/gen/colour_data.rb +0 -96
- data/samples/drawing/tn_svgtest.png +0 -0
@@ -3,4 +3,123 @@
|
|
3
3
|
# Copyright (c) M.J.N. Corino, The Netherlands
|
4
4
|
###
|
5
5
|
|
6
|
-
|
6
|
+
require_relative './unixish'
|
7
|
+
|
8
|
+
module WXRuby3
|
9
|
+
|
10
|
+
module Config
|
11
|
+
|
12
|
+
module Platform
|
13
|
+
|
14
|
+
def self.included(base)
|
15
|
+
base.class_eval do
|
16
|
+
include Config::UnixLike
|
17
|
+
|
18
|
+
def debug_command(*args)
|
19
|
+
args.unshift(FileUtils::RUBY)
|
20
|
+
args.unshift('--')
|
21
|
+
args.unshift('lldb')
|
22
|
+
args.join(' ')
|
23
|
+
end
|
24
|
+
|
25
|
+
def dll_mask
|
26
|
+
"{#{dll_ext},dylib}"
|
27
|
+
end
|
28
|
+
|
29
|
+
def get_rpath_origin
|
30
|
+
"@loader_path"
|
31
|
+
end
|
32
|
+
|
33
|
+
def check_rpath_patch
|
34
|
+
# no need to check anything; install_name_tool is part of XCode cmdline tools
|
35
|
+
# and without these we couldn't build anything
|
36
|
+
true
|
37
|
+
end
|
38
|
+
|
39
|
+
def patch_rpath(shlib, *rpath)
|
40
|
+
# don't leave old rpath-s behind
|
41
|
+
sh("install_name_tool -delete_rpath '@loader_path/../lib' #{shlib} 2>/dev/null", verbose: false) { |_,_| }
|
42
|
+
# add deployment rpath-s
|
43
|
+
sh("install_name_tool #{rpath.collect {|rp| "-add_rpath '#{rp}'"}.join(' ')} #{shlib} 2>/dev/null", verbose: false) { |_,_| }
|
44
|
+
true
|
45
|
+
end
|
46
|
+
|
47
|
+
def update_shlib_loadpaths(shlib, deplibs)
|
48
|
+
changes = deplibs.collect { |dl| "-change '#{dl}' '@rpath/#{File.basename(dl)}'"}
|
49
|
+
sh("install_name_tool #{changes.join(' ')} #{shlib} 2>/dev/null", verbose: false) { |_,_| }
|
50
|
+
true
|
51
|
+
end
|
52
|
+
|
53
|
+
def get_wx_libs
|
54
|
+
wx_libset = ::Set.new
|
55
|
+
lib_list = wx_config("--libs all").split(' ')
|
56
|
+
until lib_list.empty?
|
57
|
+
s = lib_list.shift
|
58
|
+
if s == '-framework'
|
59
|
+
wx_libset << "#{s} #{lib_list.shift}"
|
60
|
+
else
|
61
|
+
wx_libset << s
|
62
|
+
end
|
63
|
+
end
|
64
|
+
# some weird thing with this; at least sometimes '--libs all' will not output media library even if feature active
|
65
|
+
if features_set?('wxUSE_MEDIACTRL')
|
66
|
+
lib_list = wx_config("--libs media").split(' ')
|
67
|
+
until lib_list.empty?
|
68
|
+
s = lib_list.shift
|
69
|
+
if s == '-framework'
|
70
|
+
wx_libset << "#{s} #{lib_list.shift}"
|
71
|
+
else
|
72
|
+
wx_libset << s
|
73
|
+
end
|
74
|
+
end
|
75
|
+
end
|
76
|
+
wx_libset.collect { |s| s.dup }
|
77
|
+
end
|
78
|
+
|
79
|
+
def do_link(pkg)
|
80
|
+
objs = pkg.all_obj_files.collect { |o| File.join('..', o) }.join(' ') + ' '
|
81
|
+
sh "cd lib && #{WXRuby3.config.ld} #{WXRuby3.config.ldflags(pkg.lib_target)} #{objs} " +
|
82
|
+
"#{WXRuby3.config.libs} #{WXRuby3.config.link_output_flag}#{pkg.lib_target}"
|
83
|
+
end
|
84
|
+
|
85
|
+
private
|
86
|
+
|
87
|
+
def wx_configure
|
88
|
+
bash('./configure --disable-sys-libs --without-liblzma --prefix=`pwd`/install --disable-tests --without-subdirs --disable-debug_info')
|
89
|
+
end
|
90
|
+
|
91
|
+
def wx_make
|
92
|
+
bash('make -j$(sysctl -n hw.logicalcpu) && make install')
|
93
|
+
end
|
94
|
+
end
|
95
|
+
end
|
96
|
+
|
97
|
+
def init_platform
|
98
|
+
init_unix_platform
|
99
|
+
|
100
|
+
@dll_pfx = 'lib'
|
101
|
+
|
102
|
+
if @wx_version
|
103
|
+
@cpp.sub!(/-std=gnu\+\+11/, '-std=gnu++14')
|
104
|
+
@ld.sub!(/-o\s*\Z/, '')
|
105
|
+
|
106
|
+
@extra_cflags.concat %w[-Wno-unused-function -Wno-conversion-null -Wno-sometimes-uninitialized
|
107
|
+
-Wno-overloaded-virtual -Wno-deprecated-copy]
|
108
|
+
@extra_cflags << ' -Wno-deprecated-declarations' unless @no_deprecated
|
109
|
+
|
110
|
+
# create a .dylib binary
|
111
|
+
@extra_ldflags << '-dynamic -bundle'
|
112
|
+
|
113
|
+
unless @wx_path.empty?
|
114
|
+
libdirs = @wx_libs.select {|s| s.start_with?('-L')}.collect {|s| s.sub(/^-L/,'')}
|
115
|
+
@exec_env['DYLD_LIBRARY_PATH'] = "#{ENV['DYLD_LIBRARY_PATH']}:#{dest_dir}:#{libdirs.join(':')}"
|
116
|
+
end
|
117
|
+
end
|
118
|
+
end
|
119
|
+
private :init_platform
|
120
|
+
|
121
|
+
end
|
122
|
+
|
123
|
+
end
|
124
|
+
|
125
|
+
end
|
data/rakelib/lib/config/mingw.rb
CHANGED
@@ -21,8 +21,8 @@ module WXRuby3
|
|
21
21
|
module Platform
|
22
22
|
|
23
23
|
def self.included(base)
|
24
|
-
base.include Config::UnixLike
|
25
24
|
base.class_eval do
|
25
|
+
include Config::UnixLike
|
26
26
|
|
27
27
|
attr_reader :rescomp
|
28
28
|
|
@@ -52,6 +52,10 @@ module WXRuby3
|
|
52
52
|
|
53
53
|
private
|
54
54
|
|
55
|
+
def wx_make
|
56
|
+
bash('make && make install')
|
57
|
+
end
|
58
|
+
|
55
59
|
def wx_generate_xml
|
56
60
|
chdir(File.join(ext_path, 'wxWidgets', 'docs', 'doxygen')) do
|
57
61
|
sh({ 'WX_SKIP_DOXYGEN_VERSION_CHECK' => '1' }, 'regen.bat xml')
|
@@ -107,6 +111,7 @@ module WXRuby3
|
|
107
111
|
|
108
112
|
@ruby_ldflags.each { |flags| flags.sub!(' $(DEFFILE)', '') } # cleanup for older RubyInstaller versions
|
109
113
|
@ruby_ldflags.each { |flags| flags.gsub!(/-s(\s|\Z)/, '') } if @debug_build # do not strip debug symbols for debug build
|
114
|
+
@ruby_ldflags << '-s' if @release_build # strip debug symbols for release build
|
110
115
|
@ruby_cppflags << RB_CONFIG['debugflags'] if @debug_build
|
111
116
|
@ruby_cppflags.each { |flags| flags.gsub!(/-O\d/, '-O0') } if @debug_build # disable optimizations for debug build
|
112
117
|
|
@@ -52,6 +52,10 @@ module WXRuby3
|
|
52
52
|
"#{WXRuby3.config.libs} #{WXRuby3.config.link_output_flag}#{pkg.lib_target}"
|
53
53
|
end
|
54
54
|
|
55
|
+
def get_rpath_origin
|
56
|
+
"$ORIGIN"
|
57
|
+
end
|
58
|
+
|
55
59
|
private
|
56
60
|
|
57
61
|
def wx_checkout
|
@@ -76,6 +80,14 @@ module WXRuby3
|
|
76
80
|
end
|
77
81
|
end
|
78
82
|
|
83
|
+
def wx_configure
|
84
|
+
bash('./configure --prefix=`pwd`/install --disable-tests --without-subdirs --disable-debug_info')
|
85
|
+
end
|
86
|
+
|
87
|
+
def wx_make
|
88
|
+
bash('make -j$(nproc) && make install')
|
89
|
+
end
|
90
|
+
|
79
91
|
def wx_build
|
80
92
|
# initialize submodules
|
81
93
|
unless sh('git submodule update --init')
|
@@ -83,12 +95,12 @@ module WXRuby3
|
|
83
95
|
exit(1)
|
84
96
|
end
|
85
97
|
# configure wxWidgets
|
86
|
-
unless
|
98
|
+
unless wx_configure
|
87
99
|
STDERR.puts "ERROR: Failed to configure wxWidgets."
|
88
100
|
exit(1)
|
89
101
|
end
|
90
102
|
# make and install wxWidgets
|
91
|
-
unless
|
103
|
+
unless wx_make
|
92
104
|
STDERR.puts "ERROR: Failed to build wxWidgets libraries."
|
93
105
|
exit(1)
|
94
106
|
end
|
@@ -117,6 +129,16 @@ module WXRuby3
|
|
117
129
|
get_cfg_string('wxxml')
|
118
130
|
end
|
119
131
|
|
132
|
+
def get_wx_libs
|
133
|
+
wx_libset = ::Set.new
|
134
|
+
wx_libset.merge wx_config("--libs all").split(' ')
|
135
|
+
# some weird thing with this; at least sometimes '--libs all' will not output media library even if feature active
|
136
|
+
if features_set?('wxUSE_MEDIACTRL')
|
137
|
+
wx_libset.merge wx_config("--libs media").split(' ')
|
138
|
+
end
|
139
|
+
wx_libset.collect { |s| s.dup }
|
140
|
+
end
|
141
|
+
|
120
142
|
def init_unix_platform
|
121
143
|
# Allow specification of custom wxWidgets build (mostly useful for
|
122
144
|
# static wxRuby3 builds)
|
@@ -155,13 +177,7 @@ module WXRuby3
|
|
155
177
|
|
156
178
|
@cpp = wx_config("--cxx")
|
157
179
|
@ld = wx_config("--ld")
|
158
|
-
|
159
|
-
wx_libset.merge wx_config("--libs all").split(' ')
|
160
|
-
# some weird thing with this; at least sometimes '--libs all' will not output media library even if feature active
|
161
|
-
if features_set?('wxUSE_MEDIACTRL')
|
162
|
-
wx_libset.merge wx_config("--libs media").split(' ')
|
163
|
-
end
|
164
|
-
@wx_libs = wx_libset.collect { |s| s.dup }
|
180
|
+
@wx_libs = get_wx_libs
|
165
181
|
|
166
182
|
# remove all warning flags provided by Ruby config
|
167
183
|
@ruby_cppflags = @ruby_cppflags.collect { |flags| flags.split(' ') }.flatten.
|
@@ -169,8 +185,7 @@ module WXRuby3
|
|
169
185
|
@ruby_cppflags.concat %w[-Wall -Wextra -Wno-unused-parameter] # only keep these
|
170
186
|
# add include flags
|
171
187
|
@ruby_cppflags.concat ['-I.', *@ruby_includes.collect { |inc| "-I#{inc}" }]
|
172
|
-
@ruby_ldflags <<
|
173
|
-
@ruby_ldflags << "-Wl,-rpath,\\$ORIGIN/../lib" # add default rpath
|
188
|
+
@ruby_ldflags << "-Wl,-rpath,'#{get_rpath_origin}/../lib'" # add default rpath
|
174
189
|
@ruby_libs << "-L#{RB_CONFIG['libdir']}" # add ruby lib dir
|
175
190
|
# add ruby defined shared ruby lib(s); not any other flags
|
176
191
|
@ruby_libs.concat RB_CONFIG['LIBRUBYARG_SHARED'].split(' ').select { |s| s.start_with?('-l')}
|
data/rakelib/lib/config.rb
CHANGED
@@ -245,11 +245,19 @@ module WXRuby3
|
|
245
245
|
def do_link(_pkg)
|
246
246
|
end
|
247
247
|
|
248
|
+
def get_rpath_origin
|
249
|
+
''
|
250
|
+
end
|
251
|
+
|
248
252
|
def check_rpath_patch
|
249
253
|
true
|
250
254
|
end
|
251
255
|
|
252
|
-
def patch_rpath(_shlib,
|
256
|
+
def patch_rpath(_shlib, *)
|
257
|
+
true
|
258
|
+
end
|
259
|
+
|
260
|
+
def update_shlib_loadpaths(_shlib, _deplibs)
|
253
261
|
true
|
254
262
|
end
|
255
263
|
|
@@ -389,11 +397,12 @@ module WXRuby3
|
|
389
397
|
@rb_docgen_path = File.join(Config.wxruby_root, @rb_docgen_dir)
|
390
398
|
|
391
399
|
# Extra swig helper files to be built
|
392
|
-
@helper_modules =
|
393
|
-
|
394
|
-
|
395
|
-
|
396
|
-
|
400
|
+
@helper_modules = %w|RubyStockObjects|
|
401
|
+
# if macosx?
|
402
|
+
# %w|RubyStockObjects Mac|
|
403
|
+
# else
|
404
|
+
# %w|RubyStockObjects|
|
405
|
+
# end
|
397
406
|
# helper to initialize on startup (stock objects can only be initialized after App creation)
|
398
407
|
@helper_inits = @helper_modules - %w|RubyStockObjects|
|
399
408
|
|
@@ -20,7 +20,11 @@ module YARD # rubocop:disable Style/Documentation
|
|
20
20
|
def resolve_links(text)
|
21
21
|
html = Nokogiri::HTML.fragment(text)
|
22
22
|
html.css("a[href]").each do |link|
|
23
|
-
|
23
|
+
begin
|
24
|
+
href = URI(link["href"])
|
25
|
+
rescue
|
26
|
+
return super(text)
|
27
|
+
end
|
24
28
|
|
25
29
|
if href.relative? && options.files
|
26
30
|
fnames = options.files.map(&:filename)
|