summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorDave Andreoli <dave@gurumeditation.it>2015-01-04 12:47:40 +0100
committerDave Andreoli <dave@gurumeditation.it>2015-01-04 12:47:40 +0100
commit863efc19ebe9d0da3b7ed387cd257657ad39c3dd (patch)
tree5f9eb781d53746cd18654c2493bd0aa7b7f3a2db /setup.py
parent1910563604d65bc76b377fec75d9b5570585d239 (diff)
Move ecore_x out of the ecore extension
Now ecore do not more looks like an alien with his __init__ hack and his different module/package structure This broke ecore.x users as the extension is now efl.ecore_x Sorry to bother but I still think that ecore_x should not be implemented in python, if this hurt you please let me know
Diffstat (limited to 'setup.py')
-rwxr-xr-xsetup.py55
1 files changed, 28 insertions, 27 deletions
diff --git a/setup.py b/setup.py
index 7fdc16a..40123ac 100755
--- a/setup.py
+++ b/setup.py
@@ -227,36 +227,37 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
227 227
228 # === Ecore === 228 # === Ecore ===
229 ecore_cflags, ecore_libs = pkg_config('Ecore', 'ecore', EFL_MIN_VER) 229 ecore_cflags, ecore_libs = pkg_config('Ecore', 'ecore', EFL_MIN_VER)
230 ecore_file_cflags, ecore_file_libs = pkg_config( 230 ecore_file_cflags, ecore_file_libs = pkg_config('EcoreFile', 'ecore-file',
231 'EcoreFile', 'ecore-file', EFL_MIN_VER) 231 EFL_MIN_VER)
232 ecore_exts = [ 232 ecore_ext = Extension("ecore", ["efl/ecore/efl.ecore" + module_suffix],
233 Extension("ecore.__init__", ["efl/ecore/__init__" + module_suffix], 233 include_dirs=['include/'],
234 include_dirs=['include/'], 234 extra_compile_args=list(set(ecore_cflags +
235 extra_compile_args=list(set(ecore_cflags + ecore_file_cflags)), 235 ecore_file_cflags)),
236 extra_link_args=ecore_libs + ecore_file_libs + eina_libs + 236 extra_link_args=ecore_libs + ecore_file_libs +
237 evas_libs), 237 eina_libs + evas_libs)
238 ] 238 ext_modules.append(ecore_ext)
239
240 # === Ecore X ===
239 try: 241 try:
240 ecore_input_cflags, ecore_input_libs = pkg_config( 242 ecore_input_cflags, ecore_input_libs = pkg_config('EcoreInput',
241 'EcoreInput', 'ecore-input', EFL_MIN_VER) 243 'ecore-input',
242 ecore_x_cflags, ecore_x_libs = pkg_config( 244 EFL_MIN_VER)
243 'EcoreX', 'ecore-x', EFL_MIN_VER) 245 ecore_x_cflags, ecore_x_libs = pkg_config('EcoreX', 'ecore-x',
246 EFL_MIN_VER)
244 except SystemExit: # FIXME: Change pkg-config to return a value 247 except SystemExit: # FIXME: Change pkg-config to return a value
245 pass 248 pass
246 else: 249 else:
247 ecore_exts.append( 250 ecore_x_ext = Extension("ecore_x",
248 Extension("ecore.x", ["efl/ecore/x" + module_suffix], 251 ["efl/ecore_x/efl.ecore_x" + module_suffix],
249 include_dirs=['include/'], 252 include_dirs=['include/'],
250 extra_compile_args=list(set(ecore_cflags + 253 extra_compile_args=list(set(ecore_cflags +
251 ecore_file_cflags + 254 ecore_file_cflags +
252 ecore_x_cflags + 255 ecore_x_cflags +
253 ecore_input_cflags)), 256 ecore_input_cflags)),
254 extra_link_args=ecore_libs + ecore_file_libs + 257 extra_link_args=ecore_libs + ecore_file_libs +
255 ecore_x_libs + ecore_input_libs + 258 ecore_x_libs + ecore_input_libs +
256 eina_libs + evas_libs) 259 eina_libs + evas_libs)
257 ) 260 ext_modules.append(ecore_x_ext)
258 ext_modules.extend(ecore_exts)
259 packages.append("efl.ecore")
260 261
261 # === Ethumb === 262 # === Ethumb ===
262 ethumb_cflags, ethumb_libs = pkg_config('Ethumb', 'ethumb', EFL_MIN_VER) 263 ethumb_cflags, ethumb_libs = pkg_config('Ethumb', 'ethumb', EFL_MIN_VER)
@@ -391,7 +392,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
391 e = Extension("elementary." + m, 392 e = Extension("elementary." + m,
392 ["efl/elementary/" + m + module_suffix], 393 ["efl/elementary/" + m + module_suffix],
393 include_dirs=["include/"], 394 include_dirs=["include/"],
394 extra_compile_args=elm_cflags + ecore_x_cflags, 395 extra_compile_args=elm_cflags,
395 extra_link_args=elm_libs + eina_libs + evas_libs) 396 extra_link_args=elm_libs + eina_libs + evas_libs)
396 ext_modules.append(e) 397 ext_modules.append(e)
397 398