summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--efl/__init__.py4
-rwxr-xr-xsetup.py20
2 files changed, 14 insertions, 10 deletions
diff --git a/efl/__init__.py b/efl/__init__.py
index 5fc98c8..6db8b76 100644
--- a/efl/__init__.py
+++ b/efl/__init__.py
@@ -1 +1,3 @@
1import efl.utils.logger 1
2__version__ = "1.10.99"
3__version_info__ = ( 1, 10, 99 )
diff --git a/setup.py b/setup.py
index dee9e17..2e48c24 100755
--- a/setup.py
+++ b/setup.py
@@ -7,16 +7,23 @@ import subprocess
7from distutils.core import setup, Command 7from distutils.core import setup, Command
8from distutils.extension import Extension 8from distutils.extension import Extension
9from distutils.version import StrictVersion, LooseVersion 9from distutils.version import StrictVersion, LooseVersion
10from efl import __version_info__ as vers
10 11
11script_path = os.path.dirname(os.path.abspath(__file__)) 12script_path = os.path.dirname(os.path.abspath(__file__))
12 13
13 14
14# python-efl version 15# python-efl version (change in efl/__init__.py)
15VERSION = "1.11" 16RELEASE = "%d.%d.%d" % (vers[0], vers[1], vers[2])
16RELEASE = "1.10.99" 17VERSION = "%d.%d" % (vers[0], vers[1] if vers[2] < 99 else vers[1] + 1)
18
19# dependencies
20CYTHON_MIN_VERSION = "0.19"
21EFL_MIN_VERSION = RELEASE
22ELM_MIN_VERSION = RELEASE
23
17 24
18# Add git commit count for dev builds 25# Add git commit count for dev builds
19if RELEASE.split(".")[2] == "99": 26if vers[2] >= 99:
20 call = subprocess.Popen( 27 call = subprocess.Popen(
21 ["git", "log", "--oneline"], stdout=subprocess.PIPE) 28 ["git", "log", "--oneline"], stdout=subprocess.PIPE)
22 out, err = call.communicate() 29 out, err = call.communicate()
@@ -25,11 +32,6 @@ if RELEASE.split(".")[2] == "99":
25 ver = log.count("\n") 32 ver = log.count("\n")
26 RELEASE += "a" + str(ver) 33 RELEASE += "a" + str(ver)
27 34
28# dependencies
29CYTHON_MIN_VERSION = "0.19"
30EFL_MIN_VERSION = "1.10.99"
31ELM_MIN_VERSION = "1.10.99"
32
33 35
34# XXX: Force default visibility. See phab T504 36# XXX: Force default visibility. See phab T504
35if os.getenv("CFLAGS") is not None and "-fvisibility=" in os.environ["CFLAGS"]: 37if os.getenv("CFLAGS") is not None and "-fvisibility=" in os.environ["CFLAGS"]: