diff --git a/compat/e_dbus/__init__.py b/compat/e_dbus/__init__.py deleted file mode 100644 index 63ab39d..0000000 --- a/compat/e_dbus/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from efl.dbus_mainloop import * diff --git a/compat/ecore/__init__.py b/compat/ecore/__init__.py deleted file mode 100644 index c86d915..0000000 --- a/compat/ecore/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from efl.ecore import * diff --git a/compat/edje/__init__.py b/compat/edje/__init__.py deleted file mode 100644 index b0248b2..0000000 --- a/compat/edje/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from efl.edje import * diff --git a/compat/elementary/__init__.py b/compat/elementary/__init__.py deleted file mode 100644 index 1d6f5b5..0000000 --- a/compat/elementary/__init__.py +++ /dev/null @@ -1,71 +0,0 @@ -#from efl.elementary.access import * -from efl.elementary.actionslider import * -from efl.elementary.background import * -from efl.elementary.box import * -from efl.elementary.bubble import * -from efl.elementary.button import * -from efl.elementary.calendar_elm import * -from efl.elementary.check import * -from efl.elementary.clock import * -from efl.elementary.colorselector import * -from efl.elementary.configuration import * -from efl.elementary.conformant import * -from efl.elementary.ctxpopup import * -from efl.elementary.datetime_elm import * -from efl.elementary.dayselector import * -from efl.elementary.diskselector import * -from efl.elementary.entry import * -from efl.elementary.fileselector import * -from efl.elementary.fileselector_button import * -from efl.elementary.fileselector_entry import * -from efl.elementary.flip import * -from efl.elementary.flipselector import * -from efl.elementary.frame import * -from efl.elementary.general import * -from efl.elementary.gengrid import * -from efl.elementary.genlist import * -from efl.elementary.gesture_layer import * -#from efl.elementary.glview import * -from efl.elementary.grid import * -from efl.elementary.hover import * -from efl.elementary.hoversel import * -from efl.elementary.icon import * -from efl.elementary.image import * -from efl.elementary.index import * -from efl.elementary.innerwindow import * -from efl.elementary.label import * -from efl.elementary.layout_class import * -from efl.elementary.layout import * -from efl.elementary.list import * -from efl.elementary.map import * -from efl.elementary.mapbuf import * -from efl.elementary.menu import * -from efl.elementary.multibuttonentry import * -from efl.elementary.naviframe import * -from efl.elementary.need import * -from efl.elementary.notify import * -from efl.elementary.object import * -from efl.elementary.object_item import * -from efl.elementary.panel import * -from efl.elementary.panes import * -from efl.elementary.photo import * -from efl.elementary.photocam import * -from efl.elementary.plug import * -from efl.elementary.popup import * -from efl.elementary.progressbar import * -from efl.elementary.radio import * -from efl.elementary.scroller import * -from efl.elementary.segment_control import * -from efl.elementary.separator import * -from efl.elementary.slider import * -from efl.elementary.slideshow import * -from efl.elementary.spinner import * -#from efl.elementary.store import * -from efl.elementary.table import * -from efl.elementary.theme import * -from efl.elementary.thumb import * -from efl.elementary.toolbar import * -from efl.elementary.transit import * -from efl.elementary.video import * -from efl.elementary.web import * -from efl.elementary.window import * diff --git a/compat/emotion/__init__.py b/compat/emotion/__init__.py deleted file mode 100644 index f09b4a8..0000000 --- a/compat/emotion/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -import efl.emotion -from efl.emotion import * - -class Emotion(efl.emotion.Emotion): - def __init__(self, *args, **kwargs): - if "module_filename" in kwargs.keys(): - kwargs["module_name"] = kwargs.pop("module_filename") - efl.emotion.Emotion.__init__(self, *args, **kwargs) diff --git a/compat/evas/__init__.py b/compat/evas/__init__.py deleted file mode 100644 index c326ac5..0000000 --- a/compat/evas/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from efl.evas import * diff --git a/setup.py b/setup.py index bb30d0b..dee9e17 100755 --- a/setup.py +++ b/setup.py @@ -171,7 +171,7 @@ class CleanGenerated(Command): modules = [] packages = ["efl"] -package_dirs = {} +#package_dirs = {} # Use this if you put packages in non-root paths if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv): @@ -223,10 +223,6 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv): ) modules.append(evas_ext) - # compatibility - packages.append("evas") - package_dirs["evas"] = "compat/evas" - # === Ecore === ecore_cflags, ecore_libs = pkg_config('Ecore', 'ecore', EFL_MIN_VERSION) ecore_file_cflags, ecore_file_libs = pkg_config( @@ -266,10 +262,6 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv): modules += ecore_exts packages.append("efl.ecore") - # compatibility - packages.append("ecore") - package_dirs["ecore"] = "compat/ecore" - # === Ethumb === ethumb_cflags, ethumb_libs = pkg_config( 'Ethumb', 'ethumb', EFL_MIN_VERSION) @@ -301,10 +293,6 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv): ) modules.append(edje_ext) - # compatibility - packages.append("edje") - package_dirs["edje"] = "compat/edje" - # --- Edje_Edit --- edje_edit_ext = Extension( "edje_edit", ["efl/edje/efl.edje_edit" + module_suffix], @@ -327,10 +315,6 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv): ) modules.append(emotion_ext) - # compatibility - packages.append("emotion") - package_dirs["emotion"] = "compat/emotion" - # === dbus mainloop integration === dbus_cflags, dbus_libs = pkg_config('DBus', 'dbus-python', "0.83.0") dbus_ml_ext = Extension( @@ -342,10 +326,6 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv): ) modules.append(dbus_ml_ext) - # compatibility - packages.append("e_dbus") - package_dirs["e_dbus"] = "compat/e_dbus" - # === Elementary === elm_mods = ( #"access", @@ -435,10 +415,6 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv): packages.append("efl.elementary") - # compatibility - packages.append("elementary") - package_dirs["elementary"] = "compat/elementary" - setup( name="python-efl", @@ -468,7 +444,7 @@ setup( 'release': ('setup.py', RELEASE) } }, - package_dir=package_dirs, + #package_dir=package_dirs, packages=packages, ext_package="efl", # The prefix for ext modules/packages ext_modules=cythonize(