Update of /cvsroot/monetdb/geom
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22301/geom
Modified Files:
MonetDB-geom.spec.in RunMapprove.bat.in RunMapprove.in
RunMserver.bat.in RunMtest.bat.in RunMtest.in rpm.mk.in
Log Message:
With MonetDB4 support for SQL & GEOM being history,
there is no need to have MonetDB5 as conditional back-end;
MonetDB5 now is the mandatory, default, "hard-wired" back-end.
For convenience, the changes are wrapped in CVS tags
"explicit_MonetDB5" & "implicit_MonetDB5".
U RunMserver.bat.in
Index: RunMserver.bat.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMserver.bat.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- RunMserver.bat.in 29 Oct 2008 18:51:59 -0000 1.4
+++ RunMserver.bat.in 29 Oct 2008 23:05:52 -0000 1.5
@@ -2,25 +2,20 @@
setlocal
-rem M5 is default;
-if "@HAVE_MONETDB5_FALSE@" == "#" set V=5
-rem commandline option overrules default
-if "%1" == "-5" set V=5& shift
-
set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
-if %V% == 5 call "%monetdb5_prefix%\bin\monetdb5-config.bat" --internal
+call "%monetdb5_prefix%\bin\monetdb5-config.bat" --internal
call "%sql_prefix%\bin\monetdb-sql-config.bat" --internal
set [EMAIL PROTECTED]@
set MOD_PATH=%modpath%
-if %V% == 5 set MOD_PATH=%modpath5%;%MOD_PATH%
+set MOD_PATH=%modpath5%;%MOD_PATH%
set MOD_PATH=%builddir%\src\sql;%MOD_PATH%
-set MOD_PATH=%builddir%\src\monetdb%V%;%MOD_PATH%
-set MOD_PATH=%builddir%\src\monetdb%V%\.libs;%MOD_PATH%
+set MOD_PATH=%builddir%\src\monetdb5;%MOD_PATH%
+set MOD_PATH=%builddir%\src\monetdb5\.libs;%MOD_PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\conf;%PATH%
@@ -28,8 +23,6 @@
rem to find geos_c.dll
set PATH=%GEOS%\bin;%PATH%
-if %V% == 5 set mserver=mserver5.exe
-
-%mserver% --set "monet_mod_path=%MOD_PATH%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+mserver5.exe --set "monet_mod_path=%MOD_PATH%" %1 %2 %3 %4 %5 %6 %7 %8 %9
endlocal
U MonetDB-geom.spec.in
Index: MonetDB-geom.spec.in
===================================================================
RCS file: /cvsroot/monetdb/geom/MonetDB-geom.spec.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- MonetDB-geom.spec.in 29 Oct 2008 18:51:59 -0000 1.8
+++ MonetDB-geom.spec.in 29 Oct 2008 23:05:52 -0000 1.9
@@ -27,7 +27,6 @@
Source: http://downloads.sourceforge.net/monetdb/MonetDB-geom-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-%{!?_with_monetdb5: %{!?_without_monetdb5: %define _with_monetdb5
--with-monetdb5}}
%if !%{?buildsystem}
BuildRequires: MonetDB-devel >= 1.25
@@ -46,7 +45,6 @@
This package contains the common parts of the GIS (Geographic
Information System) extensions for MonetDB-SQL.
-%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
%package MonetDB5
Summary: MonetDB5 SQL GIS modules
Group: Applications/Databases
@@ -70,15 +68,12 @@
This package contains the GIS (Geographic Information System)
extensions for MonetDB-SQL-server5.
-%endif
%package devel
Summary: MonetDB SQL GIS development package
Group: Applications/Databases
-%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
Requires: %{name}-MonetDB5
Requires: MonetDB5-server-devel
-%endif
Requires: MonetDB-devel
Requires: geos-devel
@@ -105,8 +100,7 @@
--enable-bits=%{bits} \
%{?oid32:--enable-oid32} \
%{?comp_cc:CC="%{comp_cc}"} \
- --with-monetdb=%{_prefix} \
- %{?_with_monetdb5} %{?_without_monetdb5}
+ --with-monetdb=%{_prefix}
make
@@ -124,17 +118,13 @@
%files
%defattr(-,root,root)
%{_datadir}/MonetDB/sql/geom.sql
-%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
%files MonetDB5
%{_libdir}/MonetDB5/lib/lib_geom.so.*
%{_libdir}/MonetDB5/geom.mal
-%endif
%files devel
%{_bindir}/monetdb-geom-config
-%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
%{_libdir}/MonetDB5/lib/lib_geom.so
-%endif
%changelog
* Tue May 27 2008 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL PROTECTED]
U RunMapprove.in
Index: RunMapprove.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMapprove.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- RunMapprove.in 29 Oct 2008 19:00:40 -0000 1.5
+++ RunMapprove.in 29 Oct 2008 23:05:52 -0000 1.6
@@ -22,15 +22,6 @@
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
-# default back-end is MonetDB5
-V=5
-for arg
-do
- case "$arg" in
- -5) V=5;;
- esac
-done
-
# enhance PATH to find ${pkg}-config
PATH="${builddir}/conf:$PATH"
export PATH
@@ -41,4 +32,4 @@
# execute the script.
# if no arguments, do a recursive approve (Mapprove.py -r), else pass
# on the arguments
-exec Mapprove.py -$V --package=${pkg} --TSTTRGBASE="${builddir}" "[EMAIL
PROTECTED]"
+exec Mapprove.py --package=${pkg} --TSTTRGBASE="${builddir}" "[EMAIL
PROTECTED]"
U RunMtest.bat.in
Index: RunMtest.bat.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMtest.bat.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- RunMtest.bat.in 29 Oct 2008 18:51:59 -0000 1.5
+++ RunMtest.bat.in 29 Oct 2008 23:05:52 -0000 1.6
@@ -8,15 +8,10 @@
setlocal
-rem M5 is default;
-if "@HAVE_MONETDB5_FALSE@" == "#" set V=5
-rem commandline option overrules default
-if "%1" == "-5" set V=5& shift
-
set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
-if %V% == 5 call "%monetdb5_prefix%\bin\monetdb5-config.bat" --internal
+call "%monetdb5_prefix%\bin\monetdb5-config.bat" --internal
call "%sql_prefix%\bin\monetdb-sql-config.bat" --internal
set pkg=monetdb-geom
@@ -24,11 +19,11 @@
set [EMAIL PROTECTED]@
set MOD_PATH=%modpath%
-if %V% == 5 set MOD_PATH=%modpath5%;%MOD_PATH%
+set MOD_PATH=%modpath5%;%MOD_PATH%
set MOD_PATH=%builddir%\src\sql;%MOD_PATH%
-set MOD_PATH=%builddir%\src\monetdb%V%;%MOD_PATH%
-set MOD_PATH=%builddir%\src\monetdb%V%\.libs;%MOD_PATH%
+set MOD_PATH=%builddir%\src\monetdb5;%MOD_PATH%
+set MOD_PATH=%builddir%\src\monetdb5\.libs;%MOD_PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\conf;%PATH%
@@ -39,7 +34,7 @@
REM execute Mtest.py in the source directory
pushd %srcdir%
-call Mtest.py -%V% "--package=%pkg%" "--monet_mod_path=%MOD_PATH%"
"--dbfarm=%builddir%\dbfarm" "--sql_logdir=%builddir%\sql_logs"
"--xquery_logdir=%builddir%\xquery_logs" "--TSTTRGBASE=%builddir%" %1 %2 %3 %4
%5 %6 %7 %8 %9
+call Mtest.py "--package=%pkg%" "--monet_mod_path=%MOD_PATH%"
"--dbfarm=%builddir%\dbfarm" "--sql_logdir=%builddir%\sql_logs"
"--xquery_logdir=%builddir%\xquery_logs" "--TSTTRGBASE=%builddir%" %1 %2 %3 %4
%5 %6 %7 %8 %9
popd
endlocal
U RunMtest.in
Index: RunMtest.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMtest.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- RunMtest.in 29 Oct 2008 18:51:59 -0000 1.12
+++ RunMtest.in 29 Oct 2008 23:05:52 -0000 1.13
@@ -23,23 +23,13 @@
srcdir=`cd '@srcdir@'; pwd`
uname=`uname`
-# M5 is default;
[EMAIL PROTECTED]@V=5
-# commandline option overrules default
-for arg
-do
- case "$arg" in
- -5) V=5;;
- esac
-done
-
# where compiled modules are to be found
-for d in src/monetdb$V
+for d in src/monetdb5
do
MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
done
-MOD_PATH="${MOD_PATH}`monetdb$V-config --modpath`"
-MOD_PATH="${MOD_PATH}:`monetdb-sql-config --modpath$V`"
+MOD_PATH="${MOD_PATH}`monetdb5-config --modpath`"
+MOD_PATH="${MOD_PATH}:`monetdb-sql-config --modpath5`"
# make sure scripts are executable
for x in "${builddir}/conf/${pkg}-config"
@@ -85,4 +75,4 @@
# arguments.
# if the environment variable MTEST_AT is set (value does not matter), pass
# the --at flag to Mtest.py so that it uses the at command as a watchdog.
-exec Mtest.py -$V --package=${pkg} --monet_mod_path="${MOD_PATH}"
--dbfarm="${builddir}/dbfarm" --sql_logdir="${builddir}/sql_logs"
--xquery_logdir="${builddir}/xquery_logs" --TSTTRGBASE="${builddir}"
${MTEST_AT+--at} "[EMAIL PROTECTED]"
+exec Mtest.py --package=${pkg} --monet_mod_path="${MOD_PATH}"
--dbfarm="${builddir}/dbfarm" --sql_logdir="${builddir}/sql_logs"
--xquery_logdir="${builddir}/xquery_logs" --TSTTRGBASE="${builddir}"
${MTEST_AT+--at} "[EMAIL PROTECTED]"
U RunMapprove.bat.in
Index: RunMapprove.bat.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMapprove.bat.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- RunMapprove.bat.in 29 Oct 2008 19:00:39 -0000 1.3
+++ RunMapprove.bat.in 29 Oct 2008 23:05:52 -0000 1.4
@@ -8,10 +8,6 @@
setlocal
-rem default back end is MonetDB5
-set V=5
-if "%1" == "-5" set V=5& shift
-
set pkg=monetdb-sql
set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
@@ -21,7 +17,7 @@
REM execute Mapprove.py in the source directory
pushd %srcdir%
-call Mapprove.py -%V% "--package=%pkg%" "--TSTTRGBASE=%builddir%" %1 %2 %3 %4
%5 %6 %7 %8 %9
+call Mapprove.py "--package=%pkg%" "--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6
%7 %8 %9
popd
endlocal
U rpm.mk.in
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/geom/rpm.mk.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rpm.mk.in 29 Oct 2008 18:51:59 -0000 1.6
+++ rpm.mk.in 29 Oct 2008 23:05:52 -0000 1.7
@@ -19,9 +19,6 @@
rpmtopdir = $(shell cd $(top_builddir) && pwd)/rpm
[EMAIL PROTECTED]@monetdb5=--without monetdb5
[EMAIL PROTECTED]@monetdb5=--with monetdb5
-
$(top_builddir)/$(distdir).tar.gz:
$(MAKE) $(AM_MAKEFLAGS) dist
@@ -43,14 +40,14 @@
if test "@oids@" -eq 32; then echo "%oid32 1" >>
$(rpmtopdir)/rpmmacros; fi
rpm: MonetDB-geom.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --target `uname -m`
${monetdb5} --define="buildsystem 1" --define="comp_cc @CC@"
$(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --target `uname -m`
--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-geom.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ts ${monetdb5}
--define="buildsystem 1" $(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ts --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
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
