Update of /cvsroot/monetdb/MonetDB/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2142/conf

Modified Files:
      Tag: GDK-2
        configure.py 
Log Message:
propagated changes of Thursday Sep 06 2007 - Monday Sep 10 2007
from the development trunk to the GDK-2 branch


Index: configure.py
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/conf/configure.py,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -d -r1.3 -r1.3.4.1
--- configure.py        26 Apr 2007 10:32:26 -0000      1.3
+++ configure.py        10 Sep 2007 14:21:57 -0000      1.3.4.1
@@ -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: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to