Update of /cvsroot/monetdb/java
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29765/java
Modified Files:
.cvsignore Makefile.ag MonetDB-java.spec.in RunMapprove.bat.in
RunMapprove.in RunMtest.bat.in RunMtest.in configure.ag
rpm.mk.in version.sh vertoo.data
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: .cvsignore
===================================================================
RCS file: /cvsroot/monetdb/java/.cvsignore,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- .cvsignore 28 Nov 2007 14:53:48 -0000 1.1.1.1
+++ .cvsignore 28 Nov 2007 16:23:56 -0000 1.2
@@ -11,4 +11,3 @@
configure.in
install.lst
doc.lst
-clients_config.h.in
Index: MonetDB-java.spec.in
===================================================================
RCS file: /cvsroot/monetdb/java/MonetDB-java.spec.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- MonetDB-java.spec.in 28 Nov 2007 14:53:49 -0000 1.1.1.1
+++ MonetDB-java.spec.in 28 Nov 2007 16:23:56 -0000 1.2
@@ -1,15 +1,6 @@
-%define name MonetDB-client
+%define name MonetDB-java
%define version @VERSION@
-%define release 1%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
-
-# groups of related archs
-%define all_x86 i386 i586 i686
-
-%ifarch %{all_x86}
-%define bits 32
-%else
-%define bits 64
-%endif
+%define release 1
# buildsystem is set to 1 when building an rpm from within the build
# directory; it should be set to 0 (or not set) when building a proper
@@ -19,128 +10,38 @@
Name: %{name}
Version: %{version}
Release: %{release}
-Summary: MonetDB - Monet Database Management System
+Summary: MonetDB - Monet Database Management System - Java interface
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
URL: http://monetdb.cwi.nl/
-Source: http://downloads.sourceforge.net/monetdb/clients-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/monetdb/java-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildArch: noarch
-Requires: MonetDB >= 1.20
-# ^^^^
-# Maintained via vertoo. Please don't modify by hand!
-# Contact [EMAIL PROTECTED] for details and/or assistance.
-BuildRequires: python
-BuildRequires: readline-devel, openssl-devel
-
-%{!?_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}}
-
+Requires: java
%if !%{?buildsystem}
-BuildRequires: MonetDB-devel >= 1.20
-# ^^^^
-# Maintained via vertoo. Please don't modify by hand!
-# Contact [EMAIL PROTECTED] for details and/or assistance.
+BuildRequires: ant, java
%endif
+
%package devel
-Summary: MonetDB Client development package
+Summary: MonetDB Java development package
Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
-Requires: MonetDB-devel >= 1.20
-# ^^^^
-# Maintained via vertoo. Please don't modify by hand!
-# Contact [EMAIL PROTECTED] for details and/or assistance.
-Requires: python
-Requires: readline-devel, openssl-devel
-%if %{?_with_php:1}%{!?_with_php:0}
-Requires: php, php-devel
-%endif
-%if %{?_with_python:1}%{!?_with_python:0}
-Requires: python-devel, swig
-%endif
-%if %{?_with_perl:1}%{!?_with_perl:0}
-Requires: perl, swig
-%if 0%{?fedora} >= 7
-# in Fedora Core 6 there is no perl-devel package: everything is in perl;
-# in Fedora 7 there is a perl-devel package which we need.
-Requires: perl-devel
-%endif
-%endif
-%if %{?_with_java:1}%{!?_with_java:0}
Requires: ant, java
-%endif
-%package odbc
-Summary: MonetDB SQL odbc
-Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
-
-%if %{?_with_php:1}%{!?_with_php:0}
-%package php
-Summary: MonetDB php interface
-Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
-Requires: php
-%define php_extensiondir %(php-config --extension-dir)
-%if !%{?buildsystem}
-BuildRequires: php, php-devel
-%endif
-%endif
-
-%if %{?_with_python:1}%{!?_with_python:0}
-%package python
-Summary: MonetDB python interface
-Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
-Requires: python
-Requires: MonetDB-python
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%if !%{?buildsystem}
-BuildRequires: python-devel, swig
-%endif
-%endif
-
-%if %{?_with_perl:1}%{!?_with_perl:0}
-%package perl
-Summary: MonetDB perl interface
-Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
-Requires: perl
-%define perl_libdir %(perl -MConfig -e '$x=$Config{installvendorarch}; $x =~
s|$Config{vendorprefix}/||; print $x;')
-%if !%{?buildsystem}
-BuildRequires: perl, swig
-%if 0%{?fedora} >= 7
-# in Fedora Core 6 there is no perl-devel package: everything is in perl;
-# in Fedora 7 there is a perl-devel package which we need.
-BuildRequires: perl-devel
-%endif
-%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,
automatic index management, extensibility of data types and search
accelerators, SQL- and XML- frontends.
-This package contains mclient, the main client program to communicate
-with the database server, and msqldump, a program to dump the SQL
-database so that it can be loaded back later.
+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.
+
%description devel
MonetDB is a database management system that is developed from a
@@ -149,78 +50,17 @@
accelerators, SQL- and XML- frontends.
This package contains the files needed to develop with
-MonetDB-clients.
-
-%description odbc
-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 ODBC driver.
-
-%if %{?_with_php:1}%{!?_with_php:0}
-%description php
-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 files needed to use MonetDB from a PHP
-program.
-%endif
-
-%if %{?_with_python:1}%{!?_with_python:0}
-%description python
-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 files needed to use MonetDB from a Python
-program.
-%endif
-
-%if %{?_with_perl:1}%{!?_with_perl:0}
-%description perl
-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 files needed to use MonetDB from a Perl
-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.
+MonetDB-java.
-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
-%setup -q -n clients-%{version}
+%setup -q -n java-%{version}
%build
-%configure \
- --enable-assert=no \
- --enable-optimize \
- --enable-bits=%{bits} \
- %{?oid32:--enable-oid32} \
- %{?comp_cc:CC="%{comp_cc}"} \
- %{?_with_php} %{?_without_php} \
- %{?_with_python} %{?_without_python} \
- %{?_with_perl} %{?_without_perl} \
- %{?_with_java} %{?_without_java}
+%configure
make
@@ -231,78 +71,24 @@
# cleanup stuff we don't want to install
rm -rf $RPM_BUILD_ROOT%{_datadir}/MonetDB/Tests
-rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB/Tests
find $RPM_BUILD_ROOT -name .incs.in -print -o -name \*.la -print | xargs rm -f
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
%clean
rm -fr $RPM_BUILD_ROOT
+
%files
%defattr(-,root,root)
-%{_bindir}/mclient
-%{_bindir}/msqldump
-%{_libdir}/libMapi.so.*
-%{_mandir}/man1/mclient.1.gz
+%{_bindir}/mjclient
+%dir %{_datadir}/MonetDB/lib
+%{_datadir}/MonetDB/lib/*jar
%files devel
%defattr(-,root,root)
-%{_bindir}/monetdb-clients-config
-%{_libdir}/libMapi.so
-%dir %{_includedir}/MonetDB/mapilib
-%{_includedir}/MonetDB/mapilib/Mapi.h
-
-# todo odbc-devel package ?
-%files odbc
-%defattr(-,root,root)
-%{_libdir}/libMonetODBC.*
-%{_libdir}/libMonetODBCs.*
-%dir %{_includedir}/MonetDB/odbc
-%{_includedir}/MonetDB/odbc/odbcinst.h
-%{_includedir}/MonetDB/odbc/sql.h
-%{_includedir}/MonetDB/odbc/sqlext.h
-%{_includedir}/MonetDB/odbc/sqltypes.h
-%{_includedir}/MonetDB/odbc/sqlucode.h
-
-%if %{?_with_php:1}%{!?_with_php:0}
-%files php
-%defattr(-,root,root)
-%{php_extensiondir}/*
-%dir %{_datadir}/MonetDB/php
-%{_datadir}/MonetDB/php/*
-%endif
-
-%if %{?_with_python:1}%{!?_with_python:0}
-%files python
-%defattr(-,root,root)
-%{_bindir}/mclient.py
-%exclude %{_bindir}/mclient.pyc
-%exclude %{_bindir}/mclient.pyo
-%{python_sitearch}/MonetDB/*
-%dir %{python_sitearch}/MonetSQLdb
-%{python_sitearch}/MonetSQLdb/*
-%endif
-
-%if %{?_with_perl:1}%{!?_with_perl:0}
-%files perl
-%defattr(-,root,root)
-%{_prefix}/%{perl_libdir}/*
-%dir %{_datadir}/MonetDB/perl
-%{_datadir}/MonetDB/perl/*
-%endif
+%{_bindir}/monetdb-java-config
-%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}}
+* Mon Jun 25 2007 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL PROTECTED]
- Built.
Index: vertoo.data
===================================================================
RCS file: /cvsroot/monetdb/java/vertoo.data,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- vertoo.data 28 Nov 2007 14:54:00 -0000 1.1.1.1
+++ vertoo.data 28 Nov 2007 16:23:57 -0000 1.2
@@ -1,3 +1,4 @@
-monetdb = major:1; minor:20; release:0; rc:x; build:1;
-clients = major:1; minor:21; release:0; rc:x; build:1;
-sql = major:2; minor:20; release:0; rc:x; build:1;
\ No newline at end of file
+# The not distributed vertoo.data is required for configure to determine
+# whether we build from CVS source or from distributed source (tarball).
+# We currently do not use vertoo for MonetDB Java;
+# see version.sh, instead.
Index: version.sh
===================================================================
RCS file: /cvsroot/monetdb/java/version.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- version.sh 28 Nov 2007 14:53:48 -0000 1.1.1.1
+++ version.sh 28 Nov 2007 16:23:57 -0000 1.2
@@ -107,9 +107,21 @@
-e "s|Release date: 20[0-9][0-9]-[01][0-9]-[0-3][0-9]|Release date:
`date +%F`|" \
${file} | ${diff} ${file} - | ${patch}
+file="configure.ag"
+sed \
+ -e "s|^\(\[MonetDB Java\],
\)\[${ESC_MAJOR}\.${ESC_MINOR}.${ESC_SUFFIX//[^0-9]/}\]|\1\[${NEW_MAJOR}.${NEW_MINOR}.${NEW_SUFFIX//[^0-9]/}\]|"
\
+ ${file} | ${diff} ${file} - | ${patch}
+
+file="NT/rules.msc"
+sed \
+ -e
"s|^\(VERSION=\)${ESC_MAJOR}\.${ESC_MINOR}.${ESC_SUFFIX//[^0-9]/}|\1${NEW_MAJOR}.${NEW_MINOR}.${NEW_SUFFIX//[^0-9]/}|"
\
+ ${file} | ${diff} ${file} - | ${patch}
+
for file in \
Makefile.ag \
- ../../../*/src/jdbc/tests/Tests/Test.SQL.bat \
+ ../*/src/jdbc/tests/Tests/Test.SQL.bat \
+ ../*/NT/MonetDB[45]-SQL{,64}/MonetDB4-SQL-Installer.vdproj \
+ ../*/NT/MonetDB4-XQuery{,64}/MonetDB4-XQuery-Installer.vdproj \
; do
if [[ -f ${file} ]] ; then
for f in $FILES ; do
Index: RunMtest.bat.in
===================================================================
RCS file: /cvsroot/monetdb/java/RunMtest.bat.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- RunMtest.bat.in 28 Nov 2007 14:54:00 -0000 1.1.1.1
+++ RunMtest.bat.in 28 Nov 2007 16:23:56 -0000 1.2
@@ -8,14 +8,12 @@
setlocal
-set pkg=monetdb-clients
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
+set pkg=monetdb-java
+set [EMAIL PROTECTED]@
+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%
+set PATH=%builddir%\scripts;%PATH%
REM execute Mtest.py in the source directory
pushd %srcdir%
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/java/configure.ag,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- configure.ag 28 Nov 2007 14:53:49 -0000 1.1.1.1
+++ configure.ag 28 Nov 2007 16:23:57 -0000 1.2
@@ -19,20 +19,12 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([MonetDB clients], [1.21.0], [EMAIL PROTECTED], [clients])
-# ^^^^^^
-# Maintained via vertoo. Please don't modify by hand!
-# Contact [EMAIL PROTECTED] for details and/or assistance.
+AC_INIT([MonetDB Java], [1.7.1], [EMAIL PROTECTED], [java])
AC_CONFIG_AUX_DIR(conf)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
-dnl AH_TOP([#include "sysdefs.h"])
-AH_BOTTOM([#include "stddef.h"])
AM_INIT_AUTOMAKE
-AC_CONFIG_SRCDIR([src/mapilib/Mapi.mx])
-AM_CONFIG_HEADER([clients_config.h])
-CONFIG_H=clients_config.h
-AC_SUBST(CONFIG_H)
+AM_CONFIG_HEADER([monetdb_java_config.h])
HOST=[$target]
AC_DEFINE_UNQUOTED(HOST, "$HOST", [Host identifier])
@@ -41,8 +33,8 @@
AC_DEFINE(WIN32, 1, [Define on MS Windows (also under Cygwin)])
fi
-# CLIENTS_BUILD and CLIENTS_SOURCE are *only* used for monetdb-clients-config
-# CLIENTS_SOURCE is the absolute path name of the source directory
+# MONETDB_JAVA_BUILD and MONETDB_JAVA_SOURCE are *only* used for
monetdb-java-config
+# MONETDB_JAVA_SOURCE is the absolute path name of the source directory
# (srcdir can be relative)
# The Q versions of various variables are used in places where \'s
@@ -50,152 +42,39 @@
# in path names, so there is no need to do anything special here
# except set the variables. The command to set them in case we do
# need to escape the \'s is Qvar=`echo "$var" | sed 's/\\\\/\\\\\\\\/g'`
-CLIENTS_BUILD=[`pwd`]
-AC_SUBST(CLIENTS_BUILD)
+MONETDB_JAVA_BUILD=[`pwd`]
+AC_SUBST(MONETDB_JAVA_BUILD)
-CLIENTS_SOURCE=[`(cd $srcdir && pwd)`]
-AC_SUBST(CLIENTS_SOURCE)
+MONETDB_JAVA_SOURCE=[`(cd $srcdir && pwd)`]
+AC_SUBST(MONETDB_JAVA_SOURCE)
AM_MONETDB_XQ_VARS_1()
-
# Check for Monet
-req_monetdb_ver='1.20.0'
-# ^^^^^^
-# Maintained via vertoo. Please don't modify by hand!
-# Contact [EMAIL PROTECTED] for details and/or assistance.
-AM_MONETDB_COMMON($req_monetdb_ver)
-if test "x$have_monetdb" != xyes; then
- if test "x$MONETDBVERS" = "x"; then
- AC_MSG_ERROR([MonetDB was not found. Clients requires at least
version $req_monetdb_ver of MonetDB.])
- else
- AC_MSG_ERROR([Clients requires at least version
$req_monetdb_ver of MonetDB, but only version $MONETDBVERS was found.])
- 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_TOOLS()
-AM_MONETDB_OPTIONS()
-AM_MONETDB_LIBS()
-AM_MONETDB_UTILS()
-
-AC_PROG_LIBTOOL
-
-# Checks for libraries.
-dnl unixODBC
-dnl this is only used by the ODBC driver
-have_unixodbc=auto
-UNIXODBC_PATH="$PATH"
-UNIXODBC_CONFIG=''
-ODBC_INCS=''
-ODBC_LIBS=''
-AC_ARG_WITH(unixodbc,
- AC_HELP_STRING([--with-unixodbc=DIR],
- [unixODBC library is installed in DIR]),
- have_unixodbc="$withval")
-case "$have_unixodbc" in
-yes|no|auto)
- ;;
-*)
- UNIXODBC_PATH="$withval/bin:$PATH"
- ;;
-esac
-if test "x$have_unixodbc" != xno; then
- AC_PATH_PROG(UNIXODBC_CONFIG,odbc_config,,$UNIXODBC_PATH)
- if test "x$UNIXODBC_CONFIG" = x; then
- if test "x$have_unixodbc" = xyes; then
- AC_MSG_ERROR([odbc_config not found; use
--with-unixodbc=<path>])
- fi
- have_unixodbc=no
- fi
-fi
-if test "x$have_unixodbc" != xno; then
- case "$have_unixodbc" in
- yes|auto)
- ;;
- *)
- ODBC_INCS="-I$have_unixodbc/include"
- ODBC_LIBS="-L$have_unixodbc/lib"
- ;;
- esac
- save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $ODBC_INCS"
- AC_CHECK_HEADER(odbcinst.h, AC_DEFINE(HAVE_ODBCINST_H, 1, [Define to 1
if you have the <odbcinst.h> header file.]), [if test "x$have_unixodbc" !=
xauto; then AC_MSG_ERROR([odbcinst.h not found]); fi; have_unixodbc=no])
- CPPFLAGS="$save_CPPFLAGS"
-fi
-if test "x$have_unixodbc" != xno; then
- save_LIBS="$LIBS"
- LIBS="$LIBS $ODBC_LIBS"
- AC_CHECK_LIB(odbcinst, SQLGetPrivateProfileString, :, [if test
"x$have_unixodbc" != xauto; then AC_MSG_ERROR([-lodbcinst not found]); fi;
have_unixodbc=no])
- LIBS="$save_LIBS"
-fi
-if test "x$have_unixodbc" != xno; then
- ODBC_LIBS="$ODBC_LIBS -lodbcinst"
- AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING, 1, [Define if you have the
SQLGetPrivateProfileString function])
+AM_MONETDB_ANT_JAVA($req_java_ver_min, $req_java_ver_max)
+if test "x$have_java" = xno; then
+ AC_MSG_ERROR([MonetDB Java requires ant and Java >= $req_java_ver_min,
but < $req_java_ver_max.])
fi
-AC_SUBST(ODBC_INCS)
-AC_SUBST(ODBC_LIBS)
-
-# Checks for header files.
-AC_HEADER_TIME
-AC_CHECK_HEADERS([crypt.h pwd.h sys/ioctl.h sys/un.h])
-
-# Checks for library functions.
-AC_CHECK_FUNCS([crypt ftime getlogin gethostname localtime_r popen strcasecmp
strncasecmp strtod strtof strtoll strtoull])
-AC_CHECK_DECLS([strtof, strtoll, strtoull])
-
+AM_MONETDB_UTILS() # for buildtools
+AM_MONETDB_TRANSLATEPATH()
+AC_PATH_PROG(BASH,bash, /usr/bin/bash, $PATH)
+AC_CHECK_PROGS(RPMBUILD,rpmbuild rpm)
dnl provide different versions of the paths derived above
AM_MONETDB_XQ_VARS_2()
-AC_DEFINE_UNQUOTED(CLIENTS_PREFIX,"$QXprefix",[architecture-independent files])
-AC_DEFINE_UNQUOTED(CLIENTS_EXEC_PREFIX,"$QXexec_prefix",[architecture-dependent
files])
-QCLIENTS_BUILD="$CLIENTS_BUILD"
-XCLIENTS_BUILD="`$translatepath "$CLIENTS_BUILD"`"
-QXCLIENTS_BUILD="`echo "$XCLIENTS_BUILD" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(QCLIENTS_BUILD)
-AC_SUBST(XCLIENTS_BUILD)
-AC_SUBST(QXCLIENTS_BUILD)
-QCLIENTS_SOURCE="$CLIENTS_SOURCE"
-XCLIENTS_SOURCE="`$translatepath "$CLIENTS_SOURCE"`"
-QXCLIENTS_SOURCE="`echo "$XCLIENTS_SOURCE" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(QCLIENTS_SOURCE)
-AC_SUBST(XCLIENTS_SOURCE)
-AC_SUBST(QXCLIENTS_SOURCE)
-AC_DEFINE_UNQUOTED(CLIENTS_LOCALSTATEDIR,"$QXlocalstatedir",[modifiable
single-machine data])
-AC_DEFINE_UNQUOTED(CLIENTS_LIBDIR,"$QXlibdir",[object code libraries])
-AC_DEFINE_UNQUOTED(CLIENTS_SYSCONFDIR,"$QXsysconfdir",[read-only
single-machine data])
-
-
-case "$host_os" in
-mac*) DIRSEP=':'
- QDIRSEP=':'
- AC_ERROR([mac not supported])
- ;;
-*mingw*)
- DIRSEP='\'
- QDIRSEP='\\'
- PATHSEP=';'
- SOEXT='-0.dll'
- ;;
-*darwin*)
- DIRSEP='/'
- QDIRSEP='/'
- PATHSEP=':'
- SOEXT='.dylib'
- ;;
-*)
- DIRSEP='/'
- QDIRSEP='/'
- PATHSEP=':'
- SOEXT='.so'
- ;;
-esac
-AC_SUBST(DIRSEP)
-AC_SUBST(QDIRSEP)
-AC_SUBST(PATHSEP)
-AC_SUBST(SOEXT)
-
-dnl CFLAGS for our code are stricter than what autoconf can cope with.
-CFLAGS="$CFLAGS \$(X_CFLAGS)"
+AC_DEFINE_UNQUOTED(MONETDB_JAVA_PREFIX,"$QXprefix",[architecture-independent
files])
+AC_DEFINE_UNQUOTED(MONETDB_JAVA_EXEC_PREFIX,"$QXexec_prefix",[architecture-dependent
files])
+QMONETDB_JAVA_BUILD="$MONETDB_JAVA_BUILD"
+XMONETDB_JAVA_BUILD="`$translatepath "$MONETDB_JAVA_BUILD"`"
+QXMONETDB_JAVA_BUILD="`echo "$XMONETDB_JAVA_BUILD" | sed 's/\\\\/\\\\\\\\/g'`"
+AC_SUBST(QMONETDB_JAVA_BUILD)
+AC_SUBST(XMONETDB_JAVA_BUILD)
+AC_SUBST(QXMONETDB_JAVA_BUILD)
+QMONETDB_JAVA_SOURCE="$MONETDB_JAVA_SOURCE"
+XMONETDB_JAVA_SOURCE="`$translatepath "$MONETDB_JAVA_SOURCE"`"
+QXMONETDB_JAVA_SOURCE="`echo "$XMONETDB_JAVA_SOURCE" | sed
's/\\\\/\\\\\\\\/g'`"
+AC_SUBST(QMONETDB_JAVA_SOURCE)
+AC_SUBST(XMONETDB_JAVA_SOURCE)
+AC_SUBST(QXMONETDB_JAVA_SOURCE)
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/java/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:00 -0000 1.1.1.1
+++ Makefile.ag 28 Nov 2007 16:23:56 -0000 1.2
@@ -14,12 +14,16 @@
# Portions created by CWI are Copyright (C) 1997-2007 CWI.
# All Rights Reserved.
-MTSAFE
+SUBDIRS = conf tests scripts
-SUBDIRS = tests scripts
+EXTRA_DIST = configure.ag rpm.mk.in \
+ MonetDB-java.spec MonetDB-java.spec.in \
+ RunMtest.in RunMtest.bat.in \
+ RunMapprove.in \
+ build.xml build.properties release.txt
-EXTRA_DIST = build.xml build.properties release.txt
-EXTRA_DIST_DIR = src \
+EXTRA_DIST_DIR = NT \
+ src \
lib \
example
@@ -27,3 +31,6 @@
DIR = datadir/MonetDB/lib
FILES = monetdb-1.1-mcl.jar monetdb-1.7-jdbc.jar jdbcclient.jar
}
+
+TESTS = RunMtest
+TESTS_ENVIRONMENT = $(SHELL)
Index: RunMtest.in
===================================================================
RCS file: /cvsroot/monetdb/java/RunMtest.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- RunMtest.in 28 Nov 2007 14:53:48 -0000 1.1.1.1
+++ RunMtest.in 28 Nov 2007 16:23:57 -0000 1.2
@@ -16,14 +16,14 @@
# Portions created by CWI are Copyright (C) 1997-2007 CWI.
# All Rights Reserved.
-pkg=monetdb-clients
[EMAIL PROTECTED]@
+pkg=monetdb-java
[EMAIL PROTECTED]@
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
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}/scripts/mjclient"
do
if [ -s $x ] ; then
chmod +x $x
@@ -31,12 +31,9 @@
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}/scripts:$PATH"
export PATH
-PYTHONPATH="${srcdir}/src/python:${PYTHONPATH}"
-export PYTHONPATH
-
# execute Mtest.py in the source directory
cd "$srcdir"
Index: RunMapprove.in
===================================================================
RCS file: /cvsroot/monetdb/java/RunMapprove.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- RunMapprove.in 28 Nov 2007 14:53:48 -0000 1.1.1.1
+++ RunMapprove.in 28 Nov 2007 16:23:56 -0000 1.2
@@ -16,8 +16,8 @@
# Portions created by CWI are Copyright (C) 1997-2007 CWI.
# All Rights Reserved.
-pkg=monetdb-clients
[EMAIL PROTECTED]@
+pkg=monetdb-java
[EMAIL PROTECTED]@
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
Index: RunMapprove.bat.in
===================================================================
RCS file: /cvsroot/monetdb/java/RunMapprove.bat.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- RunMapprove.bat.in 28 Nov 2007 14:53:48 -0000 1.1.1.1
+++ RunMapprove.bat.in 28 Nov 2007 16:23:56 -0000 1.2
@@ -8,14 +8,11 @@
setlocal
-set pkg=monetdb-clients
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
+set pkg=monetdb-java
+set [EMAIL PROTECTED]@
+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%
REM execute Mapprove.py in the source directory
pushd %srcdir%
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/java/rpm.mk.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- rpm.mk.in 28 Nov 2007 14:53:59 -0000 1.1.1.1
+++ rpm.mk.in 28 Nov 2007 16:23:57 -0000 1.2
@@ -20,15 +20,6 @@
rpmtopdir = $(shell cd $(top_builddir) && pwd)/rpm
[EMAIL PROTECTED]@php=--without php
[EMAIL PROTECTED]@php=--with php
[EMAIL PROTECTED]@perl=--without perl
[EMAIL PROTECTED]@perl=--with perl
[EMAIL PROTECTED]@python=--without python
[EMAIL PROTECTED]@python=--with python
[EMAIL PROTECTED]@java=--without java
[EMAIL PROTECTED]@java=--with java
-
$(top_builddir)/$(distdir).tar.gz:
$(MAKE) $(AM_MAKEFLAGS) dist
@@ -44,26 +35,17 @@
echo "%_tmppath /tmp" > $(rpmtopdir)/rpmmacros
echo "%_topdir $(rpmtopdir)" >> $(rpmtopdir)/rpmmacros
echo "%tmpdir %{_tmppath}" >> $(rpmtopdir)/rpmmacros
- echo "%rpmcflags -O2 " >> $(rpmtopdir)/rpmmacros
echo "#%top_builddirroot %{_topdir}/INSTALL/" >> $(rpmtopdir)/rpmmacros
- echo "%dist [EMAIL PROTECTED]@" >>
$(rpmtopdir)/rpmmacros
- 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
- for i in rpm/SRPMS/[EMAIL PROTECTED]@[EMAIL PROTECTED]@* ; do \
- mv "$$i" "`echo "$$i" | sed 's|[EMAIL PROTECTED]@[EMAIL
PROTECTED]@||'`" ; \
- done
+rpm: MonetDB-java.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
+ $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --define="buildsystem 1"
$(top_builddir)/$(distdir).tar.gz
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
- for i in rpm/SRPMS/[EMAIL PROTECTED]@[EMAIL PROTECTED]@* ; do \
- mv "$$i" "`echo "$$i" | sed 's|[EMAIL PROTECTED]@[EMAIL
PROTECTED]@||'`" ; \
- done
+srpm: MonetDB-java.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
+ $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ts --define="buildsystem 1"
$(top_builddir)/$(distdir).tar.gz
cleanup_distr:
- find clients-* -perm -0100 -type f ! -name \*.bat ! -name \*.sh ! -exec
grep -q '^#!' {} \; -exec chmod a-x {} \;
- find clients-* -name \*.in ! -name configure.in ! -name \*.spec.in
-print | while read i; do test -f $${i%.in} && rm -f $${i%.in}; done || true
+ find java-* -perm -0100 -type f ! -name \*.bat ! -name \*.sh ! -exec
grep -q '^#!' {} \; -exec chmod a-x {} \;
+ find java-* -name \*.in ! -name configure.in ! -name \*.spec.in -print
| while read i; do test -f $${i%.in} && rm -f $${i%.in}; done || true
dist-hook: cleanup_distr
-------------------------------------------------------------------------
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
