Update of /cvsroot/monetdb/clients
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29765/clients
Modified Files:
MonetDB-client.spec.in RunMapprove.bat.in RunMtest.bat.in
RunMtest.in configure.ag rpm.mk.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-client.spec.in
===================================================================
RCS file: /cvsroot/monetdb/clients/MonetDB-client.spec.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- MonetDB-client.spec.in 18 Sep 2007 21:55:37 -0000 1.28
+++ MonetDB-client.spec.in 28 Nov 2007 16:23:14 -0000 1.29
@@ -37,7 +37,6 @@
%{!?_with_php: %{!?_without_php: %define _with_php --with-php}}
%{!?_with_python: %{!?_without_python: %define _with_python --with-python}}
%{!?_with_perl: %{!?_without_perl: %define _with_perl --with-perl}}
-%{!?_with_java: %{!?_without_java: %define _with_java --with-java}}
%if !%{?buildsystem}
BuildRequires: MonetDB-devel >= 1.20
@@ -70,9 +69,6 @@
Requires: perl-devel
%endif
%endif
-%if %{?_with_java:1}%{!?_with_java:0}
-Requires: ant, java
-%endif
%package odbc
@@ -122,16 +118,6 @@
%endif
%endif
-%if %{?_with_java:1}%{!?_with_java:0}
-%package java
-Summary: MonetDB java interface
-Group: Applications/Databases
-Requires: java
-%if !%{?buildsystem}
-BuildRequires: ant, java
-%endif
-%endif
-
%description
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -192,17 +178,6 @@
program.
%endif
-%if %{?_with_java:1}%{!?_with_java:0}
-%description java
-MonetDB is a database management system that is developed from a
-main-memory perspective with use of a fully decomposed storage model,
-automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
-
-This package contains the JDBC driver and mjclient, a client program
-written in Java that uses the JDBC driver to communicate with the
-database server.
-%endif
%prep
rm -rf $RPM_BUILD_ROOT
@@ -219,8 +194,7 @@
%{?comp_cc:CC="%{comp_cc}"} \
%{?_with_php} %{?_without_php} \
%{?_with_python} %{?_without_python} \
- %{?_with_perl} %{?_without_perl} \
- %{?_with_java} %{?_without_java}
+ %{?_with_perl} %{?_without_perl}
make
@@ -294,14 +268,6 @@
%{_datadir}/MonetDB/perl/*
%endif
-%if %{?_with_java:1}%{!?_with_java:0}
-%files java
-%defattr(-,root,root)
-%{_bindir}/mjclient
-%dir %{_datadir}/MonetDB/lib
-%{_datadir}/MonetDB/lib/*jar
-%endif
-
%changelog
* Mon Jun 25 2007 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL
PROTECTED]:.oid32}%{!?oid32:.oid%{bits}}
- Built.
Index: RunMtest.bat.in
===================================================================
RCS file: /cvsroot/monetdb/clients/RunMtest.bat.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- RunMtest.bat.in 3 Oct 2007 13:56:05 -0000 1.2
+++ RunMtest.bat.in 28 Nov 2007 16:23:14 -0000 1.3
@@ -13,7 +13,6 @@
set [EMAIL PROTECTED]@
set PATH=%builddir%\conf;%PATH%
-set PATH=%builddir%\src\java\scripts;%PATH%
set PATH=%builddir%\src\mapiclient;%PATH%
set PATH=%builddir%\src\python;%PATH%
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/clients/configure.ag,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- configure.ag 8 Nov 2007 19:13:44 -0000 1.27
+++ configure.ag 28 Nov 2007 16:23:14 -0000 1.28
@@ -73,9 +73,7 @@
fi
fi
AM_MONETDB_DEFAULTS()
-req_java_ver_min=1.4 # >= $req_java_ver_min required
-req_java_ver_max=1.6 # < $req_java_ver_max required
-AM_MONETDB_COMPILER($req_java_ver_min, $req_java_ver_max)
+AM_MONETDB_COMPILER()
AM_MONETDB_TOOLS()
AM_MONETDB_OPTIONS()
AM_MONETDB_LIBS()
Index: RunMtest.in
===================================================================
RCS file: /cvsroot/monetdb/clients/RunMtest.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- RunMtest.in 13 Sep 2007 21:27:19 -0000 1.5
+++ RunMtest.in 28 Nov 2007 16:23:14 -0000 1.6
@@ -23,7 +23,7 @@
uname=`uname`
# make sure scripts are executable
-for x in "${builddir}/conf/${pkg}-config"
"${builddir}/src/java/scripts/mjclient" "${builddir}/src/python/mclient.py"
+for x in "${builddir}/conf/${pkg}-config" "${builddir}/src/python/mclient.py"
do
if [ -s $x ] ; then
chmod +x $x
@@ -31,7 +31,7 @@
done
# enhance various paths to find our stuff
-PATH="${builddir}/conf:${builddir}/src/java/scripts:${builddir}/src/mapiclient:${builddir}/src/python:$PATH"
+PATH="${builddir}/conf:${builddir}/src/mapiclient:${builddir}/src/python:$PATH"
export PATH
PYTHONPATH="${srcdir}/src/python:${PYTHONPATH}"
Index: RunMapprove.bat.in
===================================================================
RCS file: /cvsroot/monetdb/clients/RunMapprove.bat.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- RunMapprove.bat.in 3 Oct 2007 15:49:26 -0000 1.2
+++ RunMapprove.bat.in 28 Nov 2007 16:23:14 -0000 1.3
@@ -13,7 +13,6 @@
set [EMAIL PROTECTED]@
set PATH=%builddir%\conf;%PATH%
-set PATH=%builddir%\src\java\scripts;%PATH%
set PATH=%builddir%\src\mapiclient;%PATH%
set PATH=%builddir%\src\python;%PATH%
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/clients/rpm.mk.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- rpm.mk.in 14 Sep 2007 10:02:45 -0000 1.14
+++ rpm.mk.in 28 Nov 2007 16:23:14 -0000 1.15
@@ -26,8 +26,6 @@
@[EMAIL PROTECTED] perl
@[EMAIL PROTECTED] python
@[EMAIL PROTECTED] python
[EMAIL PROTECTED]@java=--without java
[EMAIL PROTECTED]@java=--with java
$(top_builddir)/$(distdir).tar.gz:
$(MAKE) $(AM_MAKEFLAGS) dist
@@ -50,14 +48,14 @@
if test "@oids@" -eq 32; then echo "%oid32 1" >>
$(rpmtopdir)/rpmmacros; fi
rpm: MonetDB-client.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --target `uname -m` ${php}
${perl} ${python} ${java} --define="buildsystem 1" --define="comp_cc @CC@"
$(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --target `uname -m` ${php}
${perl} ${python} --define="buildsystem 1" --define="comp_cc @CC@"
$(top_builddir)/$(distdir).tar.gz
for i in rpm/SRPMS/[EMAIL PROTECTED]@[EMAIL PROTECTED]@* ; do \
mv "$$i" "`echo "$$i" | sed 's|[EMAIL PROTECTED]@[EMAIL
PROTECTED]@||'`" ; \
done
rm -rf $(rpmtopdir)/BUILD
srpm: MonetDB-client.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ts ${php} ${perl} ${python}
${java} --define="buildsystem 1" $(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ts ${php} ${perl} ${python}
--define="buildsystem 1" $(top_builddir)/$(distdir).tar.gz
for i in rpm/SRPMS/[EMAIL PROTECTED]@[EMAIL PROTECTED]@* ; do \
mv "$$i" "`echo "$$i" | sed 's|[EMAIL PROTECTED]@[EMAIL
PROTECTED]@||'`" ; \
done
-------------------------------------------------------------------------
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
