Changeset: 07b56161d308 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=07b56161d308
Modified Files:
NT/winconfig.py
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (76 lines):
diff --git a/NT/winconfig.py b/NT/winconfig.py
--- a/NT/winconfig.py
+++ b/NT/winconfig.py
@@ -31,7 +31,7 @@ subs = [("@exec_prefix@", r'%prefix%'),
("@DIRSEP@", '\\'),
("@PATHSEP@", ';')]
-if len(sys.argv) > 1 and sys.argv[1][-19:] == '\\winconfig_conds.py':
+if len(sys.argv) > 1 and sys.argv[1].endswith(r'\winconfig_conds.py'):
conds = {}
for line in fileinput.input(sys.argv[1]):
exec(line, None, conds)
@@ -50,8 +50,11 @@ while len(sys.argv) > 2 and '=' in sys.a
subs.append(('@SOURCE@',
os.path.abspath(os.path.dirname(os.path.dirname(sys.argv[0])))))
for key, val in subs[:]:
+ # X prefix for execution-time value
subs.insert(0, ('@X'+key[1:], val))
+ # Q prefix for quoted value (i.e. \ needs to be scaped)
subs.insert(0, ('@Q'+key[1:], val.replace('\\', r'\\')))
+ # QX prefix for quoted execution-time value
subs.insert(0, ('@QX'+key[1:], val.replace('\\', r'\\')))
def substitute(line):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -117,7 +117,7 @@ except ImportError:
try:
import MonetDBtesting.process as process
except ImportError:
- p = _configure(os.path.join('@QXprefix@', '@PYTHON2_LIBDIR@'))
+ p = _configure(os.path.join('@QXprefix@', '@QXPYTHON2_LIBDIR@'))
sys.path.insert(0, p)
import MonetDBtesting.process as process
if os.environ.has_key('PYTHONPATH'):
@@ -251,7 +251,7 @@ except ImportError:
try:
from MonetDBtesting import monet_options
except ImportError:
- p = _configure(os.path.join('@QXprefix@', '@PYTHON2_LIBDIR@'))
+ p = _configure(os.path.join('@QXprefix@', '@QXPYTHON2_LIBDIR@'))
sys.path.insert(0, p)
from MonetDBtesting import monet_options
if os.environ.has_key('PYTHONPATH'):
@@ -1161,10 +1161,10 @@ def PerformDir(env, testdir, testlist, B
os.environ['TSTSRCDIR'] = TSTSRCDIR
os.environ['TSTTRGDIR'] = TSTTRGDIR
os.environ['RELSRCDIR'] = env['RELSRCDIR']
- os.environ['PYTHON2'] = '@PYTHON2@'
- os.environ['PYTHON2PATH'] = _configure(os.path.join('@QXprefix@',
'@PYTHON2_LIBDIR@'))
- os.environ['PYTHON3'] = '@PYTHON3@'
- os.environ['PYTHON3PATH'] = _configure(os.path.join('@QXprefix@',
'@PYTHON3_LIBDIR@'))
+ os.environ['PYTHON2'] = '@QXPYTHON2@'
+ os.environ['PYTHON2PATH'] = _configure(os.path.join('@QXprefix@',
'@QXPYTHON2_LIBDIR@'))
+ os.environ['PYTHON3'] = '@QXPYTHON3@'
+ os.environ['PYTHON3PATH'] = _configure(os.path.join('@QXprefix@',
'@QXPYTHON3_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'))
@@ -3745,11 +3745,11 @@ def main(argv) :
#STDOUT.flush()
# inject vars that tell various languages where to find their libs
- env['PERL5LIB'] = _configure(os.path.join('@QXprefix@', '@PERL_LIBDIR@'))
+ env['PERL5LIB'] = _configure(os.path.join('@QXprefix@', '@QXPERL_LIBDIR@'))
# set dynamically for python test lib
-# env['PYTHONPATH'] = _configure(os.path.join('@QXprefix@',
'@PYTHON2_LIBDIR@'))
- env['PHP_INCPATH'] = _configure(os.path.join('@datadir@', 'php'))
- env['BINDIR'] = _configure('@bindir@')
+# env['PYTHONPATH'] = _configure(os.path.join('@QXprefix@',
'@QXPYTHON2_LIBDIR@'))
+ env['PHP_INCPATH'] = _configure(os.path.join('@QXdatadir@', 'php'))
+ env['BINDIR'] = _configure('@QXbindir@')
vars_ = vars_ + ['PERL5LIB', 'PHP_INCPATH', 'BINDIR']
# export and display env
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
