Update of /cvsroot/monetdb/MonetDB/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13991/MonetDB/conf
Modified Files:
configure.py
Log Message:
Make sure that the MonetDB/XQuery administrative console show the version of
MonetDB4
that MonetDB/XQUery was actually built with, not the one that is minimally
required.
The latter was "hard-wired" in the pathfinder sources and maintained via vertoo.
The former is (now) detected and handled by configure at compile time.
Configure-replacement on Windows (MonetDB/conf/configure.py) has been extended
accordingly.
Index: configure.py
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/conf/configure.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.py 26 Apr 2007 10:32:26 -0000 1.3
+++ configure.py 7 Sep 2007 16:43:45 -0000 1.4
@@ -42,11 +42,29 @@
("@NOT_WIN32_FALSE@", ''),
("@PATHSEP@", ';')]
+packages = {
+ 'MONETDB': 'monetdb',
+ 'CLIENTS': 'monetdb-clients',
+ 'MONETDB4': 'monetdb4',
+ 'MONETDB5': 'monetdb5',
+}
+
while len(sys.argv) > 2 and '=' in sys.argv[1]:
arg = sys.argv[1]
i = arg.find('=')
subs.append(('@'+arg[:i]+'@', arg[i+1:]))
del sys.argv[1]
+ if arg[i-7:i] == '_PREFIX' and packages.has_key(arg[:i-7]):
+ config = os.path.join(arg[i+1:], 'bin', packages[arg[:i-7]])
+ try:
+ p = os.popen('"%s-config.bat" --version' % config, 'r')
+ val = p.read().strip()
+ if val:
+ key = '@%s_VERSION@' % arg[:i-7]
+ subs.append((key, val))
+ p.close()
+ except:
+ pass
for key, val in subs[:]:
subs.insert(0, ('@X'+key[1:], val))
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
