From 0ec744a3a5cafc49af7c4f5291e4c7c4f163a632 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 2 Feb 2018 10:01:47 +0100 Subject: [PATCH] Split list of sources We need to have two lists: one, with the list of sources that need to be introspected; and one with the list of sources that contain only private symbols. This reduces the amount of source files that the introspection scanner needs to traverse, and thus the build time. --- gtk/meson.build | 212 +++++++++++++++++++++++++----------------------- 1 file changed, 109 insertions(+), 103 deletions(-) diff --git a/gtk/meson.build b/gtk/meson.build index cb450e214a..4d22655d8c 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -2,79 +2,29 @@ subdir('deprecated') subdir('a11y') subdir('inspector') -gtk_public_sources = files([ +# List of sources that do not contain public API, and should not be +# introspected +gtk_private_sources = files([ 'fallback-c89.c', 'fnmatch.c', 'language-names.c', 'script-names.c', 'gdkpixbufutils.c', - 'gtkaboutdialog.c', - 'gtkaccelgroup.c', - 'gtkaccellabel.c', - 'gtkaccelmap.c', - 'gtkaccessible.c', - 'gtkactionable.c', - 'gtkactionbar.c', 'gtkactionhelper.c', 'gtkactionmuxer.c', 'gtkactionobservable.c', 'gtkactionobserver.c', - 'gtkadjustment.c', 'gtkallocatedbitmask.c', - 'gtkappchooser.c', - 'gtkappchooserbutton.c', - 'gtkappchooserdialog.c', - 'gtkappchooserwidget.c', - 'gtkapplication.c', 'gtkapplicationaccels.c', 'gtkapplicationimpl.c', - 'gtkapplicationwindow.c', - 'gtkaspectframe.c', - 'gtkassistant.c', - 'gtkbbox.c', - 'gtkbin.c', - 'gtkbindings.c', 'gtkbookmarksmanager.c', - 'gtkborder.c', - 'gtkbox.c', - 'gtkbuildable.c', 'gtkbuilder-menus.c', - 'gtkbuilder.c', 'gtkbuilderparser.c', - 'gtkbutton.c', - 'gtkcalendar.c', - 'gtkcellarea.c', - 'gtkcellareabox.c', 'gtkcellareaboxcontext.c', - 'gtkcellareacontext.c', - 'gtkcelleditable.c', - 'gtkcelllayout.c', - 'gtkcellrenderer.c', - 'gtkcellrendereraccel.c', - 'gtkcellrenderercombo.c', - 'gtkcellrendererpixbuf.c', - 'gtkcellrendererprogress.c', - 'gtkcellrendererspin.c', - 'gtkcellrendererspinner.c', - 'gtkcellrenderertext.c', - 'gtkcellrenderertoggle.c', - 'gtkcellview.c', - 'gtkcenterbox.c', - 'gtkcheckbutton.c', - 'gtkcheckmenuitem.c', - 'gtkcolorbutton.c', - 'gtkcolorchooser.c', - 'gtkcolorchooserdialog.c', - 'gtkcolorchooserwidget.c', 'gtkcoloreditor.c', 'gtkcolorplane.c', 'gtkcolorscale.c', 'gtkcolorswatch.c', - 'gtkcolorutils.c', - 'gtkcombobox.c', - 'gtkcomboboxtext.c', - 'gtkcomposetable.c', - 'gtkcontainer.c', 'gtkcssanimatedstyle.c', 'gtkcssanimation.c', 'gtkcssarrayvalue.c', @@ -116,10 +66,8 @@ gtk_public_sources = files([ 'gtkcssparser.c', 'gtkcsspathnode.c', 'gtkcsspositionvalue.c', - 'gtkcssprovider.c', 'gtkcssrepeatvalue.c', 'gtkcssrgbavalue.c', - 'gtkcsssection.c', 'gtkcssselector.c', 'gtkcssshadowsvalue.c', 'gtkcssshadowvalue.c', @@ -140,6 +88,111 @@ gtk_public_sources = files([ 'gtkcsswidgetnode.c', 'gtkcsswin32sizevalue.c', 'gtkdebugupdates.c', + 'gtkeventcontrollerlegacy.c', + 'gtkfilechooserembed.c', + 'gtkfilechooserentry.c', + 'gtkfilechoosererrorstack.c', + 'gtkfilechoosernativeportal.c', + 'gtkfilechooserutils.c', + 'gtkfilesystem.c', + 'gtkfilesystemmodel.c', + 'gtkgizmo.c', + 'gtkgladecatalog.c', + 'gtkhsla.c', + 'gtkicon.c', + 'gtkiconcache.c', + 'gtkiconcachevalidator.c', + 'gtkiconhelper.c', + 'gtkkineticscrolling.c', + 'gtkkeyhash.c', + 'gtkmagnifier.c', + 'gtkmenusectionbox.c', + 'gtkmenutracker.c', + 'gtkmenutrackeritem.c', + 'gtkmnemonichash.c', + 'gtkpango.c', + 'gskpango.c', + 'gtkpathbar.c', + 'gtkplacessidebar.c', + 'gtkplacesview.c', + 'gtkplacesviewrow.c', + 'gtkpointerfocus.c', + 'gtkprintutils.c', + 'gtkprivate.c', + 'gtkprogresstracker.c', + 'gtkquery.c', + 'gtkrecentchooserutils.c', + 'gtksearchengine.c', + 'gtksearchenginemodel.c', + 'gtksearchenginesimple.c', + 'gtksizerequestcache.c', + 'gtkstyleanimation.c', + 'gtkstylecascade.c', + 'gtkstyleproperty.c', + 'gtktextbtree.c', + 'gtktrashmonitor.c', + 'gtktreedatalist.c', + 'gtkwin32draw.c', + 'gtkwin32theme.c', + 'gtkwin32theme.c', +]) + +# List of files that contain public API, and should be introspected +gtk_public_sources = files([ + 'gtkaboutdialog.c', + 'gtkaccelgroup.c', + 'gtkaccellabel.c', + 'gtkaccelmap.c', + 'gtkaccessible.c', + 'gtkactionable.c', + 'gtkactionbar.c', + 'gtkadjustment.c', + 'gtkappchooser.c', + 'gtkappchooserbutton.c', + 'gtkappchooserdialog.c', + 'gtkappchooserwidget.c', + 'gtkapplication.c', + 'gtkapplicationwindow.c', + 'gtkaspectframe.c', + 'gtkassistant.c', + 'gtkbbox.c', + 'gtkbin.c', + 'gtkbindings.c', + 'gtkborder.c', + 'gtkbox.c', + 'gtkbuildable.c', + 'gtkbuilder.c', + 'gtkbutton.c', + 'gtkcalendar.c', + 'gtkcellarea.c', + 'gtkcellareabox.c', + 'gtkcellareacontext.c', + 'gtkcelleditable.c', + 'gtkcelllayout.c', + 'gtkcellrenderer.c', + 'gtkcellrendereraccel.c', + 'gtkcellrenderercombo.c', + 'gtkcellrendererpixbuf.c', + 'gtkcellrendererprogress.c', + 'gtkcellrendererspin.c', + 'gtkcellrendererspinner.c', + 'gtkcellrenderertext.c', + 'gtkcellrenderertoggle.c', + 'gtkcellview.c', + 'gtkcenterbox.c', + 'gtkcheckbutton.c', + 'gtkcheckmenuitem.c', + 'gtkcolorbutton.c', + 'gtkcolorchooser.c', + 'gtkcolorchooserdialog.c', + 'gtkcolorchooserwidget.c', + 'gtkcolorutils.c', + 'gtkcombobox.c', + 'gtkcomboboxtext.c', + 'gtkcomposetable.c', + 'gtkcontainer.c', + 'gtkcssprovider.c', + 'gtkcsssection.c', 'gtkdialog.c', 'gtkdragsource.c', 'gtkdrawingarea.c', @@ -149,23 +202,15 @@ gtk_public_sources = files([ 'gtkentrybuffer.c', 'gtkentrycompletion.c', 'gtkeventcontroller.c', - 'gtkeventcontrollerlegacy.c', 'gtkeventcontrollermotion.c', 'gtkeventcontrollerscroll.c', 'gtkexpander.c', 'gtkfilechooser.c', 'gtkfilechooserbutton.c', 'gtkfilechooserdialog.c', - 'gtkfilechooserembed.c', - 'gtkfilechooserentry.c', - 'gtkfilechoosererrorstack.c', 'gtkfilechoosernative.c', - 'gtkfilechoosernativeportal.c', - 'gtkfilechooserutils.c', 'gtkfilechooserwidget.c', 'gtkfilefilter.c', - 'gtkfilesystem.c', - 'gtkfilesystemmodel.c', 'gtkfixed.c', 'gtkflowbox.c', 'gtkfontbutton.c', @@ -183,16 +228,9 @@ gtk_public_sources = files([ 'gtkgesturesingle.c', 'gtkgestureswipe.c', 'gtkgesturezoom.c', - 'gtkgizmo.c', - 'gtkgladecatalog.c', 'gtkglarea.c', 'gtkgrid.c', 'gtkheaderbar.c', - 'gtkhsla.c', - 'gtkicon.c', - 'gtkiconcache.c', - 'gtkiconcachevalidator.c', - 'gtkiconhelper.c', 'gtkicontheme.c', 'gtkiconview.c', 'gtkimage.c', @@ -203,8 +241,6 @@ gtk_public_sources = files([ 'gtkimmulticontext.c', 'gtkinfobar.c', 'gtkinvisible.c', - 'gtkkeyhash.c', - 'gtkkineticscrolling.c', 'gtklabel.c', 'gtklayout.c', 'gtklevelbar.c', @@ -212,19 +248,14 @@ gtk_public_sources = files([ 'gtklistbox.c', 'gtkliststore.c', 'gtklockbutton.c', - 'gtkmagnifier.c', 'gtkmain.c', 'gtkmenu.c', 'gtkmenubar.c', 'gtkmenubutton.c', 'gtkmenuitem.c', - 'gtkmenusectionbox.c', 'gtkmenushell.c', 'gtkmenutoolbutton.c', - 'gtkmenutracker.c', - 'gtkmenutrackeritem.c', 'gtkmessagedialog.c', - 'gtkmnemonichash.c', 'gtkmodelbutton.c', 'gtkmodelmenuitem.c', 'gtkmodules.c', @@ -236,25 +267,14 @@ gtk_public_sources = files([ 'gtkpadcontroller.c', 'gtkpagesetup.c', 'gtkpaned.c', - 'gtkpango.c', - 'gskpango.c', 'gtkpapersize.c', - 'gtkpathbar.c', - 'gtkplacessidebar.c', - 'gtkplacesview.c', - 'gtkplacesviewrow.c', - 'gtkpointerfocus.c', 'gtkpopover.c', 'gtkpopovermenu.c', 'gtkprintcontext.c', 'gtkprintoperation.c', 'gtkprintoperationpreview.c', 'gtkprintsettings.c', - 'gtkprintutils.c', - 'gtkprivate.c', 'gtkprogressbar.c', - 'gtkprogresstracker.c', - 'gtkquery.c', 'gtkradiobutton.c', 'gtkradiomenuitem.c', 'gtkradiotoolbutton.c', @@ -264,7 +284,6 @@ gtk_public_sources = files([ 'gtkrecentchooserdefault.c', 'gtkrecentchooserdialog.c', 'gtkrecentchoosermenu.c', - 'gtkrecentchooserutils.c', 'gtkrecentchooserwidget.c', 'gtkrecentfilter.c', 'gtkrecentmanager.c', @@ -280,9 +299,6 @@ gtk_public_sources = files([ 'gtkscrollbar.c', 'gtkscrolledwindow.c', 'gtksearchbar.c', - 'gtksearchengine.c', - 'gtksearchenginemodel.c', - 'gtksearchenginesimple.c', 'gtksearchentry.c', 'gtkselection.c', 'gtkseparator.c', @@ -298,7 +314,6 @@ gtk_public_sources = files([ 'gtksidebarrow.c', 'gtksizegroup.c', 'gtksizerequest.c', - 'gtksizerequestcache.c', 'gtkspinbutton.c', 'gtksnapshot.c', 'gtkspinner.c', @@ -306,15 +321,11 @@ gtk_public_sources = files([ 'gtkstacksidebar.c', 'gtkstackswitcher.c', 'gtkstatusbar.c', - 'gtkstyleanimation.c', - 'gtkstylecascade.c', 'gtkstylecontext.c', - 'gtkstyleproperty.c', 'gtkstyleprovider.c', 'gtkswitch.c', 'gtktestutils.c', 'gtktextattributes.c', - 'gtktextbtree.c', 'gtktextbuffer.c', 'gtktextchild.c', 'gtktextdisplay.c', @@ -338,8 +349,6 @@ gtk_public_sources = files([ 'gtktoolshell.c', 'gtktooltip.c', 'gtktooltipwindow.c', - 'gtktrashmonitor.c', - 'gtktreedatalist.c', 'gtktreednd.c', 'gtktreemenu.c', 'gtktreemodel.c', @@ -356,9 +365,6 @@ gtk_public_sources = files([ 'gtkwidget.c', 'gtkwidgetfocus.c', 'gtkwidgetpath.c', - 'gtkwin32draw.c', - 'gtkwin32theme.c', - 'gtkwin32theme.c', 'gtkwindow.c', 'gtkwindowgroup.c', ]) @@ -593,7 +599,7 @@ gtk_public_headers = files([ install_headers(gtk_public_headers, subdir: 'gtk-4.0/gtk/') -gtk_sources = gtk_public_sources +gtk_sources = gtk_public_sources + gtk_private_sources if os_unix gtk_unix_print_headers = [