Index: wflow-py/mkversion.py =================================================================== diff -u -rd2a85ebb74f0c02869adce5c244488b684f01926 -r8ca1b4bc61b3bc0d9c58451a4685378b663c5034 --- wflow-py/mkversion.py (.../mkversion.py) (revision d2a85ebb74f0c02869adce5c244488b684f01926) +++ wflow-py/mkversion.py (.../mkversion.py) (revision 8ca1b4bc61b3bc0d9c58451a4685378b663c5034) @@ -1,17 +1,18 @@ import os -thisversion = "2015.02.deltashell" -#vers=os.popen('svnversion -n').read().replace(":","-") -vers='deltashell' -# SET THESE +import subprocess +branch = subprocess.check_output('git rev-parse --abbrev-ref HEAD', shell=True).strip() + +vers='beta' + ################################### -manualversion = "2015.02." + vers -manualmainversion = "2015.02" +manualversion = "2015.02." + branch + "." + vers +manualmainversion = "2015.02." + branch ################################### a = open("_version.py","w") -a.write("VERSION=\"" + vers + " " + thisversion + "\"\n") -a.write("MVERSION=\"" + manualversion +"\"\n") +a.write("VERSION=\"" + manualversion + "\"\n") +a.write("MVERSION=\"" + manualmainversion +"\"\n") a.close()