|
 |
f5e49dd |
diff -up xmms2-0.6DrMattDestruction/wscript.versionsanity xmms2-0.6DrMattDestruction/wscript
|
|
|
f5e49dd |
--- xmms2-0.6DrMattDestruction/wscript.versionsanity 2009-08-11 14:00:44.013247917 -0400
|
|
|
f5e49dd |
+++ xmms2-0.6DrMattDestruction/wscript 2009-08-11 14:01:48.446370522 -0400
|
|
|
f5e49dd |
@@ -23,7 +23,7 @@ import Build
|
|
|
f5e49dd |
import Configure
|
|
|
f5e49dd |
from logging import fatal, warning
|
|
|
f5e49dd |
|
|
|
f5e49dd |
-BASEVERSION="0.6 DrMattDestruction"
|
|
|
f5e49dd |
+BASEVERSION="0.6"
|
|
|
f5e49dd |
APPNAME='xmms2'
|
|
|
f5e49dd |
|
|
|
f5e49dd |
srcdir='.'
|
|
|
f5e49dd |
@@ -269,14 +269,15 @@ def configure(conf):
|
|
|
f5e49dd |
|
|
|
f5e49dd |
nam,changed = gittools.get_info()
|
|
|
f5e49dd |
conf.check_message("git commit id", "", True, nam)
|
|
|
f5e49dd |
- if Options.options.customversion:
|
|
|
f5e49dd |
- conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Options.options.customversion)
|
|
|
f5e49dd |
- else:
|
|
|
f5e49dd |
- dirty=""
|
|
|
f5e49dd |
- if changed:
|
|
|
f5e49dd |
- dirty="-dirty"
|
|
|
f5e49dd |
- conf.check_message("uncommitted changes", "", bool(changed))
|
|
|
f5e49dd |
- conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty)
|
|
|
f5e49dd |
+ ## if Options.options.customversion:
|
|
|
f5e49dd |
+ ## conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Options.options.customversion)
|
|
|
f5e49dd |
+ ## else:
|
|
|
f5e49dd |
+ ## dirty=""
|
|
|
f5e49dd |
+ ## if changed:
|
|
|
f5e49dd |
+ ## dirty="-dirty"
|
|
|
f5e49dd |
+ ## conf.check_message("uncommitted changes", "", bool(changed))
|
|
|
f5e49dd |
+ ## conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty)
|
|
|
f5e49dd |
+ conf.env["VERSION"] = BASEVERSION
|
|
|
f5e49dd |
|
|
|
f5e49dd |
## conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0']
|
|
|
f5e49dd |
## conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0']
|