summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Andreoli <dave@gurumeditation.it>2016-04-11 21:50:18 +0200
committerDave Andreoli <dave@gurumeditation.it>2016-04-11 21:50:18 +0200
commitab0175925219d5365d0ed185883a1f2abe11b9cb (patch)
treea74ed41da0133b8bcd24b29d8c891cadfb3f5348
parent073eeedaeeaadbe7341cbc67f68c3922947697b8 (diff)
small cleanups
-rw-r--r--Makefile3
-rw-r--r--pyolian/generator.py14
-rwxr-xr-xsetup.py6
3 files changed, 16 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index e395fcf..2c41d4a 100644
--- a/Makefile
+++ b/Makefile
@@ -41,8 +41,7 @@ test:
41 41
42.PHONY: clean 42.PHONY: clean
43clean: 43clean:
44 $(PY) setup.py clean --all 44 $(PY) setup.py clean
45 rm -rfv build/ dist/ *.egg-info
46 45
47 46
48.PHONY: dist 47.PHONY: dist
diff --git a/pyolian/generator.py b/pyolian/generator.py
index 67018f6..bdf4cf9 100644
--- a/pyolian/generator.py
+++ b/pyolian/generator.py
@@ -22,6 +22,13 @@ def uncapitalize(s):
22 return s[0].lower() + s[1:] 22 return s[0].lower() + s[1:]
23 23
24 24
25### Files to be generated ###
26
27EO_FILES = [
28('ecore_mainloop.eo', 'ecore'),
29('ecore_timer.eo', 'ecore'),
30]
31
25### Templates ### 32### Templates ###
26 33
27COPYRIGHT = """{0} PYOLIAN AUTOGENERATED FILE (never change this line) 34COPYRIGHT = """{0} PYOLIAN AUTOGENERATED FILE (never change this line)
@@ -140,7 +147,6 @@ MANUAL_EXCLUDES = [
140# 'evas_obj_map_get', # const Evas_Map * 147# 'evas_obj_map_get', # const Evas_Map *
141] 148]
142 149
143
144class Generator(object): 150class Generator(object):
145 def __init__(self, main_py_path, headers_path, verbose=False): 151 def __init__(self, main_py_path, headers_path, verbose=False):
146 global be_verbose 152 global be_verbose
@@ -167,8 +173,10 @@ class Generator(object):
167 ERR('Failed to parse EOT files') 173 ERR('Failed to parse EOT files')
168 return False 174 return False
169 175
170 ret = self.generate_eo_file('ecore_mainloop.eo', 'ecore') 176 for eo_file, dest_module in EO_FILES:
171 ret = self.generate_eo_file('ecore_timer.eo', 'ecore') 177 ret = self.generate_eo_file(eo_file, dest_module)
178 # ret = self.generate_eo_file('ecore_mainloop.eo', 'ecore')
179 # ret = self.generate_eo_file('ecore_timer.eo', 'ecore')
172 # ret = self.generate_eo_file('efl_gfx_base.eo', 'gfx') # should be efl/gfx 180 # ret = self.generate_eo_file('efl_gfx_base.eo', 'gfx') # should be efl/gfx
173 # ret = self.generate_eo_file('evas_object.eo', 'evas') 181 # ret = self.generate_eo_file('evas_object.eo', 'evas')
174 # ret = self.generate_eo_file('elm_widget.eo', 'elm') 182 # ret = self.generate_eo_file('elm_widget.eo', 'elm')
diff --git a/setup.py b/setup.py
index 00ee20b..a04481c 100755
--- a/setup.py
+++ b/setup.py
@@ -4,14 +4,14 @@
4# Usage: 4# Usage:
5# ====== 5# ======
6# 6#
7# clean: remove ALL generated and compiled files
8#
9# generate: write the source files using eolian ('-v' for verbose) 7# generate: write the source files using eolian ('-v' for verbose)
10# 8#
11# build: build the generated code 9# build: build the generated code
12# 10#
13# install: install the bindings in the system 11# install: install the bindings in the system
14# 12#
13# clean: aggressive clean: remove ALL generated and compiled files
14#
15# Additionaly you can always use the '--skip-gen' option to disable 15# Additionaly you can always use the '--skip-gen' option to disable
16# the pyolian generation 16# the pyolian generation
17# 17#
@@ -103,6 +103,8 @@ elif set(('generate', 'build', 'install', 'doc', 'bdist', 'sdist')) & set(sys.ar
103 exit(0) 103 exit(0)
104 104
105 105
106# === Here start the normal setup, that works on generated files ===
107
106from efl2 import __version__, __version_info__ 108from efl2 import __version__, __version_info__
107 109
108setup( 110setup(