Update of /cvsroot/monetdb/pathfinder
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2426
Modified Files:
Makefile.ag MonetDB-XQuery.spec.in configure.ag rpm.mk.in
vertoo.config
Log Message:
Changed the name of the generated tar balls (and the name of the
top-level directory within them).
The names are now equal to what nightly testing created, so that
doesn't have to rename the tar balls anymore.
The files are still installed in the same place as before.
Building RPMs still works.
The main change in the code is that we no longer use @PACKAGE@ since
that is the longer tar ball name which we don't want in the
installation directories we create. Also, we can't use the defaults
when installing include files since they would also otherwise be
installed in a directory with @PACKAGE@ in it.
Note, this will undoubtedly negatively affect the monetdb-install
script, but I leave it to its owner to fix that.
Index: vertoo.config
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/vertoo.config,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- vertoo.config 28 Nov 2007 16:24:00 -0000 1.20
+++ vertoo.config 3 Dec 2007 08:24:54 -0000 1.21
@@ -14,7 +14,7 @@
main.setVersionFormat('@normal%[rc?%rc%build:]')
main.addAnchor("VERSION", "%v")
-main.addAnchor("configure.ag", "\"pathfinder\", %v")
+main.addAnchor("configure.ag", "[MonetDB XQuery], [%v]")
main.addAnchor("NT/rules.msc", "VERSION = %v")
main.addAnchor("runtime/xrpc/admin/title.html.in", "MonetDB/XQuery %v")
main.addAnchor("runtime/pathfinder.mx", "MonetDB/XQuery module v%v")
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/Makefile.ag,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Makefile.ag 12 Sep 2007 10:56:38 -0000 1.30
+++ Makefile.ag 3 Dec 2007 08:24:54 -0000 1.31
@@ -30,8 +30,6 @@
MonetDB-XQuery.spec.in MonetDB-XQuery.spec rpm.mk.in
EXTRA_DIST_DIR = NT tests benchmarks
-EXTRA_HEADERS = pf_config.h
-
headers_txt = {
HEADERS = txt
SOURCES = HowToStart-MinGW.txt
@@ -44,5 +42,11 @@
DIR = datadir/doc/MonetDB-XQuery-$(VERSION)
}
+headers_h = {
+ HEADERS = h
+ SOURCES = pf_config.h
+ DIR = includedir/pathfinder
+}
+
TESTS = RunMtest
TESTS_ENVIRONMENT = $(SHELL)
Index: MonetDB-XQuery.spec.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/MonetDB-XQuery.spec.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- MonetDB-XQuery.spec.in 13 Nov 2007 14:27:21 -0000 1.44
+++ MonetDB-XQuery.spec.in 3 Dec 2007 08:24:54 -0000 1.45
@@ -19,7 +19,7 @@
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/pathfinder-%{version}.tar.gz
+Source:
http://downloads.sourceforge.net/monetdb/MonetDB-XQuery-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: MonetDB4-server >= 4.21
@@ -111,7 +111,7 @@
%prep
rm -rf $RPM_BUILD_ROOT
-%setup -q -n pathfinder-%{version}
+%setup -q -n MonetDB-XQuery-%{version}
%build
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/configure.ag,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- configure.ag 28 Nov 2007 16:24:00 -0000 1.121
+++ configure.ag 3 Dec 2007 08:24:54 -0000 1.122
@@ -22,7 +22,11 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.53)
-AC_INIT(compiler/main.c)
+AC_INIT([MonetDB XQuery], [0.21.0], [EMAIL PROTECTED], [MonetDB-XQuery])
+# ^^^^^^
+# Maintained via vertoo. Please don't modify by hand!
+# Contact [EMAIL PROTECTED] for details and/or assistance.
+AC_CONFIG_SRCDIR(compiler/main.c)
AC_CONFIG_AUX_DIR(conf)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
@@ -30,10 +34,7 @@
AH_BOTTOM([#include "stddef.h"])
dnl ----------------------
-AM_INIT_AUTOMAKE("pathfinder", 0.21.0)
-# ^^^^^^
-# Maintained via vertoo. Please don't modify by hand!
-# Contact [EMAIL PROTECTED] for details and/or assistance.
+AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(pf_config.h:conf/config.h.in)
CONFIG_H=pf_config.h
AC_SUBST(CONFIG_H)
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/rpm.mk.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- rpm.mk.in 10 Oct 2007 12:40:35 -0000 1.20
+++ rpm.mk.in 3 Dec 2007 08:24:54 -0000 1.21
@@ -61,7 +61,7 @@
done
cleanup_distr:
- find pathfinder-* -perm -0100 -type f ! -name \*.bat ! -name \*.sh !
-exec grep -q '^#!' {} \; -exec chmod a-x {} \;
- find pathfinder-* -name \*.in ! -name configure.in ! -name \*.spec.in
-print | while read i; do test -f $${i%.in} && rm -f $${i%.in}; done || true
+ find MonetDB-XQuery-* -perm -0100 -type f ! -name \*.bat ! -name \*.sh
! -exec grep -q '^#!' {} \; -exec chmod a-x {} \;
+ find MonetDB-XQuery-* -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-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
