|
 |
a2c634e |
diff -up xmms2-0.8DrO_o/wscript.versionsanity xmms2-0.8DrO_o/wscript
|
|
|
a2c634e |
--- xmms2-0.8DrO_o/wscript.versionsanity 2011-12-05 15:19:56.000000000 -0500
|
|
|
a2c634e |
+++ xmms2-0.8DrO_o/wscript 2011-12-05 15:22:01.885508715 -0500
|
|
|
a2c634e |
@@ -19,7 +19,7 @@ from waflib import Configure, Options, U
|
|
|
a2c634e |
from waftools.compiler_flags import compiler_flags
|
|
|
a2c634e |
from waftools import gittools
|
|
|
a2c634e |
|
|
|
a2c634e |
-BASEVERSION="0.8 DrO_o"
|
|
|
a2c634e |
+BASEVERSION="0.8"
|
|
|
a2c634e |
APPNAME='xmms2'
|
|
|
a2c634e |
|
|
|
a2c634e |
top = '.'
|
|
|
a2c634e |
@@ -288,12 +288,13 @@ def configure(conf):
|
|
|
a2c634e |
|
|
|
a2c634e |
nam,changed = gittools.get_info()
|
|
|
a2c634e |
conf.msg("git commit id", nam)
|
|
|
a2c634e |
- if conf.options.customversion:
|
|
|
a2c634e |
- conf.env.VERSION = "%s (%s + %s)" % (BASEVERSION, nam, conf.options.customversion)
|
|
|
a2c634e |
- else:
|
|
|
a2c634e |
- dirty = changed and "-dirty" or ""
|
|
|
a2c634e |
- conf.msg("uncommited changed", changed and "yes" or "no")
|
|
|
a2c634e |
- conf.env.VERSION = "%s (git commit: %s%s)" % (BASEVERSION, nam, dirty)
|
|
|
a2c634e |
+ ## if conf.options.customversion:
|
|
|
a2c634e |
+ ## conf.env.VERSION = "%s (%s + %s)" % (BASEVERSION, nam, conf.options.customversion)
|
|
|
a2c634e |
+ ## else:
|
|
|
a2c634e |
+ ## dirty = changed and "-dirty" or ""
|
|
|
a2c634e |
+ ## conf.msg("uncommited changed", changed and "yes" or "no")
|
|
|
a2c634e |
+ ## conf.env.VERSION = "%s (git commit: %s%s)" % (BASEVERSION, nam, dirty)
|
|
|
a2c634e |
+ conf.env.VERSION = "%s" % (BASEVERSION)
|
|
|
a2c634e |
|
|
|
a2c634e |
## conf.env.append_unique('CFLAGS', ['-g', '-O0'])
|
|
|
a2c634e |
## conf.env.append_unique('CXXFLAGS', ['-g', '-O0'])
|