Changeset: 47c42f1eeb55 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=47c42f1eeb55
Modified Files:
Makefile.ag
template/ChangeLog-Archive
template/ChangeLog.Apr2011
template/ChangeLog.Aug2011
template/ChangeLog.Jun2010
template/ChangeLog.Mar2011
template/ChangeLog.Oct2010
template/Makefile.ag
template/README5
template/RunMapprove.in
template/RunMtest.in
template/bootstrap
template/conf/Makefile.ag
template/conf/Tests/All
template/conf/Tests/monetdb-template-conds.bat
template/conf/Tests/monetdb-template-conds.sh
template/conf/Tests/monetdb-template-conds.stable.err
template/conf/Tests/monetdb-template-conds.stable.out.32bit
template/conf/Tests/monetdb-template-conds.stable.out.64bit
template/conf/Tests/monetdb-template-conds.stable.out.Debian4.0.32bit
template/conf/Tests/monetdb-template-conds.stable.out.SunOS5.11.32bit
template/conf/monetdb-template-config.in
template/configure.ag
template/de-bootstrap
template/rpm.mk.in
template/src/Makefile.ag
template/src/example.sql
template/src/monetdb5/Makefile.ag
template/src/monetdb5/Tests/All
template/src/monetdb5/Tests/hello.mal
template/src/monetdb5/Tests/hello.stable.err
template/src/monetdb5/Tests/hello.stable.out
template/src/monetdb5/example.c
template/src/monetdb5/example.h
template/src/monetdb5/example.mal
Branch: Aug2011
Log Message:
remove template
template is obsolete, outdated, and its tests aren't working. Once we
know how to do it again (or want to invest time here), we can easily
revive it, or just start from scratch to comply to our current
practices.
diffs (truncated from 1255 to 300 lines):
diff --git a/Makefile.ag b/Makefile.ag
--- a/Makefile.ag
+++ b/Makefile.ag
@@ -27,4 +27,4 @@
EXTRA_DIST = bootstrap configure configure.ac configure.ag libversions \
MonetDB.spec rpm.mk.in COPYING README license.txt
HowToStart.rst
-EXTRA_DIST_DIR = NT debian template
+EXTRA_DIST_DIR = NT debian
diff --git a/template/ChangeLog-Archive b/template/ChangeLog-Archive
deleted file mode 100644
--- a/template/ChangeLog-Archive
+++ /dev/null
@@ -1,20 +0,0 @@
-# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
-# This file contains past ChangeLog entries
-
-* Wed Mar 31 2010 Stefan Manegold <[email protected]> - 0.15.5-20100823
-- Made compilation of "testing" (and "java") independent of MonetDB.
- This is mainly for Windows, but also on other systems, "testing" can
- now be built independently of (and hence before) "MonetDB". Files
- that mimic configure functionality on Windows were moved from
- "MonetDB" to "buildtools"; hence, this affects all packages on
- Windows, requiring a complete rebuild from scratch on Windows.
- getopt() support in testing has changed; hence, (most probably)
- requiring a rebuild from scratch of testing on other systems.
-
-* Wed Mar 24 2010 Stefan Manegold <[email protected]> - 0.15.5-20100823
-- Implemented build directory support for Windows, i.e., like on
- Unix/Linux also on Windows we can now build in a separate build
- directory as alternative to ...\<package>\NT, and thus keep the latter
- clean from files generated during the build. On Windows, the build
- directory must be a sibling of ...\<package>\NT .
-
diff --git a/template/ChangeLog.Apr2011 b/template/ChangeLog.Apr2011
deleted file mode 100644
--- a/template/ChangeLog.Apr2011
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for template
-# This file is updated with Maddlog
-
diff --git a/template/ChangeLog.Aug2011 b/template/ChangeLog.Aug2011
deleted file mode 100644
--- a/template/ChangeLog.Aug2011
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for template
-# This file is updated with Maddlog
-
diff --git a/template/ChangeLog.Jun2010 b/template/ChangeLog.Jun2010
deleted file mode 100644
--- a/template/ChangeLog.Jun2010
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for template
-# This file is updated with Maddlog
-
diff --git a/template/ChangeLog.Mar2011 b/template/ChangeLog.Mar2011
deleted file mode 100644
--- a/template/ChangeLog.Mar2011
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for template
-# This file is updated with Maddlog
-
diff --git a/template/ChangeLog.Oct2010 b/template/ChangeLog.Oct2010
deleted file mode 100644
--- a/template/ChangeLog.Oct2010
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for template
-# This file is updated with Maddlog
-
diff --git a/template/Makefile.ag b/template/Makefile.ag
deleted file mode 100644
--- a/template/Makefile.ag
+++ /dev/null
@@ -1,30 +0,0 @@
-# The contents of this file are subject to the MonetDB Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.monetdb.org/Legal/MonetDBLicense
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-#
-# The Original Code is the MonetDB Database System.
-#
-# The Initial Developer of the Original Code is CWI.
-# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-# Copyright August 2008-2011 MonetDB B.V.
-# All Rights Reserved.
-
-SUBDIRS = conf src
-
-EXTRA_DIST = RunMtest.in RunMapprove.in rpm.mk.in
-
-TESTS = RunMtest
-TESTS_ENVIRONMENT = $(SHELL)
-
-scripts_sh = {
- EXT = ""
- COND = NOT_WIN32
- NOINST
- SOURCES = RunMapprove.in RunMtest.in
-}
diff --git a/template/README5 b/template/README5
deleted file mode 100644
--- a/template/README5
+++ /dev/null
@@ -1,126 +0,0 @@
-
-This "template" directory contains the nessesary configure files and scripts
-to build a simple example module (src/example.mx) for the MonetDB database
-engine.
-
-
-Prerequisites
-=============
-
-Before compiling the "example" module, make sure you have version 4.10.3 (or
-newer) of MonetDB installed, and "monetdb-config" is reachable via your
-$PATH.
-See http://www.monetdb.org/ for details.
-
-Further, make sure that you also have the "buildtools" installed, and
-"autogen.py", "Mx" and "mel" are reachable via your $PATH.
-You can get the "buildtools" via
- cvs -d:pserver:[email protected]:/cvsroot/monetdb
checkout -P -rMonetDB_4-10 buildtools
-See the buildtools' README file for more details.
-
-
-Compilation
-===========
-
-In the following, we use <SOURCE> for the absolute path of the directory
-where this README file resides in.
-
-Further, be <BUILD> the absolute path of some (temporary) directory, where
-the source code will be compiled; preferably <BUILD> != <SOURCE>; e.g.
-<BUILD> = <SOURCE>/Build .
-
-Finally, be <PREFIX> the prefix of the absolute path of target directory
-where you'd like to install the "example" module in, i.e., the module will
-finally be installed in <PREFIX>/lib(64)/MonetDB/ .
-
-To compile the "example" module for the first time, simply execute the
-following commands:
-
- cd <SOURCE>
- ./bootstrap
- cd <BUILD>
- <SOURCE>/configure --prefix=<PREFIX>
- make
- make install
-
-To re-compile the "example" module (e.g., after you modified the source
-code), you can skip the `bootstrap` and `configure` calls, and simply call
-`make && make install` in <BUILD> .
-
-
-Usage
-=====
-
-In case the compilation worked well, you can start MonetDB and load the
-"example" module as follows (assuming "mserver5" and
-"monetdb-template-config" are reachable via your $PATH), e.g.:
-
- mserver5 --set monet_mod_path=`monetdb5-config
--modpath`:`monetdb-template-config --modpath5` --dbinit='include example;'
-
-Alternatively, you can add
-<PREFIX>/lib(64)/MonetDB5:<PREFIX>/lib(64)/MonetDB5/lib
-to the "monet_mod_path" in your MonetDB config file.
-
-In case the <PREFIX> for the "example" module is identical with the prefix
-where MonetDB is installed, you don't have to set/edit the "monet_mod_path"
-at all.
-
-
-Source Distribution
-===================
-
-To create a source distribution of the "example" module that can be compiled
-without requiring the "buildtools" (obviously, MonetDB is still required),
-simply follow the "Compilation" instructions above, and then call
-`make dist` in <BUILD> .
-This will create a "template-0.1.3.tar.gz" in <BUILD>, which can then be
-distributed.
-From this source distribution, compilation works just as above, except that
-the `bootstrap` has to be skipped.
-
-
-
-
-
----- In practice ----
-
-Obviously, this generates a configured template directory.
-Some dependencies exist that you'd better change manually now.
-
-First, the template assumes there is a file src/Tests/All; which should
-identify this package uniquely from the AC_INIT clause in configure.ag.
-Similarly, it produces a template_config.h with additional includes.
-
-Change those to your preferences by:
- 1. Edit AC_INIT, AM_INIT_AUTOMAKE and AM_CONFIG_HEADER in configure.ag with
setup
- information for your own module
- 2. Edit the EXTRA_HEADERS line in Makefile.ag accordingly
- 3. Optionally, add a call to additional m4 scripts, and copy those into the
conf dir
- (e.g., if a library interfaces to a separately developed library, such as
GSL).
-
----- Usage trick: ----
-
-To get an existing directory setup with these files,
-e.g. MODDEVDIR=/ufs/arjen/src/CWITV/monet/array,
-proceed as follows.
-First, check out this template dir and cd into it (MODTDIR);
-then do (in a bash-like shell):
-
- MODDEVDIR=/ufs/arjen/src/CWITV/monet/array
- MODTDIR=`pwd`
-
- find . -type d \( -name . -o -name CVS -prune -o \
- -exec echo /bin/mkdir -p ${MODDEVDIR}/{} \; \) > /tmp/t.sh
- find . \( -type d -name CVS -o -name example.mx -o -name README \) -prune
-o \
- -type f -exec echo /bin/cp -f --backup ${MODTDIR}/{}
${MODDEVDIR}/\`dirname {}\` \; >> /tmp/t.sh
- echo pushd ${MODDEVDIR} >> /tmp/t.sh
- find . -type d \( -name . -o -name CVS -prune -o \
- -exec echo cvs add {} \; \) >> /tmp/t.sh
- find . \( -type d -name CVS -o -name example.mx -o -name README \) -prune
-o \
- -type f -exec echo cvs add {} \; >> /tmp/t.sh
- echo popd >> /tmp/t.sh
-
-Check the script manually, or just do it :)
- . /tmp/t.sh
-If you had a Makefile.ag pre-existing in the src target dir, then it may be
overwritten;
-yet a copy is made thanks to the --backup flag used on cp, so do not worry!
diff --git a/template/RunMapprove.in b/template/RunMapprove.in
deleted file mode 100755
--- a/template/RunMapprove.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-# The contents of this file are subject to the MonetDB Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.monetdb.org/Legal/MonetDBLicense
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-#
-# The Original Code is the MonetDB Database System.
-#
-# The Initial Developer of the Original Code is CWI.
-# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-# Copyright August 2008-2011 MonetDB B.V.
-# All Rights Reserved.
-
-pkg=template
-buildbase=@QBUILD@
-builddir="${buildbase}/template"
-# make sure srcdir contains absolute path name
-srcdir=`cd '@srcdir@'; pwd`
-
-# default back-end is monetdb4
-V=4
-for arg
-do
- case "$arg" in
- -4) V=4;;
- -5) V=5;;
- esac
-done
-
-PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
-export PYTHONPATH
-
-# execute Mapprove.py in the source directory
-cd "$srcdir"
-
-# execute the script.
-# if no arguments, do a recursive approve (Mapprove.py -r), else pass
-# on the arguments
-exec python "${buildbase}/testing/Mapprove.py" -$V --package=${pkg}
--TSTTRGBASE="${builddir}" "${@--r}"
diff --git a/template/RunMtest.in b/template/RunMtest.in
deleted file mode 100755
--- a/template/RunMtest.in
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# The contents of this file are subject to the MonetDB Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
