Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29765/MonetDB/src/testing
Modified Files:
MkillUsers.in Mtest.py.in
Log Message:
Summary:
--------
Separated MonetDB-releated Java code from "MonetDB Clients"
clients/src/java
into its own "MonetDB Java" CVS module
java
(For time being?) "MonetDB Java" compiles just like the remaining
MonetDB-related code, and required buildtools only when compiled from CVS
source.
"MonetDB Java" does not require an other MonetDB package.
No other MonetDB package requires "MonetDB Java".
Hence, "MonetDB Java" cn be built independently of the other MonetDB
packages.
Details & Background:
---------------------
To allow implementation of versioning-, packaging-, & release-schemes for
MonetDB's Java/JDBC Support & Interface that are decoupled from the
respective schemes used for the (mainly C-based) remainder of the MonetDB
product family,
I implemented a move of the code from "clients/src/java/" into "java/", a
new separate CVS module for "MonetDB Java".
(For now?) it comes with all the infrastructure of the usual MonetDB
building process (stripped-down, though, to the limited requirements),
including `./bootstrap`, `configure`, `make`, `make check`, `sh RunMtest`,
`make dist`, `make rpm`, `make install`, & .`Mtest.py -rq`.
Version number maintenance within "java/" is done exclusively by
java/version.sh, no vertoo involved, here.
To build. the new "MonetDB Java" requires only the buildtools (and that only
when building straight from CVS).
To run `make check` and/or `Mtest.py -rq`, Mtest.py from MonetDB Common must
be available in the PATH, though.
sql and pathfinder now check for the availability of MonetDB Java before
running their Java/JDBC tests.
On the live web site, the related Current-TestWeb pages have been updated.
Updating the build documentation in the development web site still has to be
done.
Caveat:
-------
`make rpm` requesting "noarch" does not work, yet.
Index: Mtest.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -d -r1.323 -r1.324
--- Mtest.py.in 21 Nov 2007 14:45:28 -0000 1.323
+++ Mtest.py.in 28 Nov 2007 16:23:59 -0000 1.324
@@ -102,17 +102,6 @@
import distutils.sysconfig
p =
_configure(os.path.join('@QXprefix@',distutils.sysconfig.get_python_lib(1,0,"")))
sys.path.insert(0, p)
- try:
- q = GetConfig('monetdb-config', '--pythonlibdir')
- p = p + os.pathsep + q
- except:
- None
- try:
- q = GetConfig('monetdb-clients-config', '--pythonlibdir')
- p = p + os.pathsep + q
- p = p + os.pathsep + q + os.sep + 'MonetDB'
- except:
- None
from MonetDB import monet_options
if os.environ.has_key('PYTHONPATH'):
p = p + os.pathsep + os.environ['PYTHONPATH']
@@ -161,10 +150,11 @@
'PROFILING' : "@PROFILING_FALSE@",
# SQL:
'NATIVE_WIN32' : "@NATIVE_WIN32_FALSE@",
- # unknown at compile time, as Mtest.py is compiled with MonetDB(4);
+ # unknown at compile time, as Mtest.py is compiled with MonetDB;
# hence, we set them at runtime in main() below
'HAVE_MONETDB5' : "@HAVE_MONETDB5_FALSE@",
'HAVE_MONETDB4' : "@HAVE_MONETDB4_FALSE@",
+ 'HAVE_MONETDB_JAVA': "@HAVE_MONETDB_JAVA_FALSE@",
}
# a bunch of classes to help with generating (X)HTML files
@@ -1507,7 +1497,7 @@
ErrMsg("test missing:
'"+os.path.join(TSTSRCDIR,TST)+"[.py|.mal|.malC|.milS|.milC|.sql|.xq|.x100]`")
return TX,Failed,Failed,elem
- if par['PACKAGE'] not in ('monetdb', 'monetdb-clients'):
+ if par['PACKAGE'] not in ('monetdb', 'monetdb-java', 'monetdb-clients'):
MissingMods = CheckMods(env, TST, SERVER, CALL)
MissingBATs = CheckBATs(env, TST, TSTDB)
else:
@@ -2703,6 +2693,7 @@
URLSUFFIX_D = ''
_PackageDict = {
+ 'java': 'monetdb-java',
'clients': 'monetdb-clients',
'template': 'monetdb-template',
'sql': 'monetdb-sql',
@@ -2728,7 +2719,7 @@
repo = _PackageDict[repo]
par['PACKAGE'] = repo
if not CheckExec(par['PACKAGE']+'-config'):
- if par['PACKAGE'] in ('monetdb', 'monetdb-clients', 'monetdb4',
'monetdb5'):
+ if par['PACKAGE'] in ('monetdb', 'monetdb-java', 'monetdb-clients',
'monetdb4', 'monetdb5'):
ErrXit('Could not find "%s-config" in your $PATH:\n%s' %
(par['PACKAGE'],os.environ['PATH']))
else:
Warn('Could not find "%s-config" in your $PATH:\n%s' %
(par['PACKAGE'],os.environ['PATH']))
@@ -2809,7 +2800,7 @@
cmd_options = [
# long name, short name, GDK option, argument, comment
('package', 'p', 'package', '<package>',
- "package to be tested, e.g.:\nmonetdb(|4|5),
[monetdb-](clients|template|sql|xquery|xml|amdb|geom|datacell);\ndefault: %s" %
par['PACKAGE']),
+ "package to be tested, e.g.:\nmonetdb(|4|5),
[monetdb-](java|clients|template|sql|xquery|xml|amdb|geom|datacell);\ndefault:
%s" % par['PACKAGE']),
('MonetDB4', '4', 'MonetDB4', None,
"use Mserver of MonetDB Version 4 (default with <package> not in
{monetdb5, monetdb-datacell})"),
('MonetDB5', '5', 'MonetDB5', None,
@@ -2923,7 +2914,7 @@
pkg = _PackageDict[pkg]
par['PACKAGE'] = pkg
if not CheckExec(par['PACKAGE']+'-config'):
- if par['PACKAGE'] in ('monetdb', 'monetdb-clients', 'monetdb4',
'monetdb5'):
+ if par['PACKAGE'] in ('monetdb', 'monetdb-java', 'monetdb-clients',
'monetdb4', 'monetdb5'):
ErrXit('Could not find "%s-config" in your $PATH:\n%s' %
(par['PACKAGE'],os.environ['PATH']))
else:
Warn('Could not find "%s-config" in your $PATH:\n%s' %
(par['PACKAGE'],os.environ['PATH']))
@@ -2944,7 +2935,7 @@
par['M5'] = par['PACKAGE'] in ['monetdb5', 'monetdb-datacell']
config = opts.get('config')
- if config is None and par['PACKAGE'] not in ('monetdb', 'monetdb-clients'):
+ if config is None and par['PACKAGE'] not in ('monetdb', 'monetdb-java',
'monetdb-clients'):
# no --config given on the command line; we assume the M4/M5 default
# and have monet_options.parse_options() re-parse the command line
arguments
if par['M5']:
@@ -3017,7 +3008,7 @@
STDOUT.flush()
#env['par'] = par
- # unknown at compile time, as Mtest.py is compiled with MonetDB(4);
+ # unknown at compile time, as Mtest.py is compiled with MonetDB;
# hence, we set then at runtime.
# X == true => @[EMAIL PROTECTED]'', @[EMAIL PROTECTED]'#'
# X == false => @[EMAIL PROTECTED]'#', @[EMAIL PROTECTED]''
@@ -3027,6 +3018,10 @@
else:
CONDITIONALS['HAVE_MONETDB5'] = ''
CONDITIONALS['HAVE_MONETDB4'] = '#'
+ if CheckExec('monetdb-java-config'):
+ CONDITIONALS['HAVE_MONETDB_JAVA'] = '#'
+ else:
+ CONDITIONALS['HAVE_MONETDB_JAVA'] = ''
#if env.has_key('MONETDB_PREFIX'):
#bp = os.path.join(env['MONETDB_PREFIX'],"bin")
@@ -3375,7 +3370,7 @@
else:
QUIT = 'quit();\n'
- if par['PACKAGE'] not in ('monetdb', 'monetdb-clients'):
+ if par['PACKAGE'] not in ('monetdb', 'monetdb-java',
'monetdb-clients'):
if Check('%s --dbname=%s' % (env['exe']['Mserver'][1], TSTPREF),
QUIT):
sys.exit(1)
if GetBitsAndOIDsAndModsAndStatic(env):
Index: MkillUsers.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/MkillUsers.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- MkillUsers.in 15 Nov 2007 18:37:08 -0000 1.32
+++ MkillUsers.in 28 Nov 2007 16:23:59 -0000 1.33
@@ -62,6 +62,7 @@
fi
BINPATH="$THISPATH"
+if [ "$MONETDB_JAVA_PREFIX" ] ; then BINPATH="$BINPATH
$MONETDB_JAVA_PREFIX/bin" ; fi
if [ "$CLIENTS_PREFIX" ] ; then BINPATH="$BINPATH $CLIENTS_PREFIX/bin" ;
fi
if [ "$MONETDB_PREFIX" ] ; then BINPATH="$BINPATH $MONETDB_PREFIX/bin" ;
fi
if [ "$MONETDB4_PREFIX" ] ; then BINPATH="$BINPATH $MONETDB4_PREFIX/bin" ;
fi
@@ -78,7 +79,8 @@
if [ "$TEMPLATE_PREFIX" ] ; then BINPATH="$BINPATH $TEMPLATE_PREFIX/bin" ;
fi
if [ "$PATHFINDER_PREFIX" ] ; then BINPATH="$BINPATH $PATHFINDER_PREFIX/bin" ;
fi
if [ "$DATACELL_PREFIX" ] ; then BINPATH="$BINPATH $DATACELL_PREFIX/bin" ;
fi
-if [ "$CLIENTS_BUILD" ] ; then BINPATH="$BINPATH
$CLIENTS_BUILD/src/mapiclient $CLIENTS_BUILD/src/mapiclient/.libs
$CLIENTS_BUILD/src/python $CLIENTS_BUILD/src/java/scripts" ; fi
+if [ "$MONETDB_JAVA_BUILD" ] ; then BINPATH="$BINPATH
$MONETDB_JAVA_BUILD/scripts" ; fi
+if [ "$CLIENTS_BUILD" ] ; then BINPATH="$BINPATH
$CLIENTS_BUILD/src/mapiclient $CLIENTS_BUILD/src/mapiclient/.libs
$CLIENTS_BUILD/src/python" ; fi
if [ "$MONETDB_BUILD" ] ; then BINPATH="$BINPATH
$MONETDB_BUILD/src/tools $MONETDB_BUILD/src/tools/.libs" ; fi
if [ "$MONETDB4_BUILD" ] ; then BINPATH="$BINPATH
$MONETDB4_BUILD/src/tools $MONETDB4_BUILD/src/tools/.libs" ; fi
if [ "$MONETDB5_BUILD" ] ; then BINPATH="$BINPATH
$MONETDB5_BUILD/src/tools $MONETDB5_BUILD/src/tools/.libs" ; fi
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
