Changeset: 447a741737fe for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=447a741737fe
Modified Files:
MonetDB.spec
MonetDB/src/Makefile.ag
MonetDB/src/common/Makefile.ag
MonetDB/src/common/getopt.c
MonetDB/src/common/getopt1.c
MonetDB/src/common/monet_getopt.h
MonetDB/src/common/monet_options.mx
MonetDB/src/common/monetdb-mutils.pc.in
MonetDB/src/gdk/Makefile.ag
MonetDB4/src/mapi/Makefile.ag
MonetDB4/src/modules/calibrator/Makefile.ag
MonetDB4/src/modules/contrib/Makefile.ag
MonetDB4/src/modules/mnetcdf/Makefile.ag
MonetDB4/src/modules/plain/Makefile.ag
MonetDB4/src/monet/Makefile.ag
MonetDB4/src/tools/Makefile.ag
MonetDB5/src/extras/compiler/Makefile.ag
MonetDB5/src/extras/crackers/Makefile.ag
MonetDB5/src/extras/rdf/Makefile.ag
MonetDB5/src/extras/sphinx/Makefile.ag
MonetDB5/src/extras/xml/Makefile.ag
MonetDB5/src/mal/Makefile.ag
MonetDB5/src/modules/atoms/Makefile.ag
MonetDB5/src/modules/kernel/Makefile.ag
MonetDB5/src/modules/mal/Makefile.ag
MonetDB5/src/optimizer/Makefile.ag
MonetDB5/src/scheduler/Makefile.ag
MonetDB5/src/tools/Makefile.ag
clients/src/examples/C/Makefile.ag
clients/src/mapiclient/Makefile.ag
clients/src/mapilib/Makefile.ag
clients/src/odbc/driver/Makefile.ag
clients/src/perl/Cimpl/Makefile.ag
common/Makefile.ag
geom/src/lib/Makefile.ag
geom/src/monetdb4/Makefile.ag
geom/src/monetdb5/Makefile.ag
pathfinder/compiler/Makefile.ag
pathfinder/compiler/algebra-m5sql/Makefile.ag
pathfinder/compiler/algebra/Makefile.ag
pathfinder/compiler/algebra/map/Makefile.ag
pathfinder/compiler/algebra/opt/Makefile.ag
pathfinder/compiler/algebra/prop/Makefile.ag
pathfinder/compiler/core/Makefile.ag
pathfinder/compiler/debug/Makefile.ag
pathfinder/compiler/mem/Makefile.ag
pathfinder/compiler/mil/Makefile.ag
pathfinder/compiler/parser/Makefile.ag
pathfinder/compiler/schema/Makefile.ag
pathfinder/compiler/semantics/Makefile.ag
pathfinder/compiler/sql/Makefile.ag
pathfinder/compiler/utils/Makefile.ag
pathfinder/compiler/xmlimport/Makefile.ag
pathfinder/modules/geoxml/Makefile.ag
pathfinder/modules/pftijah/Makefile.ag
pathfinder/modules/pftijah/tjc/Makefile.ag
pathfinder/modules/probxml/Makefile.ag
pathfinder/runtime/Makefile.ag
pathfinder/runtime5/Makefile.ag
pathfinder/src/sqlhelpers/xmlshred/Makefile.ag
pathfinder/src/tools/Makefile.ag
sql/src/backends/monet5/Makefile.ag
sql/src/backends/monet5/merovingian/client/Makefile.ag
sql/src/backends/monet5/merovingian/daemon/Makefile.ag
sql/src/backends/monet5/merovingian/utils/Makefile.ag
sql/src/backends/monet5/vaults/Makefile.ag
sql/src/common/Makefile.ag
sql/src/server/Makefile.ag
sql/src/storage/Makefile.ag
sql/src/storage/bat/Makefile.ag
sql/src/storage/bpm/Makefile.ag
sql/src/storage/m4/Makefile.ag
sql/src/storage/restrict/Makefile.ag
Branch: default
Log Message:
move monet_options and getopt to common/options
Remove the last few entries from MonetDB/src/common, and put the
monet_options and getopt replacements in common/options where a
libmoptions is built that is used internally in the project only. This
drops the mutils library that used to be available before.
diffs (truncated from 3000 to 300 lines):
diff -r f60618611f92 -r 447a741737fe MonetDB.spec
--- a/MonetDB.spec Fri Jan 14 14:27:50 2011 +0100
+++ b/MonetDB.spec Fri Jan 14 14:36:54 2011 +0100
@@ -469,7 +469,6 @@
%files
%defattr(-,root,root)
%{_libdir}/libbat.so.*
-%{_libdir}/libmutils.so.*
%{_libdir}/libstream.so.*
%files devel
diff -r f60618611f92 -r 447a741737fe MonetDB/src/Makefile.ag
--- a/MonetDB/src/Makefile.ag Fri Jan 14 14:27:50 2011 +0100
+++ b/MonetDB/src/Makefile.ag Fri Jan 14 14:36:54 2011 +0100
@@ -17,4 +17,4 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = common gdk
+SUBDIRS = gdk
diff -r f60618611f92 -r 447a741737fe MonetDB/src/common/Makefile.ag
--- a/MonetDB/src/common/Makefile.ag Fri Jan 14 14:27:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +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://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-#
-# 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.
-
-## Process this file with automake to produce Makefile.in
-
-MTSAFE
-
-EXTRA_DIST = monet_getopt.h getopt.c getopt1.c
-
-lib_mutils = {
- NAME = mutils
- SOURCES = monet_options.mx monet_getopt.h
-}
-
-headers_common = {
- DIR = includedir/MonetDB/common
- HEADERS = h
- SOURCES = monet_options.mx monet_getopt.h
-}
-
-headers_pc = {
- COND = NOT_WIN32
- HEADERS = pc
- DIR = libdir/pkgconfig
- SOURCES = monetdb-mutils.pc.in
-}
diff -r f60618611f92 -r 447a741737fe MonetDB/src/common/getopt.c
--- a/MonetDB/src/common/getopt.c Fri Jan 14 14:27:50 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,956 +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://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
- *
- * 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.
- */
-
-/* Getopt for GNU.
- NOTE: getopt is now part of the C library, so if you don't know what
- "Keep this file name-space clean" means, talk to drep...@gnu.org
- before changing it!
- Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001
- Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
- Ditto for AIX 3.2 and <stdlib.h>. */
-#ifndef _NO_PROTO
-# define _NO_PROTO
-#endif
-
-#include <monetdb_config.h>
-
-#if 0 /* already taken care of in config.h */
-#if !defined __STDC__ || !__STDC__
-/* This is a separate conditional since some stdc systems
- reject `defined (const)'. */
-# ifndef const
-# define const
-# endif
-#endif
-#endif
-
-#include <stdio.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
- actually compiling the library itself. This code is part of the GNU C
- Library, but also included in many other GNU distributions. Compiling
- and linking in this code is a waste when using the GNU C library
- (especially if it is a shared library). Rather than having every GNU
- program understand `configure --with-gnu-libc' and omit the object files,
- it is simpler to just do this in the source for each such file. */
-
-#define GETOPT_INTERFACE_VERSION 2
-#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
-# include <gnu-versions.h>
-# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
-# define ELIDE_CODE
-# endif
-#endif
-
-#ifndef ELIDE_CODE
-
-
-/* This needs to come after some library #include
- to get __GNU_LIBRARY__ defined. */
-#ifdef __GNU_LIBRARY__
-/* Don't include stdlib.h for non-GNU C libraries because some of them
- contain conflicting prototypes for getopt. */
-# include <stdlib.h>
-# include <unistd.h>
-#else
-# ifdef _MSC_VER
-# include <stdlib.h>
-# include <io.h>
-# endif
-#endif /* GNU C library. */
-
-#ifdef VMS
-# include <unixlib.h>
-# if HAVE_STRING_H - 0
-# include <string.h>
-# endif
-#endif
-
-#ifndef _
-/* This is for other GNU distributions with internationalized messages. */
-# if defined HAVE_LIBINTL_H || defined _LIBC
-# include <libintl.h>
-# ifndef _
-# define _(msgid) gettext (msgid)
-# endif
-# else
-# define _(msgid) (msgid)
-# endif
-#endif
-
-/* This version of `getopt' appears to the caller like standard Unix `getopt'
- but it behaves differently for the user, since it allows the user
- to intersperse the options with the other arguments.
-
- As `getopt' works, it permutes the elements of ARGV so that,
- when it is done, all the options precede everything else. Thus
- all application programs are extended to handle flexible argument order.
-
- Setting the environment variable POSIXLY_CORRECT disables permutation.
- Then the behavior is completely standard.
-
- GNU application programs can use a third alternative mode in which
- they can distinguish the relative order of options and other arguments. */
-
-#include "monet_getopt.h"
-
-/* For communication from `getopt' to the caller.
- When `getopt' finds an option that takes an argument,
- the argument value is returned here.
- Also, when `ordering' is RETURN_IN_ORDER,
- each non-option ARGV-element is returned here. */
-
-char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
- This is used for communication to and from the caller
- and for communication between successive calls to `getopt'.
-
- On entry to `getopt', zero means this is the first call; initialize.
-
- When `getopt' returns -1, this is the index of the first of the
- non-option elements that the caller should itself scan.
-
- Otherwise, `optind' communicates from one call to the next
- how much of ARGV has been scanned so far. */
-
-/* 1003.2 says this must be 1 before any call. */
-int optind = 1;
-
-/* Formerly, initialization of getopt depended on optind==0, which
- causes problems with re-calling getopt as programs generally don't
- know that. */
-
-int __getopt_initialized;
-
-/* The next char to be scanned in the option-element
- in which the last option character we returned was found.
- This allows us to pick up the scan where we left off.
-
- If this is zero, or a null string, it means resume the scan
- by advancing to the next ARGV-element. */
-
-static char *nextchar;
-
-/* Callers store zero here to inhibit the error message
- for unrecognized options. */
-
-int opterr = 1;
-
-/* Set to an option character which was unrecognized.
- This must be initialized on some systems to avoid linking in the
- system's own getopt implementation. */
-
-int optopt = '?';
-
-/* Describe how to deal with options that follow non-option ARGV-elements.
-
- If the caller did not specify anything,
- the default is REQUIRE_ORDER if the environment variable
- POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
- REQUIRE_ORDER means don't recognize them as options;
- stop option processing when the first non-option is seen.
- This is what Unix does.
- This mode of operation is selected by either setting the environment
- variable POSIXLY_CORRECT, or using `+' as the first character
- of the list of option characters.
-
- PERMUTE is the default. We permute the contents of ARGV as we scan,
- so that eventually all the non-options are at the end. This allows options
- to be given in any order, even with programs that were not written to
- expect this.
-
- RETURN_IN_ORDER is an option available to programs that were written
- to expect options and other ARGV-elements in any order and that care about
- the ordering of the two. We describe each non-option ARGV-element
- as if it were the argument of an option with character code 1.
- Using `-' as the first character of the list of option characters
- selects this mode of operation.
-
- The special argument `--' forces an end of option-scanning regardless
- of the value of `ordering'. In the case of RETURN_IN_ORDER, only
- `--' can cause `getopt' to return -1 with `optind' != ARGC. */
-
-static enum {
- REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
-} ordering;
-
-/* Value of POSIXLY_CORRECT environment variable. */
-static char *posixly_correct;
-
-#ifdef __GNU_LIBRARY__
-/* We want to avoid inclusion of string.h with non-GNU libraries
- because there are many ways it can cause trouble.
- On some systems, it contains special magic macros that don't work
- in GCC. */
-# include <string.h>
-# define my_index strchr
-#else
-
-# if HAVE_STRING_H
-# include <string.h>
-# else
-# include <strings.h>
-# endif
-
-/* Avoid depending on library functions or files
- whose names are inconsistent. */
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
