summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Andreoli <dave@gurumeditation.it>2018-03-19 21:16:53 +0100
committerDave Andreoli <dave@gurumeditation.it>2018-03-19 21:16:53 +0100
commit26607a098607d56ad460e84535387628045217d8 (patch)
tree7bff02302b82f5c1168605ee67da3181a9d2bcb6
parentffc3c337dc183a12e71a80c4a1e7c80710c2d14f (diff)
Changes to make cython 0.28 happy
This just refactor how the extensions are named, nothing is changed in the final layout of the package. Renamed the dbus extension, that was indeed the only one with a different naming scheme. Also raised the minimum cython version a bit, min is now at 0.23.5, that is still quite old. The oldest ones seems to not like the new naming scheme.
-rw-r--r--efl/dbus_mainloop/efl.dbus_mainloop.pxd (renamed from efl/dbus_mainloop/dbus_mainloop.pxd)0
-rw-r--r--efl/dbus_mainloop/efl.dbus_mainloop.pyx (renamed from efl/dbus_mainloop/dbus_mainloop.pyx)0
-rwxr-xr-xsetup.py47
3 files changed, 27 insertions, 20 deletions
diff --git a/efl/dbus_mainloop/dbus_mainloop.pxd b/efl/dbus_mainloop/efl.dbus_mainloop.pxd
index d16562c..d16562c 100644
--- a/efl/dbus_mainloop/dbus_mainloop.pxd
+++ b/efl/dbus_mainloop/efl.dbus_mainloop.pxd
diff --git a/efl/dbus_mainloop/dbus_mainloop.pyx b/efl/dbus_mainloop/efl.dbus_mainloop.pyx
index f77d840..f77d840 100644
--- a/efl/dbus_mainloop/dbus_mainloop.pyx
+++ b/efl/dbus_mainloop/efl.dbus_mainloop.pyx
diff --git a/setup.py b/setup.py
index 8b1c043..885acd6 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ RELEASE = __version__
19VERSION = "%d.%d" % (vers[0], vers[1] if vers[2] < 99 else vers[1] + 1) 19VERSION = "%d.%d" % (vers[0], vers[1] if vers[2] < 99 else vers[1] + 1)
20 20
21# dependencies 21# dependencies
22CYTHON_MIN_VERSION = "0.21" 22CYTHON_MIN_VERSION = "0.23.5"
23CYTHON_BLACKLIST = () 23CYTHON_BLACKLIST = ()
24EFL_MIN_VER = RELEASE 24EFL_MIN_VER = RELEASE
25ELM_MIN_VER = RELEASE 25ELM_MIN_VER = RELEASE
@@ -268,7 +268,8 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
268 268
269 # === Eo === 269 # === Eo ===
270 eo_cflags, eo_libs = pkg_config('Eo', 'eo', EFL_MIN_VER) 270 eo_cflags, eo_libs = pkg_config('Eo', 'eo', EFL_MIN_VER)
271 eo_ext = Extension("eo", ["efl/eo/efl.eo" + module_suffix], 271 eo_ext = Extension("efl.eo",
272 ["efl/eo/efl.eo" + module_suffix],
272 define_macros=[ 273 define_macros=[
273 ('EFL_BETA_API_SUPPORT', 1), 274 ('EFL_BETA_API_SUPPORT', 1),
274 ('EFL_EO_API_SUPPORT', 1) 275 ('EFL_EO_API_SUPPORT', 1)
@@ -281,15 +282,18 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
281 282
282 # === Utilities === 283 # === Utilities ===
283 utils_ext = [ 284 utils_ext = [
284 Extension("utils.deprecated", ["efl/utils/deprecated" + module_suffix], 285 Extension("efl.utils.deprecated",
286 ["efl/utils/deprecated" + module_suffix],
285 include_dirs=['include/'], 287 include_dirs=['include/'],
286 extra_compile_args=eina_cflags + common_cflags, 288 extra_compile_args=eina_cflags + common_cflags,
287 extra_link_args=eina_libs), 289 extra_link_args=eina_libs),
288 Extension("utils.conversions", ["efl/utils/conversions" + module_suffix], 290 Extension("efl.utils.conversions",
291 ["efl/utils/conversions" + module_suffix],
289 include_dirs=['include/'], 292 include_dirs=['include/'],
290 extra_compile_args=eo_cflags + common_cflags, 293 extra_compile_args=eo_cflags + common_cflags,
291 extra_link_args=eo_libs + eina_libs), 294 extra_link_args=eo_libs + eina_libs),
292 Extension("utils.logger", ["efl/utils/logger" + module_suffix], 295 Extension("efl.utils.logger",
296 ["efl/utils/logger" + module_suffix],
293 include_dirs=['include/'], 297 include_dirs=['include/'],
294 extra_compile_args=eina_cflags + common_cflags, 298 extra_compile_args=eina_cflags + common_cflags,
295 extra_link_args=eina_libs), 299 extra_link_args=eina_libs),
@@ -300,7 +304,8 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
300 304
301 # === Evas === 305 # === Evas ===
302 evas_cflags, evas_libs = pkg_config('Evas', 'evas', EFL_MIN_VER) 306 evas_cflags, evas_libs = pkg_config('Evas', 'evas', EFL_MIN_VER)
303 evas_ext = Extension("evas", ["efl/evas/efl.evas" + module_suffix], 307 evas_ext = Extension("efl.evas",
308 ["efl/evas/efl.evas" + module_suffix],
304 define_macros=[ 309 define_macros=[
305 ('EFL_BETA_API_SUPPORT', 1), 310 ('EFL_BETA_API_SUPPORT', 1),
306 ('EFL_EO_API_SUPPORT', 1) 311 ('EFL_EO_API_SUPPORT', 1)
@@ -314,7 +319,8 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
314 ecore_cflags, ecore_libs = pkg_config('Ecore', 'ecore', EFL_MIN_VER) 319 ecore_cflags, ecore_libs = pkg_config('Ecore', 'ecore', EFL_MIN_VER)
315 ecore_file_cflags, ecore_file_libs = pkg_config('EcoreFile', 'ecore-file', 320 ecore_file_cflags, ecore_file_libs = pkg_config('EcoreFile', 'ecore-file',
316 EFL_MIN_VER) 321 EFL_MIN_VER)
317 ecore_ext = Extension("ecore", ["efl/ecore/efl.ecore" + module_suffix], 322 ecore_ext = Extension("efl.ecore",
323 ["efl/ecore/efl.ecore" + module_suffix],
318 include_dirs=['include/'], 324 include_dirs=['include/'],
319 extra_compile_args=list(set(ecore_cflags + 325 extra_compile_args=list(set(ecore_cflags +
320 ecore_file_cflags + 326 ecore_file_cflags +
@@ -327,7 +333,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
327 ecore_input_cflags, ecore_input_libs = pkg_config('EcoreInput', 333 ecore_input_cflags, ecore_input_libs = pkg_config('EcoreInput',
328 'ecore-input', 334 'ecore-input',
329 EFL_MIN_VER) 335 EFL_MIN_VER)
330 ecore_input_ext = Extension("ecore_input", 336 ecore_input_ext = Extension("efl.ecore_input",
331 ["efl/ecore_input/efl.ecore_input" + module_suffix], 337 ["efl/ecore_input/efl.ecore_input" + module_suffix],
332 include_dirs=['include/'], 338 include_dirs=['include/'],
333 extra_compile_args=list(set(ecore_cflags + 339 extra_compile_args=list(set(ecore_cflags +
@@ -341,7 +347,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
341 # === Ecore Con === 347 # === Ecore Con ===
342 ecore_con_cflags, ecore_con_libs = pkg_config('EcoreCon', 'ecore-con', 348 ecore_con_cflags, ecore_con_libs = pkg_config('EcoreCon', 'ecore-con',
343 EFL_MIN_VER) 349 EFL_MIN_VER)
344 ecore_con_ext = Extension("ecore_con", 350 ecore_con_ext = Extension("efl.ecore_con",
345 ["efl/ecore_con/efl.ecore_con" + module_suffix], 351 ["efl/ecore_con/efl.ecore_con" + module_suffix],
346 include_dirs=['include/'], 352 include_dirs=['include/'],
347 extra_compile_args=list(set(ecore_cflags + 353 extra_compile_args=list(set(ecore_cflags +
@@ -359,7 +365,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
359 except SystemExit: 365 except SystemExit:
360 print("Not found, will not be built") 366 print("Not found, will not be built")
361 else: 367 else:
362 ecore_x_ext = Extension("ecore_x", 368 ecore_x_ext = Extension("efl.ecore_x",
363 ["efl/ecore_x/efl.ecore_x" + module_suffix], 369 ["efl/ecore_x/efl.ecore_x" + module_suffix],
364 include_dirs=['include/'], 370 include_dirs=['include/'],
365 extra_compile_args=list(set(ecore_cflags + 371 extra_compile_args=list(set(ecore_cflags +
@@ -374,7 +380,8 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
374 380
375 # === Ethumb === 381 # === Ethumb ===
376 ethumb_cflags, ethumb_libs = pkg_config('Ethumb', 'ethumb', EFL_MIN_VER) 382 ethumb_cflags, ethumb_libs = pkg_config('Ethumb', 'ethumb', EFL_MIN_VER)
377 ethumb_ext = Extension("ethumb", ["efl/ethumb/efl.ethumb" + module_suffix], 383 ethumb_ext = Extension("efl.ethumb",
384 ["efl/ethumb/efl.ethumb" + module_suffix],
378 include_dirs=['include/'], 385 include_dirs=['include/'],
379 extra_compile_args=ethumb_cflags + common_cflags, 386 extra_compile_args=ethumb_cflags + common_cflags,
380 extra_link_args=ethumb_libs + eina_libs) 387 extra_link_args=ethumb_libs + eina_libs)
@@ -383,7 +390,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
383 # === Ethumb Client === 390 # === Ethumb Client ===
384 ethumb_client_cflags, ethumb_client_libs = pkg_config('Ethumb_Client', 391 ethumb_client_cflags, ethumb_client_libs = pkg_config('Ethumb_Client',
385 'ethumb_client', EFL_MIN_VER) 392 'ethumb_client', EFL_MIN_VER)
386 ethumb_client_ext = Extension("ethumb_client", 393 ethumb_client_ext = Extension("efl.ethumb_client",
387 ["efl/ethumb/efl.ethumb_client" + module_suffix], 394 ["efl/ethumb/efl.ethumb_client" + module_suffix],
388 include_dirs=['include/'], 395 include_dirs=['include/'],
389 extra_compile_args=ethumb_client_cflags + 396 extra_compile_args=ethumb_client_cflags +
@@ -393,14 +400,15 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
393 400
394 # === Edje === 401 # === Edje ===
395 edje_cflags, edje_libs = pkg_config('Edje', 'edje', EFL_MIN_VER) 402 edje_cflags, edje_libs = pkg_config('Edje', 'edje', EFL_MIN_VER)
396 edje_ext = Extension("edje", ["efl/edje/efl.edje" + module_suffix], 403 edje_ext = Extension("efl.edje",
404 ["efl/edje/efl.edje" + module_suffix],
397 include_dirs=['include/'], 405 include_dirs=['include/'],
398 extra_compile_args=edje_cflags + common_cflags, 406 extra_compile_args=edje_cflags + common_cflags,
399 extra_link_args=edje_libs + eina_libs + evas_libs) 407 extra_link_args=edje_libs + eina_libs + evas_libs)
400 ext_modules.append(edje_ext) 408 ext_modules.append(edje_ext)
401 409
402 # === Edje_Edit === 410 # === Edje_Edit ===
403 edje_edit_ext = Extension("edje_edit", 411 edje_edit_ext = Extension("efl.edje_edit",
404 ["efl/edje_edit/efl.edje_edit" + module_suffix], 412 ["efl/edje_edit/efl.edje_edit" + module_suffix],
405 define_macros=[('EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT', None)], 413 define_macros=[('EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT', None)],
406 include_dirs=['include/'], 414 include_dirs=['include/'],
@@ -410,7 +418,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
410 418
411 # === Emotion === 419 # === Emotion ===
412 emotion_cflags, emotion_libs = pkg_config('Emotion', 'emotion', EFL_MIN_VER) 420 emotion_cflags, emotion_libs = pkg_config('Emotion', 'emotion', EFL_MIN_VER)
413 emotion_ext = Extension("emotion", 421 emotion_ext = Extension("efl.emotion",
414 ["efl/emotion/efl.emotion" + module_suffix], 422 ["efl/emotion/efl.emotion" + module_suffix],
415 include_dirs=['include/'], 423 include_dirs=['include/'],
416 extra_compile_args=emotion_cflags + common_cflags, 424 extra_compile_args=emotion_cflags + common_cflags,
@@ -419,9 +427,9 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
419 427
420 # === dbus mainloop integration === 428 # === dbus mainloop integration ===
421 dbus_cflags, dbus_libs = pkg_config('DBus', 'dbus-python', "0.83.0") 429 dbus_cflags, dbus_libs = pkg_config('DBus', 'dbus-python', "0.83.0")
422 dbus_ml_ext = Extension("dbus_mainloop", 430 dbus_ml_ext = Extension("efl.dbus_mainloop",
423 ["efl/dbus_mainloop/dbus_mainloop" + module_suffix, 431 ["efl/dbus_mainloop/efl.dbus_mainloop" + module_suffix,
424 "efl/dbus_mainloop/e_dbus.c"], 432 "efl/dbus_mainloop/e_dbus.c"],
425 extra_compile_args=list(set(dbus_cflags + 433 extra_compile_args=list(set(dbus_cflags +
426 ecore_cflags + 434 ecore_cflags +
427 common_cflags)), 435 common_cflags)),
@@ -430,7 +438,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
430 438
431 # === Elementary === 439 # === Elementary ===
432 elm_cflags, elm_libs = pkg_config('Elementary', 'elementary', ELM_MIN_VER) 440 elm_cflags, elm_libs = pkg_config('Elementary', 'elementary', ELM_MIN_VER)
433 e = Extension("elementary.__init__", 441 e = Extension("efl.elementary.__init__",
434 ["efl/elementary/__init__" + module_suffix], 442 ["efl/elementary/__init__" + module_suffix],
435 define_macros=[ 443 define_macros=[
436 ('EFL_BETA_API_SUPPORT', 1), 444 ('EFL_BETA_API_SUPPORT', 1),
@@ -500,7 +508,6 @@ setup(
500 }, 508 },
501 }, 509 },
502 packages=packages, 510 packages=packages,
503 ext_package="efl",
504 ext_modules=ext_modules, 511 ext_modules=ext_modules,
505 py_modules=py_modules, 512 py_modules=py_modules,
506) 513)