MonetDB: default - Merge with Feb2013 branch.

[Sjoerd Mullender]

Changeset: 92def7342027 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=92def7342027
Modified Files:
        buildtools/autogen/autogen/msc.py
        testing/Mtest.py.in
Branch: default
Log Message:

Merge with Feb2013 branch.


diffs (25 lines):

diff --git a/buildtools/autogen/autogen/msc.py 
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -1027,7 +1027,7 @@ def msc_python_generic(fd, var, python, 
         fd.write('\t$(INSTALL) "$(srcdir)\\README.rst" "README.rst"\n')
         msc['INSTALL'][f] = f, '', '', '', ''
         fd.write('install_%s:\n' % f)
-        fd.write('\t$(%s) %s install --prefix "$(prefix)"\n' % (PYTHON, f))
+        fd.write('\t$(%s) %s install --prefix "$(prefix)" --install-lib 
"$(prefix)\\lib\\%s\n' % (PYTHON, f, PYTHON.lower()))
 
 def msc_python2(fd, var, python, msc):
     msc_python_generic(fd, var, python, msc, 'PYTHON2')
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1149,6 +1149,9 @@ def PerformDir(env, testdir, testlist, B
     os.environ['PYTHON2PATH'] = _configure(os.path.join('@QXprefix@', 
'@PYTHON2_LIBDIR@'))
     os.environ['PYTHON3']   = '@PYTHON3@'
     os.environ['PYTHON3PATH'] = _configure(os.path.join('@QXprefix@', 
'@PYTHON3_LIBDIR@'))
+    if os.name == 'nt':
+        os.environ['PYTHON2PATH'] += os.path.pathsep + 
_configure(os.path.join('@QXprefix@', 'lib', 'python2'))
+        os.environ['PYTHON3PATH'] += os.path.pathsep + 
_configure(os.path.join('@QXprefix@', 'lib', 'python3'))
 
     #STDERR.flush()
     #for v in 'RELSRCDIR':
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list