|
 |
60a93f6 |
diff -up xmms2-0.5DrLecter/wscript.versionsanity xmms2-0.5DrLecter/wscript
|
|
|
60a93f6 |
--- xmms2-0.5DrLecter/wscript.versionsanity 2008-12-10 15:22:56.000000000 -0500
|
|
|
60a93f6 |
+++ xmms2-0.5DrLecter/wscript 2008-12-10 15:27:09.000000000 -0500
|
|
|
60a93f6 |
@@ -23,7 +23,7 @@ import Object
|
|
|
60a93f6 |
import Utils
|
|
|
60a93f6 |
import Common
|
|
|
60a93f6 |
|
|
|
60a93f6 |
-BASEVERSION="0.5 DrLecter"
|
|
|
60a93f6 |
+BASEVERSION="0.5"
|
|
|
60a93f6 |
APPNAME='xmms2'
|
|
|
60a93f6 |
|
|
|
60a93f6 |
srcdir='.'
|
|
|
60a93f6 |
@@ -252,14 +252,15 @@ def configure(conf):
|
|
|
60a93f6 |
|
|
|
60a93f6 |
nam,changed = gittools.get_info()
|
|
|
60a93f6 |
conf.check_message("git commit id", "", True, nam)
|
|
|
60a93f6 |
- if Params.g_options.customversion:
|
|
|
60a93f6 |
- conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Params.g_options.customversion)
|
|
|
60a93f6 |
- else:
|
|
|
60a93f6 |
- dirty=""
|
|
|
60a93f6 |
- if changed:
|
|
|
60a93f6 |
- dirty="-dirty"
|
|
|
60a93f6 |
- conf.check_message("uncommitted changes", "", bool(changed))
|
|
|
60a93f6 |
- conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty)
|
|
|
60a93f6 |
+ ## if Params.g_options.customversion:
|
|
|
60a93f6 |
+ ## conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Params.g_options.customversion)
|
|
|
60a93f6 |
+ ## else:
|
|
|
60a93f6 |
+ ## dirty=""
|
|
|
60a93f6 |
+ ## if changed:
|
|
|
60a93f6 |
+ ## dirty="-dirty"
|
|
|
60a93f6 |
+ ## conf.check_message("uncommitted changes", "", bool(changed))
|
|
|
60a93f6 |
+ ## conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty)
|
|
|
60a93f6 |
+ conf.env["VERSION"] = BASEVERSION
|
|
|
60a93f6 |
|
|
|
60a93f6 |
## conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0']
|
|
|
60a93f6 |
## conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0']
|