summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Huuhko <kai.huuhko@gmail.com>2014-05-31 12:18:32 +0300
committerKai Huuhko <kai.huuhko@gmail.com>2014-05-31 12:18:32 +0300
commit72a9c8ac2d1f11611912a00e777becaf23fdfa2d (patch)
tree54ebefbbe63f606abdefe13ad1f9f66fa26100f4
parentfcbba66f25161681e7f851a4151ee3ef09b69ca4 (diff)
Remove pre-1.8 Python bindings' compatibility packages
-rw-r--r--compat/e_dbus/__init__.py1
-rw-r--r--compat/ecore/__init__.py1
-rw-r--r--compat/edje/__init__.py1
-rw-r--r--compat/elementary/__init__.py71
-rw-r--r--compat/emotion/__init__.py8
-rw-r--r--compat/evas/__init__.py1
-rwxr-xr-xsetup.py28
7 files changed, 2 insertions, 109 deletions
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 @@
1from 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 @@
1from 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 @@
1from 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 @@
1#from efl.elementary.access import *
2from efl.elementary.actionslider import *
3from efl.elementary.background import *
4from efl.elementary.box import *
5from efl.elementary.bubble import *
6from efl.elementary.button import *
7from efl.elementary.calendar_elm import *
8from efl.elementary.check import *
9from efl.elementary.clock import *
10from efl.elementary.colorselector import *
11from efl.elementary.configuration import *
12from efl.elementary.conformant import *
13from efl.elementary.ctxpopup import *
14from efl.elementary.datetime_elm import *
15from efl.elementary.dayselector import *
16from efl.elementary.diskselector import *
17from efl.elementary.entry import *
18from efl.elementary.fileselector import *
19from efl.elementary.fileselector_button import *
20from efl.elementary.fileselector_entry import *
21from efl.elementary.flip import *
22from efl.elementary.flipselector import *
23from efl.elementary.frame import *
24from efl.elementary.general import *
25from efl.elementary.gengrid import *
26from efl.elementary.genlist import *
27from efl.elementary.gesture_layer import *
28#from efl.elementary.glview import *
29from efl.elementary.grid import *
30from efl.elementary.hover import *
31from efl.elementary.hoversel import *
32from efl.elementary.icon import *
33from efl.elementary.image import *
34from efl.elementary.index import *
35from efl.elementary.innerwindow import *
36from efl.elementary.label import *
37from efl.elementary.layout_class import *
38from efl.elementary.layout import *
39from efl.elementary.list import *
40from efl.elementary.map import *
41from efl.elementary.mapbuf import *
42from efl.elementary.menu import *
43from efl.elementary.multibuttonentry import *
44from efl.elementary.naviframe import *
45from efl.elementary.need import *
46from efl.elementary.notify import *
47from efl.elementary.object import *
48from efl.elementary.object_item import *
49from efl.elementary.panel import *
50from efl.elementary.panes import *
51from efl.elementary.photo import *
52from efl.elementary.photocam import *
53from efl.elementary.plug import *
54from efl.elementary.popup import *
55from efl.elementary.progressbar import *
56from efl.elementary.radio import *
57from efl.elementary.scroller import *
58from efl.elementary.segment_control import *
59from efl.elementary.separator import *
60from efl.elementary.slider import *
61from efl.elementary.slideshow import *
62from efl.elementary.spinner import *
63#from efl.elementary.store import *
64from efl.elementary.table import *
65from efl.elementary.theme import *
66from efl.elementary.thumb import *
67from efl.elementary.toolbar import *
68from efl.elementary.transit import *
69from efl.elementary.video import *
70from efl.elementary.web import *
71from 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 @@
1import efl.emotion
2from efl.emotion import *
3
4class Emotion(efl.emotion.Emotion):
5 def __init__(self, *args, **kwargs):
6 if "module_filename" in kwargs.keys():
7 kwargs["module_name"] = kwargs.pop("module_filename")
8 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 @@
1from 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):
171 171
172modules = [] 172modules = []
173packages = ["efl"] 173packages = ["efl"]
174package_dirs = {} 174#package_dirs = {} # Use this if you put packages in non-root paths
175 175
176if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv): 176if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
177 177
@@ -223,10 +223,6 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
223 ) 223 )
224 modules.append(evas_ext) 224 modules.append(evas_ext)
225 225
226 # compatibility
227 packages.append("evas")
228 package_dirs["evas"] = "compat/evas"
229
230 # === Ecore === 226 # === Ecore ===
231 ecore_cflags, ecore_libs = pkg_config('Ecore', 'ecore', EFL_MIN_VERSION) 227 ecore_cflags, ecore_libs = pkg_config('Ecore', 'ecore', EFL_MIN_VERSION)
232 ecore_file_cflags, ecore_file_libs = pkg_config( 228 ecore_file_cflags, ecore_file_libs = pkg_config(
@@ -266,10 +262,6 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
266 modules += ecore_exts 262 modules += ecore_exts
267 packages.append("efl.ecore") 263 packages.append("efl.ecore")
268 264
269 # compatibility
270 packages.append("ecore")
271 package_dirs["ecore"] = "compat/ecore"
272
273 # === Ethumb === 265 # === Ethumb ===
274 ethumb_cflags, ethumb_libs = pkg_config( 266 ethumb_cflags, ethumb_libs = pkg_config(
275 'Ethumb', 'ethumb', EFL_MIN_VERSION) 267 'Ethumb', 'ethumb', EFL_MIN_VERSION)
@@ -301,10 +293,6 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
301 ) 293 )
302 modules.append(edje_ext) 294 modules.append(edje_ext)
303 295
304 # compatibility
305 packages.append("edje")
306 package_dirs["edje"] = "compat/edje"
307
308 # --- Edje_Edit --- 296 # --- Edje_Edit ---
309 edje_edit_ext = Extension( 297 edje_edit_ext = Extension(
310 "edje_edit", ["efl/edje/efl.edje_edit" + module_suffix], 298 "edje_edit", ["efl/edje/efl.edje_edit" + module_suffix],
@@ -327,10 +315,6 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
327 ) 315 )
328 modules.append(emotion_ext) 316 modules.append(emotion_ext)
329 317
330 # compatibility
331 packages.append("emotion")
332 package_dirs["emotion"] = "compat/emotion"
333
334 # === dbus mainloop integration === 318 # === dbus mainloop integration ===
335 dbus_cflags, dbus_libs = pkg_config('DBus', 'dbus-python', "0.83.0") 319 dbus_cflags, dbus_libs = pkg_config('DBus', 'dbus-python', "0.83.0")
336 dbus_ml_ext = Extension( 320 dbus_ml_ext = Extension(
@@ -342,10 +326,6 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
342 ) 326 )
343 modules.append(dbus_ml_ext) 327 modules.append(dbus_ml_ext)
344 328
345 # compatibility
346 packages.append("e_dbus")
347 package_dirs["e_dbus"] = "compat/e_dbus"
348
349 # === Elementary === 329 # === Elementary ===
350 elm_mods = ( 330 elm_mods = (
351 #"access", 331 #"access",
@@ -435,10 +415,6 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
435 415
436 packages.append("efl.elementary") 416 packages.append("efl.elementary")
437 417
438 # compatibility
439 packages.append("elementary")
440 package_dirs["elementary"] = "compat/elementary"
441
442 418
443setup( 419setup(
444 name="python-efl", 420 name="python-efl",
@@ -468,7 +444,7 @@ setup(
468 'release': ('setup.py', RELEASE) 444 'release': ('setup.py', RELEASE)
469 } 445 }
470 }, 446 },
471 package_dir=package_dirs, 447 #package_dir=package_dirs,
472 packages=packages, 448 packages=packages,
473 ext_package="efl", # The prefix for ext modules/packages 449 ext_package="efl", # The prefix for ext modules/packages
474 ext_modules=cythonize( 450 ext_modules=cythonize(