Update of /cvsroot/monetdb/java/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29765/java/conf
Modified Files:
Makefile.ag monetdb-java-config.bat.in monetdb-java-config.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: monetdb-java-config.in
===================================================================
RCS file: /cvsroot/monetdb/java/conf/monetdb-java-config.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- monetdb-java-config.in 28 Nov 2007 14:54:06 -0000 1.1.1.1
+++ monetdb-java-config.in 28 Nov 2007 16:23:57 -0000 1.2
@@ -17,28 +17,15 @@
# All Rights Reserved.
pkg="@PACKAGE@"
-source="@QCLIENTS_SOURCE@"
-build="@QCLIENTS_BUILD@"
+source="@QMONETDB_JAVA_SOURCE@"
+build="@QMONETDB_JAVA_BUILD@"
prefix="@Qprefix@"
exec_prefix="@Qexec_prefix@"
bindir="@Qbindir@"
-libexecdir="@Qlibexecdir@"
datarootdir="@Qdatarootdir@"
datadir="@Qdatadir@"
-sysconfdir="@Qsysconfdir@"
-localstatedir="@Qlocalstatedir@"
-libdir="@Qlibdir@"
-infodir="@Qinfodir@"
-mandir="@Qmandir@"
-includedir="@Qincludedir@"
-
-pkglibdir="${libdir}/MonetDB"
pkgdatadir="${datadir}/MonetDB"
-pkgincludedir="${includedir}/MonetDB"
-perllibdir="${prefix}/@PERL_LIBDIR@"
-pythonlibdir="${prefix}/@PYTHON_LIBDIR@"
-phpextensiondir="${prefix}/@PHP_EXTENSIONDIR@"
usage()
{
@@ -49,16 +36,12 @@
--build print ${pkg} build directory
--source print ${pkg} source directory
- --libs print ${pkg} library linking information
- --cflags print ${pkg} module pre-processor and compiler flags
--help display this help and exit
--version output version information
Install directories ${pkg} was configured to
- --prefix --exec-prefix --bindir --libexecdir --datarootdir
- --datadir --sysconfdir --localstatedir --libdir --infodir
- --mandir --includedir --pkgdatadir --pkglibdir --pkgincludedir
- --perllibdir --pythonlibdir --phpextensiondir
+ --prefix --exec-prefix --bindir
+ --datarootdir --datadir --pkgdatadir
EOF
@@ -113,23 +96,6 @@
usage 0
;;
- --includes)
- echo \
- -I\${CLIENTS_INCLUDEDIR} \
- -I\${CLIENTS_INCLUDEDIR}/mapilib
- ;;
-
- --cflags)
- echo \
- -I$pkgincludedir \
- -I$pkgincludedir/mapilib
- ;;
-
- --libs)
- echo \
- -L$libdir
- ;;
-
*)
usage 1 >&2
;;
Index: monetdb-java-config.bat.in
===================================================================
RCS file: /cvsroot/monetdb/java/conf/monetdb-java-config.bat.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- monetdb-java-config.bat.in 28 Nov 2007 14:54:06 -0000 1.1.1.1
+++ monetdb-java-config.bat.in 28 Nov 2007 16:23:57 -0000 1.2
@@ -5,26 +5,14 @@
set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
+set [EMAIL PROTECTED]@
+set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
-set pkglibdir=%libdir%\MonetDB
set pkgdatadir=%datadir%\MonetDB
-set pkgincludedir=%includedir%\MonetDB
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
if "%1" == "" goto usage
@@ -42,26 +30,14 @@
if "%1" == "--prefix" echo %prefix% & goto shift
if "%1" == "--exec-prefix" echo %exec_prefix% & goto shift
if "%1" == "--bindir" echo %bindir% & goto shift
-if "%1" == "--libexecdir" echo %libexecdir% & goto shift
if "%1" == "--datarootdir" echo %datarootdir% & goto shift
if "%1" == "--datadir" echo %datadir% & goto shift
-if "%1" == "--sysconfdir" echo %sysconfdir% & goto shift
-if "%1" == "--localstatedir" echo %localstatedir% & goto shift
-if "%1" == "--libdir" echo %libdir% & goto shift
-if "%1" == "--infodir" echo %infodir% & goto shift
-if "%1" == "--mandir" echo %mandir% & goto shift
-if "%1" == "--includedir" echo %includedir% & goto shift
if "%1" == "--pkgdatadir" echo %pkgdatadir% & goto shift
-if "%1" == "--pkglibdir" echo %pkglibdir% & goto shift
-if "%1" == "--pkgincludedir" echo %pkgincludedir% & goto shift
-if "%1" == "--perllibdir" echo %perllibdir% & goto shift
-if "%1" == "--pythonlibdir" echo %pythonlibdir% & goto shift
-if "%1" == "--phpextensiondir" echo %phpextensiondir% & goto shift
if "%1" == "--internal" goto shift
:usage
echo.
- echo Usage: monetdb-clients-config [OPTION]
+ echo Usage: monetdb-java-config [OPTION]
echo.
echo Known values for OPTION are:
echo.
@@ -71,9 +47,7 @@
echo --version output version information
echo.
echo Install directories %pkg% was configured to
- echo --prefix --exec-prefix --bindir --libexecdir --datadir
- echo --sysconfdir --localstatedir --libdir --infodir
- echo --mandir --includedir --pkgdatadir --pkglibdir --pkgincludedir
- echo --perllibdir --pythonlibdir --phpextensiondir
+ echo --prefix --exec-prefix --bindir
+ echo --datarootdir --datadir --pkgdatadir
echo.
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/java/conf/Makefile.ag,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.ag 28 Nov 2007 14:54:06 -0000 1.1.1.1
+++ Makefile.ag 28 Nov 2007 16:23:57 -0000 1.2
@@ -23,11 +23,11 @@
COND = NOT_WIN32
EXT = ""
DIR = bindir
- SOURCES = monetdb-clients-config.in
+ SOURCES = monetdb-java-config.in
}
scripts_bat = {
COND = NATIVE_WIN32
DIR = bindir
- SOURCES = monetdb-clients-config.bat.in
+ SOURCES = monetdb-java-config.bat.in
}
-------------------------------------------------------------------------
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
