CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/04/17 09:53:17
Modified files:
. : SConstruct ChangeLog
Log message:
(test_program): Bugfix for double digit version compares, use
integer (not string-) compare.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/SConstruct.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3445&tr2=1.3446&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3445 lilypond/ChangeLog:1.3446
--- lilypond/ChangeLog:1.3445 Sun Apr 17 09:46:36 2005
+++ lilypond/ChangeLog Sun Apr 17 09:53:17 2005
@@ -1,6 +1,8 @@
2005-04-17 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* SConstruct: Require pkg-config.
+ (test_program): Bugfix for double digit version compares, use
+ integer (not string-) compare.
* stepmake/aclocal.m4 (STEPMAKE_PANGO_FT2): Define HAVE_PANGO16 too.
Index: lilypond/SConstruct
diff -u lilypond/SConstruct:1.70 lilypond/SConstruct:1.71
--- lilypond/SConstruct:1.70 Sun Apr 17 09:46:36 2005
+++ lilypond/SConstruct Sun Apr 17 09:53:17 2005
@@ -235,7 +235,8 @@
def configure (target, source, env):
- vre = re.compile ('^.*[^-.0-9]([0-9][0-9]*\.[0-9][.0-9]*).*$',
re.DOTALL)
+ vre = re.compile ('^.*[^-.0-9]([0-9][0-9]*\.[0-9][.0-9]*).*$',
+ re.DOTALL)
def get_version (program):
command = '(pkg-config --modversion %(program)s || %(program)s
--version || %(program)s -V) 2>&1' % vars ()
pipe = os.popen (command)
@@ -257,7 +258,8 @@
return 0
sys.stdout.write (string.join (actual, '.'))
sys.stdout.write ('\n')
- if actual < string.split (minimal, '.'):
+ if map (string.atoi, actual) \
+ < map (string.atoi, string.split (minimal, '.')):
lst.append ((description, package, minimal, program,
string.join (actual, '.')))
return 0
_______________________________________________
Lilypond-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
