summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorDave Andreoli <dave@gurumeditation.it>2015-01-01 21:38:11 +0100
committerDave Andreoli <dave@gurumeditation.it>2015-01-01 21:38:11 +0100
commitfd1167e8cc8e16a9b63e9bead621cfc417c5f05c (patch)
tree7a29fc4558c98291873c0a4c33e21c64a6e3eda1 /setup.py
parent6fe657d979099a4a6b276dc7e42c510384c66a7f (diff)
setup.py cleanup: use 2 lists for ext_modules and py_modules
Diffstat (limited to 'setup.py')
-rwxr-xr-xsetup.py34
1 files changed, 17 insertions, 17 deletions
diff --git a/setup.py b/setup.py
index 0741e51..b99d1e2 100755
--- a/setup.py
+++ b/setup.py
@@ -188,9 +188,9 @@ class CleanGenerated(Command):
188 os.remove(dbus_ml_path) 188 os.remove(dbus_ml_path)
189 189
190 190
191modules = [] 191ext_modules = []
192py_modules = []
192packages = ["efl"] 193packages = ["efl"]
193#package_dirs = {} # Use this if you put packages in non-root paths
194 194
195if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv): 195if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
196 196
@@ -206,7 +206,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
206 extra_compile_args=eo_cflags, 206 extra_compile_args=eo_cflags,
207 extra_link_args=eo_libs + eina_libs 207 extra_link_args=eo_libs + eina_libs
208 ) 208 )
209 modules.append(eo_ext) 209 ext_modules.append(eo_ext)
210 210
211 # === Utilities === 211 # === Utilities ===
212 utils_ext = [ 212 utils_ext = [
@@ -229,7 +229,8 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
229 extra_link_args=eina_libs, 229 extra_link_args=eina_libs,
230 ), 230 ),
231 ] 231 ]
232 modules += utils_ext 232 ext_modules.extend(utils_ext)
233 py_modules.append("efl.utils.setup")
233 packages.append("efl.utils") 234 packages.append("efl.utils")
234 235
235 # === Evas === 236 # === Evas ===
@@ -240,7 +241,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
240 extra_compile_args=evas_cflags, 241 extra_compile_args=evas_cflags,
241 extra_link_args=evas_libs + eina_libs, 242 extra_link_args=evas_libs + eina_libs,
242 ) 243 )
243 modules.append(evas_ext) 244 ext_modules.append(evas_ext)
244 245
245 # === Ecore === 246 # === Ecore ===
246 ecore_cflags, ecore_libs = pkg_config('Ecore', 'ecore', EFL_MIN_VERSION) 247 ecore_cflags, ecore_libs = pkg_config('Ecore', 'ecore', EFL_MIN_VERSION)
@@ -278,7 +279,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
278 eina_libs + evas_libs, 279 eina_libs + evas_libs,
279 ) 280 )
280 ) 281 )
281 modules += ecore_exts 282 ext_modules.extend(ecore_exts)
282 packages.append("efl.ecore") 283 packages.append("efl.ecore")
283 284
284 # === Ethumb === 285 # === Ethumb ===
@@ -290,7 +291,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
290 extra_compile_args=ethumb_cflags, 291 extra_compile_args=ethumb_cflags,
291 extra_link_args=ethumb_libs + eina_libs, 292 extra_link_args=ethumb_libs + eina_libs,
292 ) 293 )
293 modules.append(ethumb_ext) 294 ext_modules.append(ethumb_ext)
294 295
295 ethumb_client_cflags, ethumb_client_libs = pkg_config( 296 ethumb_client_cflags, ethumb_client_libs = pkg_config(
296 'Ethumb_Client', 'ethumb_client', EFL_MIN_VERSION) 297 'Ethumb_Client', 'ethumb_client', EFL_MIN_VERSION)
@@ -300,7 +301,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
300 extra_compile_args=ethumb_client_cflags, 301 extra_compile_args=ethumb_client_cflags,
301 extra_link_args=ethumb_client_libs + eina_libs, 302 extra_link_args=ethumb_client_libs + eina_libs,
302 ) 303 )
303 modules.append(ethumb_client_ext) 304 ext_modules.append(ethumb_client_ext)
304 305
305 # === Edje === 306 # === Edje ===
306 edje_cflags, edje_libs = pkg_config('Edje', 'edje', EFL_MIN_VERSION) 307 edje_cflags, edje_libs = pkg_config('Edje', 'edje', EFL_MIN_VERSION)
@@ -310,7 +311,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
310 extra_compile_args=edje_cflags, 311 extra_compile_args=edje_cflags,
311 extra_link_args=edje_libs + eina_libs + evas_libs, 312 extra_link_args=edje_libs + eina_libs + evas_libs,
312 ) 313 )
313 modules.append(edje_ext) 314 ext_modules.append(edje_ext)
314 315
315 # --- Edje_Edit --- 316 # --- Edje_Edit ---
316 edje_edit_ext = Extension( 317 edje_edit_ext = Extension(
@@ -320,7 +321,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
320 extra_compile_args=edje_cflags, 321 extra_compile_args=edje_cflags,
321 extra_link_args=edje_libs + eina_libs + evas_libs, 322 extra_link_args=edje_libs + eina_libs + evas_libs,
322 ) 323 )
323 modules.append(edje_edit_ext) 324 ext_modules.append(edje_edit_ext)
324 325
325 # === Emotion === 326 # === Emotion ===
326 emotion_cflags, emotion_libs = pkg_config( 327 emotion_cflags, emotion_libs = pkg_config(
@@ -332,7 +333,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
332 extra_link_args=emotion_libs + 333 extra_link_args=emotion_libs +
333 eina_libs + evas_libs, 334 eina_libs + evas_libs,
334 ) 335 )
335 modules.append(emotion_ext) 336 ext_modules.append(emotion_ext)
336 337
337 # === dbus mainloop integration === 338 # === dbus mainloop integration ===
338 dbus_cflags, dbus_libs = pkg_config('DBus', 'dbus-python', "0.83.0") 339 dbus_cflags, dbus_libs = pkg_config('DBus', 'dbus-python', "0.83.0")
@@ -343,7 +344,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
343 extra_compile_args=list(set(dbus_cflags + ecore_cflags)), 344 extra_compile_args=list(set(dbus_cflags + ecore_cflags)),
344 extra_link_args=dbus_libs + ecore_libs, 345 extra_link_args=dbus_libs + ecore_libs,
345 ) 346 )
346 modules.append(dbus_ml_ext) 347 ext_modules.append(dbus_ml_ext)
347 348
348 # === Elementary === 349 # === Elementary ===
349 elm_mods = ( 350 elm_mods = (
@@ -430,7 +431,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
430 extra_compile_args=elm_cflags + ecore_x_cflags, 431 extra_compile_args=elm_cflags + ecore_x_cflags,
431 extra_link_args=elm_libs + eina_libs + evas_libs, 432 extra_link_args=elm_libs + eina_libs + evas_libs,
432 ) 433 )
433 modules.append(e) 434 ext_modules.append(e)
434 435
435 packages.append("efl.elementary") 436 packages.append("efl.elementary")
436 437
@@ -474,11 +475,10 @@ setup(
474 'release': ('setup.py', RELEASE) 475 'release': ('setup.py', RELEASE)
475 } 476 }
476 }, 477 },
477 #package_dir=package_dirs,
478 packages=packages, 478 packages=packages,
479 ext_package="efl", # The prefix for ext modules/packages 479 ext_package="efl",
480 ext_modules=cythonize( 480 ext_modules=cythonize(
481 modules, 481 ext_modules,
482 include_path=["include"], 482 include_path=["include"],
483 compiler_directives={ 483 compiler_directives={
484 #"c_string_type": "unicode", 484 #"c_string_type": "unicode",
@@ -486,5 +486,5 @@ setup(
486 "embedsignature": True, 486 "embedsignature": True,
487 } 487 }
488 ), 488 ),
489 py_modules=["efl.utils.setup"], 489 py_modules=py_modules,
490) 490)