Update of /cvsroot/monetdb/MonetDB5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23107
Modified Files:
Tag: GDK-2
HowToStart MonetDB-server.spec.in configure.ag rpm.mk.in
Log Message:
propagated changes of Monday Sep 10 2007 - Tuesday Sep 18 2007
from the development trunk to the GDK-2 branch
Index: MonetDB-server.spec.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/MonetDB-server.spec.in,v
retrieving revision 1.15.2.7
retrieving revision 1.15.2.8
diff -u -d -r1.15.2.7 -r1.15.2.8
--- MonetDB-server.spec.in 10 Sep 2007 14:26:46 -0000 1.15.2.7
+++ MonetDB-server.spec.in 18 Sep 2007 12:42:38 -0000 1.15.2.8
@@ -69,7 +69,7 @@
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
-accellerators, SQL- and XML- frontends.
+accelerators, SQL- and XML- frontends.
This package contains the MonetDB5 server component. You need this
package if you want to work using the MAL language, or if you want to
@@ -80,7 +80,7 @@
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
-accellerators, SQL- and XML- frontends.
+accelerators, SQL- and XML- frontends.
This package contains the files needed to develop with MonetDB5.
@@ -149,8 +149,6 @@
%{_bindir}/mserver5
%{_bindir}/Mbeddedmal
%{_bindir}/mcheckpoint
-%{_bindir}/merovingian
-%{_bindir}/monetdb
%{_bindir}/mrecover
%{_bindir}/stethoscope
@@ -160,8 +158,6 @@
%{_libdir}/MonetDB5/lib/*.so*
%{_libdir}/MonetDB5/*.mal
-%{_mandir}/man1/monetdb.1.gz
-
%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5
@@ -171,7 +167,13 @@
%defattr(-,root,root)
%{_bindir}/monetdb5-config
%dir %{_includedir}/MonetDB5
-%dir %{_includedir}/MonetDB5/*
+%dir %{_includedir}/MonetDB5/atoms
+%dir %{_includedir}/MonetDB5/compiler
+%dir %{_includedir}/MonetDB5/crackers
+%dir %{_includedir}/MonetDB5/kernel
+%dir %{_includedir}/MonetDB5/mal
+%dir %{_includedir}/MonetDB5/optimizer
+%dir %{_includedir}/MonetDB5/scheduler
%{_includedir}/MonetDB5/*.h
%{_includedir}/MonetDB5/*/*.[hcm]
%{_libdir}/*.so
Index: HowToStart
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/HowToStart,v
retrieving revision 1.9
retrieving revision 1.9.6.1
diff -u -d -r1.9 -r1.9.6.1
--- HowToStart 1 Dec 2006 10:27:45 -0000 1.9
+++ HowToStart 18 Sep 2007 12:42:37 -0000 1.9.6.1
@@ -96,11 +96,6 @@
shell-environment (especially variables like "PATH" and
"LD_LIBRARY_PATH") is setup, thus that the tools listed above can be
found.
-("Bash"-users at CWI and DD are welcome to simply
- "source conf/conf.bash".
- This sets the proper environment and even provides aliases
- "configure_MonetDB" & "Mtest_MonetDB" for convenience.
- See conf/conf.bash itself for more details.)
In case you did checkout the CVS version, you have to run "bootstrap", first;
in case you did download the pre-packaged source distribution, you must skip
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/configure.ag,v
retrieving revision 1.74.2.1
retrieving revision 1.74.2.2
diff -u -d -r1.74.2.1 -r1.74.2.2
--- configure.ag 23 Aug 2007 13:32:34 -0000 1.74.2.1
+++ configure.ag 18 Sep 2007 12:42:39 -0000 1.74.2.2
@@ -45,6 +45,24 @@
AC_DEFINE(WIN32, 1, [Define on MS Windows (also under Cygwin)])
fi
+# MONETDB5_BUILD and MONETDB5_SOURCE are *only* used for monetdb5-config
+# MONETDB5_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
+# need to be escapes with an extra \. Configure does not support \'s
+# 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'`
+MONETDB5_BUILD=[`pwd`]
+AC_SUBST(MONETDB5_BUILD)
+
+MONETDB5_SOURCE=[`(cd $srcdir && pwd)`]
+AC_SUBST(MONETDB5_SOURCE)
+
+AM_MONETDB_XQ_VARS_1()
+
+
dnl Check for Monet
# Check for Monet
req_monetdb_ver='1.19.0'
@@ -119,128 +137,27 @@
[AC_DEFINE(HAVE_CTIME_R3, 1, [Define if you have ctime_r(time_t*,char
*buf,size_t s)])], [ctime_r3=no])
AC_MSG_RESULT($ctime_r3)
-# MONETDB5_BUILD and MONETDB5_SOURCE are *only* used for monetdb5-config
-# MONETDB5_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
-# need to be escapes with an extra \. Configure does not support \'s
-# 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'`
-MONETDB5_BUILD=[`pwd`]
-AC_SUBST(MONETDB5_BUILD)
+dnl provide different versions of the paths derived above
+AM_MONETDB_XQ_VARS_2()
+AC_DEFINE_UNQUOTED(MONETDB5_PREFIX,"$QXprefix",[architecture-independent
files])
+AC_DEFINE_UNQUOTED(MONETDB5_EXEC_PREFIX,"$QXexec_prefix",[architecture-dependent
files])
QMONETDB5_BUILD="$MONETDB5_BUILD"
XMONETDB5_BUILD="`$translatepath "$MONETDB5_BUILD"`"
QXMONETDB5_BUILD="`echo "$XMONETDB5_BUILD" | sed 's/\\\\/\\\\\\\\/g'`"
AC_SUBST(QMONETDB5_BUILD)
AC_SUBST(XMONETDB5_BUILD)
AC_SUBST(QXMONETDB5_BUILD)
-MONETDB5_SOURCE=[`(cd $srcdir && pwd)`]
-AC_SUBST(MONETDB5_SOURCE)
QMONETDB5_SOURCE="$MONETDB5_SOURCE"
+XMONETDB5_SOURCE="`$translatepath "$MONETDB5_SOURCE"`"
+QXMONETDB5_SOURCE="`echo "$XMONETDB5_SOURCE" | sed 's/\\\\/\\\\\\\\/g'`"
AC_SUBST(QMONETDB5_SOURCE)
+AC_SUBST(XMONETDB5_SOURCE)
+AC_SUBST(QXMONETDB5_SOURCE)
+AC_DEFINE_UNQUOTED(MONETDB5_LOCALSTATEDIR,"$QXlocalstatedir",[modifiable
single-machine data])
+AC_DEFINE_UNQUOTED(MONETDB5_LIBDIR,"$QXlibdir",[object code libraries])
+AC_DEFINE_UNQUOTED(MONETDB5_SYSCONFDIR,"$QXsysconfdir",[read-only
single-machine data])
-# if no --prefix option, we must set Qprefix to the default value
-# the problem is that prefix is set very late in the process if it
-# wasn't set by --prefix
-if test "${prefix}x" = "NONEx"; then
- Qprefix="${ac_default_prefix}"
- Xprefix="`$translatepath "$Qprefix"`"
- QXprefix="`echo "$Xprefix" | sed 's/\\\\/\\\\\\\\/g'`"
-else
- Qprefix="${prefix}"
- Xprefix="`$translatepath "$prefix"`"
- QXprefix="`echo "$Xprefix" | sed 's/\\\\/\\\\\\\\/g'`"
-fi
-AC_SUBST(Xprefix)
-AC_SUBST(Qprefix)
-AC_SUBST(QXprefix)
-# exec_prefix is created very late, so let make do the expansion
-if test "${exec_prefix}x" = "NONEx"; then
- Qexec_prefix='${prefix}'
- Xexec_prefix="`$translatepath "$Qexec_prefix"`"
- QXexec_prefix="`echo "$Xexec_prefix" | sed 's/\\\\/\\\\\\\\/g'`"
-else
- Qexec_prefix="${exec_prefix}"
- Xexec_prefix="`$translatepath "$exec_prefix"`"
- QXexec_prefix="`echo "$Xexec_prefix" | sed 's/\\\\/\\\\\\\\/g'`"
-fi
-AC_SUBST(Xexec_prefix)
-AC_SUBST(Qexec_prefix)
-AC_SUBST(QXexec_prefix)
-Qsrcdir="$srcdir"
-Xsrcdir="`$translatepath "$srcdir"`"
-QXsrcdir="`echo "$Xsrcdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qsrcdir)
-AC_SUBST(Xsrcdir)
-AC_SUBST(QXsrcdir)
-Qlocalstatedir="$localstatedir"
-Xlocalstatedir="`$translatepath "$localstatedir"`"
-QXlocalstatedir="`echo "$Xlocalstatedir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_DEFINE_UNQUOTED(MONETDB4_LOCALSTATEDIR,"$QXlocalstatedir",[modifiable
single-machine data])
-AC_SUBST(Qlocalstatedir)
-AC_SUBST(Xlocalstatedir)
-AC_SUBST(QXlocalstatedir)
-Qlibdir="$libdir"
-Xlibdir="`$translatepath "$libdir"`"
-QXlibdir="`echo "$Xlibdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qlibdir)
-AC_SUBST(Xlibdir)
-AC_SUBST(QXlibdir)
-AC_DEFINE_UNQUOTED(MONETDB4_LIBDIR,"$QXlibdir",[object code libraries])
-Qsysconfdir="$sysconfdir"
-Xsysconfdir="`$translatepath "$sysconfdir"`"
-QXsysconfdir="`echo "$Xsysconfdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_DEFINE_UNQUOTED(MONETDB4_SYSCONFDIR,"$QXsysconfdir",[read-only
single-machine data])
-AC_SUBST(Qsysconfdir)
-AC_SUBST(Xsysconfdir)
-AC_SUBST(QXsysconfdir)
-Qbindir="$bindir"
-Xbindir="`$translatepath "$bindir"`"
-QXbindir="`echo "$Xbindir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qbindir)
-AC_SUBST(Xbindir)
-AC_SUBST(QXbindir)
-Qlibexecdir="$libexecdir"
-Xlibexecdir="`$translatepath "$libexecdir"`"
-QXlibexecdir="`echo "$Xlibexecdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qlibexecdir)
-AC_SUBST(Xlibexecdir)
-AC_SUBST(QXlibexecdir)
-Qdatarootdir="$datarootdir"
-Xdatarootdir="`$translatepath "$datarootdir"`"
-QXdatarootdir="`echo "$Xdatarootdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qdatarootdir)
-AC_SUBST(Xdatarootdir)
-AC_SUBST(QXdatarootdir)
-if test "${datadir}" = '${datarootdir}'; then
- datadir="${datarootdir}"
-fi
-Qdatadir="$datadir"
-Xdatadir="`$translatepath "$datadir"`"
-QXdatadir="`echo "$Xdatadir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qdatadir)
-AC_SUBST(Xdatadir)
-AC_SUBST(QXdatadir)
-Qmandir="$mandir"
-Xmandir="`$translatepath "$mandir"`"
-QXmandir="`echo "$Xmandir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qmandir)
-AC_SUBST(Xmandir)
-AC_SUBST(QXmandir)
-Qincludedir="$includedir"
-Xincludedir="`$translatepath "$includedir"`"
-QXincludedir="`echo "$Xincludedir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qincludedir)
-AC_SUBST(Xincludedir)
-AC_SUBST(QXincludedir)
-Qinfodir="$infodir"
-Xinfodir="`$translatepath "$infodir"`"
-QXinfodir="`echo "$Xinfodir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qinfodir)
-AC_SUBST(Xinfodir)
-AC_SUBST(QXinfodir)
dnl allow to keep track of how we are going to build this thing
compilercall="$CC $CFLAGS $X_CFLAGS"
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/rpm.mk.in,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- rpm.mk.in 6 Sep 2007 13:52:34 -0000 1.7.2.2
+++ rpm.mk.in 18 Sep 2007 12:42:40 -0000 1.7.2.3
@@ -39,7 +39,7 @@
mkdir -p $(rpmtopdir)/BUILD
mkdir -p $(rpmtopdir)/INSTALL
- echo "macrofiles:
/usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/etc/rpm/macros.specspo:/etc/rpm/macros.prelink:/etc/rpm/macros.solve:/etc/rpm/macros.up2date:/etc/rpm/macros:/etc/rpm/%{_target}/macros:$(rpmtopdir)/rpmmacros"
> $(rpmtopdir)/rpmrc
+ echo "macrofiles:
/usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/usr/lib/rpm/redhat/macros:/etc/rpm/macros.specspo:/etc/rpm/macros.prelink:/etc/rpm/macros.solve:/etc/rpm/macros.up2date:/etc/rpm/macros:/etc/rpm/%{_target}/macros:$(rpmtopdir)/rpmmacros"
> $(rpmtopdir)/rpmrc
echo "%_tmppath /tmp" > $(rpmtopdir)/rpmmacros
echo "%_topdir $(rpmtopdir)" >> $(rpmtopdir)/rpmmacros
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
