davemds pushed a commit to branch master.
http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=abbccd84aa8dde9cede4e8dbaf2b77a199860158
commit abbccd84aa8dde9cede4e8dbaf2b77a199860158
Author: Dave Andreoli <d...@gurumeditation.it>
Date: Mon Feb 16 22:30:58 2015 +0100
Correct commit count
The current method of counting commits give a wrong number. This lets git
do the counting.
patch by Doug Newgard slightly modified by me
---
setup.py | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/setup.py b/setup.py
index fa0c744..60f73ea 100755
--- a/setup.py
+++ b/setup.py
@@ -26,18 +26,14 @@ ELM_MIN_VER = RELEASE
# Add git commit count for dev builds
if vers[2] == 99:
try:
- call = subprocess.Popen(["git", "log", "--oneline"],
+ call = subprocess.Popen(["git", "rev-list", "--count", "HEAD"],
stdout=subprocess.PIPE)
out, err = call.communicate()
+ count = out.decode("utf-8").strip()
+ RELEASE += "a" + count
except Exception:
RELEASE += "a0"
- else:
- log = out.decode("utf-8").strip()
- if log:
- ver = log.count("\n")
- RELEASE += "a" + str(ver)
- else:
- RELEASE += "a0"
+
# XXX: Force default visibility. See phab T504
if os.getenv("CFLAGS") is not None and "-fvisibility=" in os.environ["CFLAGS"]:
@@ -204,6 +200,7 @@ py_modules = []
packages = ["efl"]
if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
+ sys.stdout.write("Python-EFL: %s\n" % RELEASE)
# === Python ===
sys.stdout.write("Checking for Python: ")
--
