Mercurial > gub

changeset 2453:90e0d388dbf4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
set-installer-version updates.
author hanwen <hanwen@lilypond.org>
date Mon, 23 Oct 2006 18:58:29 +0100
parents 19511e8ce515
children 9e6cba58eb93
files test-lily/set-installer-version.py
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/test-lily/set-installer-version.py	Mon Oct 23 18:54:40 2006 +0100
+++ b/test-lily/set-installer-version.py	Mon Oct 23 18:58:29 2006 +0100
@@ -29,8 +29,10 @@
 
     
 def get_cvs_version (dir):
-    print 'getting version from cvs .. '
-    d = misc.grok_sh_variables (dir + '/VERSION')
+    f =dir + '/VERSION'
+    print 'getting version from cvs .. ' , f
+    
+    d = misc.grok_sh_variables (f)
     return '%(MAJOR_VERSION)s.%(MINOR_VERSION)s.%(PATCH_LEVEL)s' % d
     
 def get_git_version (dir, branch):
@@ -66,7 +68,7 @@
         # git:
 
         version = get_git_version (a, o.branch)
-    elif os.path.isdir (a + '/' + o.branch):
+    elif os.path.isdir (a + '/' + o.branch + '/CVS'):
         version = get_cvs_version (a + '/' + o.branch)
 
     if version:
@@ -74,5 +76,7 @@
 
 if not version:
     version = '0.0.0'
-    
+
+
+print 'found version', version
 open (o.output, 'w').write (version)