From 3a79fbdde25eb4a921efc82621a7fe4dbb1f3122 Mon Sep 17 00:00:00 2001 From: Kai Huuhko Date: Mon, 11 Nov 2013 08:28:48 +0200 Subject: [PATCH] Simplify setup.py elm extensions, disable builder option in setup.cfg --- setup.cfg | 2 +- setup.py | 161 +++++++++++++++++++++++++++--------------------------- 2 files changed, 83 insertions(+), 80 deletions(-) diff --git a/setup.cfg b/setup.cfg index a959971..b9376f6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -9,6 +9,6 @@ [build_doc] # Options for builder: html, latex, texinfo, epub, coverage -builder=html +#builder=html # Outputs txt files with coverage info #builder=coverage diff --git a/setup.py b/setup.py index 410e85a..dce210e 100755 --- a/setup.py +++ b/setup.py @@ -165,87 +165,90 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv): modules.append(dbus_ml_ext) # Elementary - elm_exts = [ - #Extension("elementary.access", ["efl/elementary/access"+module_suffix]), - Extension("elementary.actionslider", ["efl/elementary/actionslider"+module_suffix]), - Extension("elementary.background", ["efl/elementary/background"+module_suffix]), - Extension("elementary.box", ["efl/elementary/box"+module_suffix]), - Extension("elementary.bubble", ["efl/elementary/bubble"+module_suffix]), - Extension("elementary.button", ["efl/elementary/button"+module_suffix]), - Extension("elementary.calendar_elm", ["efl/elementary/calendar_elm"+module_suffix]), - Extension("elementary.check", ["efl/elementary/check"+module_suffix]), - Extension("elementary.clock", ["efl/elementary/clock"+module_suffix]), - Extension("elementary.colorselector", ["efl/elementary/colorselector"+module_suffix]), - Extension("elementary.configuration", ["efl/elementary/configuration"+module_suffix]), - Extension("elementary.conformant", ["efl/elementary/conformant"+module_suffix]), - Extension("elementary.ctxpopup", ["efl/elementary/ctxpopup"+module_suffix]), - Extension("elementary.datetime_elm", ["efl/elementary/datetime_elm"+module_suffix]), - Extension("elementary.dayselector", ["efl/elementary/dayselector"+module_suffix]), - Extension("elementary.diskselector", ["efl/elementary/diskselector"+module_suffix]), - Extension("elementary.entry", ["efl/elementary/entry"+module_suffix]), - Extension("elementary.fileselector_button", ["efl/elementary/fileselector_button"+module_suffix]), - Extension("elementary.fileselector_entry", ["efl/elementary/fileselector_entry"+module_suffix]), - Extension("elementary.fileselector", ["efl/elementary/fileselector"+module_suffix]), - Extension("elementary.flip", ["efl/elementary/flip"+module_suffix]), - Extension("elementary.flipselector", ["efl/elementary/flipselector"+module_suffix]), - Extension("elementary.frame", ["efl/elementary/frame"+module_suffix]), - Extension("elementary.general", ["efl/elementary/general"+module_suffix]), - Extension("elementary.gengrid", ["efl/elementary/gengrid"+module_suffix]), - Extension("elementary.genlist", ["efl/elementary/genlist"+module_suffix]), - Extension("elementary.gesture_layer", ["efl/elementary/gesture_layer"+module_suffix]), - Extension("elementary.glview", ["efl/elementary/glview"+module_suffix]), - Extension("elementary.grid", ["efl/elementary/grid"+module_suffix]), - Extension("elementary.hover", ["efl/elementary/hover"+module_suffix]), - Extension("elementary.hoversel", ["efl/elementary/hoversel"+module_suffix]), - Extension("elementary.icon", ["efl/elementary/icon"+module_suffix]), - Extension("elementary.image", ["efl/elementary/image"+module_suffix]), - Extension("elementary.index", ["efl/elementary/index"+module_suffix]), - Extension("elementary.innerwindow", ["efl/elementary/innerwindow"+module_suffix]), - Extension("elementary.label", ["efl/elementary/label"+module_suffix]), - Extension("elementary.layout_class", ["efl/elementary/layout_class"+module_suffix]), - Extension("elementary.layout", ["efl/elementary/layout"+module_suffix]), - Extension("elementary.list", ["efl/elementary/list"+module_suffix]), - Extension("elementary.mapbuf", ["efl/elementary/mapbuf"+module_suffix]), - Extension("elementary.map", ["efl/elementary/map"+module_suffix]), - Extension("elementary.menu", ["efl/elementary/menu"+module_suffix]), - Extension("elementary.multibuttonentry", ["efl/elementary/multibuttonentry"+module_suffix]), - Extension("elementary.naviframe", ["efl/elementary/naviframe"+module_suffix]), - Extension("elementary.need", ["efl/elementary/need"+module_suffix]), - Extension("elementary.notify", ["efl/elementary/notify"+module_suffix]), - Extension("elementary.object_item", ["efl/elementary/object_item"+module_suffix]), - Extension("elementary.object", ["efl/elementary/object"+module_suffix]), - Extension("elementary.panel", ["efl/elementary/panel"+module_suffix]), - Extension("elementary.panes", ["efl/elementary/panes"+module_suffix]), - Extension("elementary.photocam", ["efl/elementary/photocam"+module_suffix]), - Extension("elementary.photo", ["efl/elementary/photo"+module_suffix]), - Extension("elementary.plug", ["efl/elementary/plug"+module_suffix]), - Extension("elementary.popup", ["efl/elementary/popup"+module_suffix]), - Extension("elementary.progressbar", ["efl/elementary/progressbar"+module_suffix]), - Extension("elementary.radio", ["efl/elementary/radio"+module_suffix]), - Extension("elementary.scroller", ["efl/elementary/scroller"+module_suffix]), - Extension("elementary.segment_control", ["efl/elementary/segment_control"+module_suffix]), - Extension("elementary.separator", ["efl/elementary/separator"+module_suffix]), - Extension("elementary.slider", ["efl/elementary/slider"+module_suffix]), - Extension("elementary.slideshow", ["efl/elementary/slideshow"+module_suffix]), - Extension("elementary.spinner", ["efl/elementary/spinner"+module_suffix]), - #Extension("elementary.store", ["efl/elementary/store"+module_suffix]), - Extension("elementary.table", ["efl/elementary/table"+module_suffix]), - Extension("elementary.theme", ["efl/elementary/theme"+module_suffix]), - Extension("elementary.thumb", ["efl/elementary/thumb"+module_suffix]), - Extension("elementary.toolbar", ["efl/elementary/toolbar"+module_suffix]), - Extension("elementary.transit", ["efl/elementary/transit"+module_suffix]), - Extension("elementary.video", ["efl/elementary/video"+module_suffix]), - Extension("elementary.web", ["efl/elementary/web"+module_suffix]), - Extension("elementary.window", ["efl/elementary/window"+module_suffix]), - ] + elm_mods = ( + #"access", + "actionslider", + "background", + "box", + "bubble", + "button", + "calendar_elm", + "check", + "clock", + "colorselector", + "configuration", + "conformant", + "ctxpopup", + "datetime_elm", + "dayselector", + "diskselector", + "entry", + "fileselector_button", + "fileselector_entry", + "fileselector", + "flip", + "flipselector", + "frame", + "general", + "gengrid", + "genlist", + "gesture_layer", + "glview", + "grid", + "hover", + "hoversel", + "icon", + "image", + "index", + "innerwindow", + "label", + "layout_class", + "layout", + "list", + "mapbuf", + "map", + "menu", + "multibuttonentry", + "naviframe", + "need", + "notify", + "object_item", + "object", + "panel", + "panes", + "photocam", + "photo", + "plug", + "popup", + "progressbar", + "radio", + "scroller", + "segment_control", + "separator", + "slider", + "slideshow", + "spinner", + #"store", + "table", + "theme", + "thumb", + "toolbar", + "transit", + "video", + "web", + "window", + ) elm_cflags, elm_libs = pkg_config('Elementary', 'elementary', "1.7.99") - for e in elm_exts: - e.include_dirs = ['include/'] - e.extra_compile_args = elm_cflags - e.extra_link_args = elm_libs + eina_libs + evas_libs - - modules = modules + elm_exts + for m in elm_mods: + e = Extension( + "elementary." + m, + ["efl/elementary/" + m + module_suffix], + include_dirs = ["include/"], + extra_compile_args = elm_cflags, + extra_link_args = elm_libs + eina_libs + evas_libs + ) + modules.append(e) setup(