Author: eudoxos
Date: 2009-07-28 00:03:35 +0200 (Tue, 28 Jul 2009)
New Revision: 1891
Modified:
trunk/SConstruct
trunk/yadeSCons.py
Log:
1. Fix unreported version for the debian build
Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct 2009-07-27 19:13:04 UTC (rev 1890)
+++ trunk/SConstruct 2009-07-27 22:03:35 UTC (rev 1891)
@@ -179,10 +179,11 @@
################# BUILD DIRECTORY #########
###########################################
import yadeSCons
-##ALL generated stuff should go here - therefore we must determine it very
early!!
+## ALL generated stuff should go here - therefore we must determine it very
early!!
env['realVersion']=yadeSCons.getRealVersion()
if not env.has_key('version'):
env['version']=env['realVersion']
+if not env['realVersion']: env['realVersion']=env['version']
env['SUFFIX']='-'+env['version']+env['variant']
print "Yade version is `%s', installed files will be suffixed with
`%s'."%(env['version'],env['SUFFIX'])
Modified: trunk/yadeSCons.py
===================================================================
--- trunk/yadeSCons.py 2009-07-27 19:13:04 UTC (rev 1890)
+++ trunk/yadeSCons.py 2009-07-27 22:03:35 UTC (rev 1891)
@@ -12,7 +12,7 @@
for l in os.popen("LC_ALL=C bzr version-info
2>/dev/null").readlines():
m=re.match(r'revno: ([0-9]+)',l)
if m: return 'bzr'+m.group(1)
- return '<unknown>'
+ return None
class Plugin:
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
