getdata-commits Mailing List for GetData (Page 18)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 510
          http://getdata.svn.sourceforge.net/getdata/?rev=510&view=rev
Author:   ketiltrout
Date:     2011-03-12 03:46:23 +0000 (Sat, 12 Mar 2011)

Log Message:
-----------
Add rules (and files) for making a stand-alone idl_getdata package.

Modified Paths:
--------------
    trunk/getdata/ChangeLog
    trunk/getdata/Makefile.am
    trunk/getdata/bindings/idl/Makefile.am
    trunk/getdata/bindings/idl/getdata.c
    trunk/getdata/bindings/idl/makedlm.sh.in
    trunk/getdata/bindings/python/pyentry.c
    trunk/getdata/configure.ac
    trunk/getdata/m4/idl.m4
    trunk/getdata/src/Makefile.am

Added Paths:
-----------
    trunk/getdata/bindings/idl/package/
    trunk/getdata/bindings/idl/package/Makefile.am
    trunk/getdata/bindings/idl/package/README
    trunk/getdata/bindings/idl/package/configure.ac
    trunk/getdata/m4/version.m4

Property Changed:
----------------
    trunk/getdata/


Property changes on: trunk/getdata
___________________________________________________________________
Modified: svn:ignore
   - Makefile
Makefile.in
aclocal.m4
autom4te.cache
config.log
config.guess
config.status
config.sub
configure
depcomp
getdata-*.tar.gz
getdata-*.tar.bz2
getdata-*.sig
install-sh
libtool
ltmain.sh
missing
*.swp
libltdl
README.txt
config.lt
compile

   + Makefile
Makefile.in
aclocal.m4
autom4te.cache
config.log
config.guess
config.status
config.sub
configure
depcomp
getdata-*.tar.gz
getdata-*.tar.bz2
getdata-*.sig
idl_getdata-*.tar.gz
idl_getdata-*.tar.bz2
idl_getdata-*.sig
install-sh
libtool
ltmain.sh
missing
*.swp
libltdl
README.txt
config.lt
compile


Modified: trunk/getdata/ChangeLog
===================================================================

--- trunk/getdata/ChangeLog	2011-03-05 04:08:48 UTC (rev 509)
+++ trunk/getdata/ChangeLog	2011-03-12 03:46:23 UTC (rev 510)
@@ -1,3 +1,14 @@
+2011-03-03   D. V. Wiebe <ge...@ke...>   svn:510
+	* m4/idl.m4: Munge IDL_LIBS to convert "-m <arg>" into "-m<arg>" since
+		libtool seems to delete <arg> if that's not the case.
+	* m4/version.m4: Added.
+	* bindings/idl/package: Added.
+	* bindings/idl/Makefile.am bindings/idl/getdata.c: Update for external build.
+	* configure.ac: Shipped version stuff off into m4/version.m4
+	* Makefile.am: Add rules for making idl_getdata package.
+
+	* bindings/idl/makedlm.sh.in: Handle missing keyword "KEYWORD" better.
+
 2011-02-26   D. V. Wiebe <ge...@ke...>   svn:507
 	* m4/python.m4 m4/encoding.m4 m4/idl.m4 configure.ac: Fix double quoting
 	of brackets.

Modified: trunk/getdata/Makefile.am
===================================================================
--- trunk/getdata/Makefile.am	2011-03-05 04:08:48 UTC (rev 509)
+++ trunk/getdata/Makefile.am	2011-03-12 03:46:23 UTC (rev 510)
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 D. V. Wiebe
+# Copyright (C) 2008, 2011 D. V. Wiebe
 #
 ##########################################################################
 #
@@ -36,12 +36,42 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --with-idl-dlm-dir="$$dc_install_base/idl"
 
+# idl-only package
+idl_$(distdir).tar.bz2 idl_$(distdir).tar.gz: idldist
+
+idldist: $(DISTFILES)
+	rm -rf idl_getdata
+	mkdir idl_getdata
+	mkdir idl_getdata/m4
+	mkdir idl_getdata/src
+	cp bindings/idl/package/* idl_getdata
+	cp -r bindings/idl/Makefile.am bindings/idl/makedlm.sh.in \
+		bindings/idl/getdata.c bindings/idl/test idl_getdata/src
+	cp -r bindings/make_parameters.c idl_getdata
+	cp -r m4/idl.m4 m4/compiler.m4 m4/ax_compare_version.m4 m4/version.m4 \
+		idl_getdata/m4
+	cp -r doc/README.idl COPYING AUTHORS ChangeLog INSTALL NEWS idl_getdata
+	( cd idl_getdata && \
+		aclocal -I m4 && \
+		libtoolize && \
+		autoconf && \
+		autoheader && \
+		automake --add-missing --force-missing && \
+		./configure && \
+		make dist && \
+		cp idl_${distdir}* .. \
+	)
+	rm -rf idl_getdata
+
 # release stuff
 README.txt: NEWS RELEASE_NOTES.in
 	cp -f RELEASE_NOTES.in $@ 
 	head -n `grep -nm 1 '^|' NEWS | awk 'BEGIN {FS=":"} {print $$1-1}'` NEWS >> $@
 
-dist-post: $(distdir).tar.gz.sig $(distdir).tar.bz2.sig
+dist-post: $(distdir).tar.gz.sig $(distdir).tar.bz2.sig \
+	idl_$(distdir).tar.gz.sig idl_$(distdir).tar.bz2.sig
 
-dist-push:  $(distdir).tar.gz.sig $(distdir).tar.bz2.sig $(distdir).tar.gz $(distdir).tar.bz2 README.txt
+dist-push:  $(distdir).tar.gz.sig $(distdir).tar.bz2.sig \
+	$(distdir).tar.gz $(distdir).tar.bz2 idl_$(distdir).tar.gz.sig \
+	idl_$(distdir).tar.bz2.sig README.txt
 	rsync -avP -e ssh $^ $(SFUSER),ge...@fr...:/home/frs/project/g/ge/getdata/getdata/$(PACKAGE_VERSION)/

Modified: trunk/getdata/bindings/idl/Makefile.am
===================================================================
--- trunk/getdata/bindings/idl/Makefile.am	2011-03-05 04:08:48 UTC (rev 509)
+++ trunk/getdata/bindings/idl/Makefile.am	2011-03-12 03:46:23 UTC (rev 510)
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 D. V. Wiebe
+# Copyright (C) 2009, 2011 D. V. Wiebe
 #
 ##########################################################################
 #
@@ -30,15 +30,21 @@
 
 SUBDIRS=test
 
+if GDIDL_EXTERNAL
+GDIDL_GETDATA_LIBS=$(GETDATA_LIBS)
+else
+GDIDL_GETDATA_LIBS=../../src/libgetdata.la
+endif
+
 idl_LTLIBRARIES = idl_getdata.la
 nodist_idl_HEADERS = idl_getdata.dlm
 
 # idl makes heavy use of type punning, ergo -fno-strict-aliasing
-AM_CFLAGS = ${WALL} $(IDL_CFLAGS) -fno-strict-aliasing
+AM_CFLAGS = ${WALL} $(IDL_CFLAGS) -fno-strict-aliasing $(GETDATA_CFLAGS)
 BUILT_SOURCES=sublist.c constants.c
 idl_getdata_la_LDFLAGS = -module -avoid-version -export-symbols-regex IDL_Load \
-												 -precious-files-regex 'idl_getdata\.dlm'
-idl_getdata_la_LIBADD = $(IDL_LIBS) ../../src/libgetdata.la
+												 -precious-files-regex 'idl_getdata\.dlm' $(IDL_LIBS)
+idl_getdata_la_LIBADD = $(GDIDL_GETDATA_LIBS)
 idl_getdata_la_SOURCES = getdata.c ${DEBUG_C}
 nodist_idl_getdata_la_SOURCES = constants.c sublist.c
 

Modified: trunk/getdata/bindings/idl/getdata.c
===================================================================
--- trunk/getdata/bindings/idl/getdata.c	2011-03-05 04:08:48 UTC (rev 509)
+++ trunk/getdata/bindings/idl/getdata.c	2011-03-12 03:46:23 UTC (rev 510)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2010 D. V. Wiebe
+/* Copyright (C) 2009-2011 D. V. Wiebe
  *
  ***************************************************************************
  *
@@ -27,8 +27,24 @@
 #undef _POSIX_SOURCE
 #undef _POSIX_C_SOURCE
 #undef _SVID_SOURCE
-#include "../../src/internal.h"
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef GDIDL_EXTERNAL
+# include <complex.h>
+# include <getdata.h>
+# define dtracevoid()
+# define dtrace(...)
+# define dprintf(...)
+# define dreturnvoid()
+# define dreturn(...)
+# define dwatch(...)
+#else
+# include "../../src/internal.h"
+#endif
+
 #define GDIDL_N_DIRFILES 1024
 static DIRFILE* idldirfiles[GDIDL_N_DIRFILES];
 static int idldirfiles_initialised = 0;

Modified: trunk/getdata/bindings/idl/makedlm.sh.in
===================================================================
--- trunk/getdata/bindings/idl/makedlm.sh.in	2011-03-05 04:08:48 UTC (rev 509)
+++ trunk/getdata/bindings/idl/makedlm.sh.in	2011-03-12 03:46:23 UTC (rev 510)
@@ -48,7 +48,7 @@
 nfunc=0
 nproc=0
 while read sc magic type func idl min max key extra; do if test "$opt" = "-c"; then
-  if test $key == "KEYWORDS"; then key=IDL_SYSFUN_DEF_F_KEYWORDS; else key=0; fi
+  if test "x$key" == "xKEYWORDS"; then key=IDL_SYSFUN_DEF_F_KEYWORDS; else key=0; fi
   if test $type == "F"; then
     echo "extern IDL_VPTR $func(int argc, IDL_VPTR argv[], char *argk);"
     if test -n "$funcstruct"; then funcstruct="$funcstruct, "; fi
@@ -63,7 +63,7 @@
     (( nproc=nproc+1 ))
   fi
 else
-  if test $key == "KEYWORDS"; then key=" KEYWORDS"; else key=; fi
+  if test "x$key" == "xKEYWORDS"; then key=" KEYWORDS"; else key=; fi
   if test $type == "F"; then type="FUNCTION "; else type="PROCEDURE"; fi
   echo "$type $idl $min $max$key"
 fi; done

Added: trunk/getdata/bindings/idl/package/Makefile.am
===================================================================
--- trunk/getdata/bindings/idl/package/Makefile.am	                        (rev 0)
+++ trunk/getdata/bindings/idl/package/Makefile.am	2011-03-12 03:46:23 UTC (rev 510)
@@ -0,0 +1,41 @@
+# Copyright (C) 2008-2011 D. V. Wiebe
+#
+##########################################################################
+#
+# This file is part of the GetData project.
+#
+# GetData 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.
+#
+# GetData 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 GetData; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+AUTOMAKE_OPTIONS = foreign dist-bzip2 check-news 1.10
+
+ACLOCAL_AMFLAGS = -I m4
+
+BUILDCC=@BUILDCC@
+
+DISTCHECK_CONFIGURE_FLAGS = --with-idl-dlm-dir="$$dc_install_base/idl"
+
+noinst_PROGRAMS=make_parameters
+
+make_parameters_SOURCES = make_parameters.c
+
+SUBDIRS = . src
+
+EXTRA_DIST = ChangeLog README.idl
+
+make_parameters$(EXEEXT): $(make_parameters_SOURCES)
+	${BUILDCC} -I../src -o make_parameters$(EXEEXT) $(srcdir)/$(make_parameters_SOURCES)
+
+clean-local:
+	rm -rf *~ 

Added: trunk/getdata/bindings/idl/package/README
===================================================================
--- trunk/getdata/bindings/idl/package/README	                        (rev 0)
+++ trunk/getdata/bindings/idl/package/README	2011-03-12 03:46:23 UTC (rev 510)
@@ -0,0 +1,95 @@
+IDL BINDINGS FOR GETDATA
+========================
+
+This package provides bindings to the GetData library for use with the
+Interactive Data Language (IDL) developed by Research Systems, Incorporated,
+now ITT Visual Information Solutions.
+
+Building the IDL bindings with this package requires a system with a copy of
+GetData already installed.  If you do not already have the GetData library, you
+may want to download and install the entire GetData Project instead, which
+includes these bindings.  GetData source packages, as well as more information
+on the GetData Project, may be found on the World Wide Web:
+
+  http://getdata.sourceforge.net/
+
+
+WARRANTY AND REDISTRIBUTION
+===========================
+
+GetData 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.
+
+GetData 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 GetData in a file called `COPYING'; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
+
+
+CONTENTS
+========
+
+This package provides bindings for the Interactive Data Language (IDL) to the
+GetData library.  Documentation for the bindings can be found in file
+`README.idl' in the top level directory.  The C interface is described in this
+document and the associated man pages.
+
+A full list of features new to this release of GetData may be found in the
+file called `NEWS', including features new to this copy of the IDL bindings.
+
+
+BUILDING THE BINDINGS
+=====================
+
+This package may be configured and built using the GNU autotools.  Generic
+installation instructions are provided in the file called `INSTALL'.  A
+brief summary follows.  A C99-compliant compiler is required to build (but not
+to use) the bindings.
+
+Most users should be able to build the package by simply executing:
+
+  $ ./configure
+  $ make
+
+from the top IDL GetData directory (the directory containing this README file). 
+After the project has been built, you may (optionally) test the build by
+executing:
+
+  $ make check
+
+which will run a series of self-tests.  Finally,
+
+  $ make install
+
+will install the bindings, and documentation.
+
+The package configuration can be changed, if the default configuration is
+insufficient, before building it by passing options to ./configure.  Running
+
+  $ ./configure --help
+
+will display a brief help message summarising available options.
+
+
+PREREQUISITES
+=============
+
+These bindings require GetData 0.7 or newer to build, as well as an IDL
+interpreter verison 5.5 or later.  No other external libraries are required,
+save for the C Standard Library.
+
+
+AUTHOR
+======
+
+The IDL GetData Bindings are maintained by D. V. Wiebe <dv...@ke...>.
+Bug reports and other communication relevant to these bindings are best directed
+to the GetData mailing list: <get...@li...>.
+
+A full list of contributors to the GetData Project is given in the file called
+`AUTHORS'.

Added: trunk/getdata/bindings/idl/package/configure.ac
===================================================================
--- trunk/getdata/bindings/idl/package/configure.ac	                        (rev 0)
+++ trunk/getdata/bindings/idl/package/configure.ac	2011-03-12 03:46:23 UTC (rev 510)
@@ -0,0 +1,210 @@
+dnl Copyright (C) 2008-2011 D. V. Wiebe
+dnl
+dnl llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+dnl
+dnl This file is part of the GetData project.
+dnl
+dnl GetData is free software; you can redistribute it and/or modify it under
+dnl the terms of the GNU Lesser General Public License as published by the
+dnl Free Software Foundation; either version 2.1 of the License, or (at your
+dnl option) any later version.
+dnl
+dnl GetData is distributed in the hope that it will be useful, but WITHOUT
+dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+dnl FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+dnl License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public License
+dnl along with GetData; if not, write to the Free Software Foundation, Inc.,
+dnl 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+dnl
+
+m4_include([m4/version.m4])
+
+AC_INIT([IDL_GetData],[getdata_version],[get...@li...])
+
+AC_DEFINE([GETDATA_MAJOR], [getdata_major], [ The major version number ])
+AC_DEFINE([GETDATA_MINOR], [getdata_minor], [ The minor version number ])
+AC_DEFINE([GETDATA_REVISION], [getdata_revision], [ The revision number ])
+AC_DEFINE([GETDATA_VERSION_SUFFIX], ["getdata_extra"],
+          [ Other qualifiers on the version number triplet (if any) ])
+
+AC_PREREQ([2.63])
+AC_CONFIG_MACRO_DIR([m4])
+
+LT_PREREQ([2.2.6b])
+
+AC_ARG_VAR([BUILDCC],
+           [C compiler command on the build system (only needed if cross-compiling)])
+
+AC_CONFIG_AUX_DIR([.])
+AC_CONFIG_SRCDIR([src/getdata.c])
+AC_CONFIG_HEADER([src/config.h])
+
+dnl Features
+echo "*** Checking GetData configuration"
+echo
+
+dnl Build/Host triplets
+AC_CANONICAL_HOST
+
+dnl DL library path munging for test suite
+case "${host}" in
+  *-apple-darwin*) DL_LIBRARY_PATH="DYLD_LIBRARY_PATH" ;;
+  *) DL_LIBRARY_PATH="LD_LIBRARY_PATH" ;;
+esac
+AC_SUBST([DL_LIBRARY_PATH])
+
+dnl Programs
+echo
+echo "*** Initialising build system"
+echo
+AM_INIT_AUTOMAKE
+AC_PROG_LN_S
+AC_PROG_GREP
+AC_PROG_AWK
+AC_PROG_SED
+echo
+echo "*** Checking C compiler characteristics"
+echo
+AC_PROG_CC
+AC_PROG_CC_C_O
+AC_PROG_CC_C99
+
+AC_HEADER_STDC
+
+if test "x${cross_compiling}" != "xno"; then
+  echo
+  echo "*** Checking the build environment"
+  echo
+  if test -z "$BUILDCC"; then
+    if test -n "$build_alias"; then
+      AC_CHECK_PROGS([BUILDCC],
+                     [${build_alias}-gcc ${build_alias}-cc ${build_alias}-cl])
+    fi
+  fi
+  if test -z "$BUILDCC"; then
+    AC_CHECK_PROGS([BUILDCC], [gcc cc cl])
+  fi
+else
+  BUILDCC=$CC
+  AC_SUBST([BUILDCC])
+fi
+
+echo
+echo "*** Building libtool"
+echo
+LT_INIT([dlopen])
+AC_SUBST([LIBTOOL_DEPS])
+
+case "${host}" in
+  *-pc-mingw*|*-pc-cygwin*)
+  NO_UNDEFINED=" -no-undefined --enable-auto-import";
+  NO_DLOPEN_TESTS=1 ;;
+  *) NO_DLOPEN_TESTS=0 ;;
+esac
+
+LT_OUTPUT
+
+dnl compiler checks
+echo
+echo "*** Checking additional compiler characteristics"
+echo
+AC_C_INLINE
+GD_PROG_CC_WALL
+
+dnl Declare a few feature test macros
+AC_DEFINE([GDIDL_EXTERNAL], [1], [ Define to 1 if building the GetData IDL bindings outside the GetData source tree ])
+AC_DEFINE([_BSD_SOURCE], [], [ Expose BSD-derived definitions ])
+AC_DEFINE([_SVID_SOURCE], [], [ Expose System V-derived definitions ])
+AC_DEFINE([_POSIX_SOURCE], [], [ Expose POSIX.1-1990 conforming definitions ])
+AC_DEFINE([_POSIX_C_SOURCE], [200809L],
+          [ Expose POSIX:2008 conforming definitions ])
+
+dnl libraries
+echo
+echo "*** Looking for getdata"
+echo
+PKG_CHECK_MODULES([GETDATA], [getdata >= 0.7.0])
+
+dnl headers
+echo
+echo "*** Looking for additional header files"
+echo
+AC_CHECK_HEADERS([complex.h])
+
+dnl types
+echo
+echo "*** Checking data types"
+echo
+AC_C_CONST
+AC_TYPE_UINT8_T
+AC_TYPE_INT8_T
+AC_TYPE_UINT16_T
+AC_TYPE_INT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_INT32_T
+AC_TYPE_UINT64_T
+AC_TYPE_INT64_T
+AC_CHECK_TYPES([_Complex float, _Complex double])
+
+GD_CHECK_LFS_TYPE([off64_t],[
+#ifdef STDC_HEADERS
+#include <sys/types.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+])
+
+if test "x$gd_cv_c_need_lfs_defined" = "xyes"; then
+  AC_DEFINE([_LARGEFILE64_SOURCE], [1],
+            [ Additional functionality from LFS for large files. ])
+fi
+
+if test "x$gd_cv_type_off64_t" = "xyes"; then
+  dnl Assume we have the entire LFS defined transitional API
+  AC_DEFINE([HAVE_OFF64_T], [1],
+            [ Define to 1 if the system has the type `off64_t'. ]) dnl `
+fi
+
+echo
+echo "*** Configuring interactive data language (IDL) bindings"
+echo
+GD_IDL([5.5])
+if test "x$have_idl" = "xno"; then
+  AC_MSG_ERROR([Cannot find an IDL interpreter!  Maybe you need to use --with-idl?])
+fi
+
+dnl build date
+AC_CHECK_PROGS([DATE], [date], [not found])
+if test "x$DATE" == "xnot found"; then
+  BUILD_DATE="Build date unspecified"
+else
+  BUILD_DATE=`date`
+fi
+AC_SUBST([BUILD_DATE])
+
+dnl output
+echo
+echo "*** Writing configure output"
+echo
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([src/Makefile])
+AC_CONFIG_FILES([src/makedlm.sh])
+AC_CONFIG_FILES([src/test/Makefile])
+
+dnl Automake conditionals
+AM_CONDITIONAL(GETDATA_DEBUG, [test "x$enable_debug" == "xyes"])
+AM_CONDITIONAL(CC_WALL, [test "x$gd_cv_prog_cc_wall" == "xyes"])
+AM_CONDITIONAL(INTEL_F77_COMPILER,
+               [test "x$gd_cv_f77_compiler_intel" == "xyes"])
+AM_CONDITIONAL(INTEL_FC_COMPILER, [test "x$gd_cv_fc_compiler_intel" == "xyes"])
+AM_CONDITIONAL(LFS_TRANSITIONAL_API, [test "x$gd_cv_type_off64_t" = "xyes"])
+AM_CONDITIONAL(TEST_IDL, [test "x$NO_DLOPEN_TESTS" = "x0"])
+AM_CONDITIONAL(GDIDL_EXTERNAL, [true])
+
+dnl we do this here to avoid screwing up other tests
+LDFLAGS="${LDFLAGS}${NO_UNDEFINED}"
+
+AC_OUTPUT

Modified: trunk/getdata/bindings/python/pyentry.c
===================================================================
--- trunk/getdata/bindings/python/pyentry.c	2011-03-05 04:08:48 UTC (rev 509)
+++ trunk/getdata/bindings/python/pyentry.c	2011-03-12 03:46:23 UTC (rev 510)
@@ -1991,7 +1991,7 @@
 "    'dividend':   a number or CONST field code specifying the dividend\n"\
 "                    of the RECIP.\n\n"\
 "If a dictionary, the keys of 'parameters' should be the names of the\n"\
-"tuple parameters listed above (ie. 'type' and 'spf' for a RAW field),\n"\
+"tuple parameters listed above (e.g. 'type' and 'spf' for a RAW field),\n"\
 "and the values the same as their tuple counterparts.\n\n"\
 "An entry object provides all these parameters as attributes, which may\n"\
 "be modified by assignment.  Attempting to access an attribute which is\n"\
@@ -2001,7 +2001,7 @@
 "dirfile.madd() as appropriate.  To propagate changes made to an entry\n"\
 "object back to the dirfile, dirfile.alter() is typically used, unless\n"\
 "the name or fragment index is to be changed, in which case\n"\
-"dirfile.rename() or dirfile,move() should be used.\n"
+"dirfile.rename() or dirfile.move() should be used.\n"
 
 PyTypeObject gdpy_entry = {
   PyObject_HEAD_INIT(NULL)

Modified: trunk/getdata/configure.ac
===================================================================
--- trunk/getdata/configure.ac	2011-03-05 04:08:48 UTC (rev 509)
+++ trunk/getdata/configure.ac	2011-03-12 03:46:23 UTC (rev 510)
@@ -19,12 +19,7 @@
 dnl 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl
 
-m4_define(getdata_major,    0)
-m4_define(getdata_minor,    7)
-m4_define(getdata_revision, 1)
-m4_define(getdata_extra,    [])
-m4_define(getdata_version,
-          getdata_major.getdata_minor.getdata_revision[]getdata_extra)
+m4_include([m4/version.m4])
 
 AC_INIT([GetData],[getdata_version],[get...@li...])
 
@@ -42,22 +37,14 @@
 AC_ARG_VAR([BUILDCC],
            [C compiler command on the build system (only needed if cross-compiling)])
 
-dnl libgetdata current interface version
-AC_SUBST(GETDATA_IFACE_VERSION, [4])
-dnl libgetdata current interface implementation revision
-AC_SUBST(GETDATA_IMPL_REVISION, [1])
-dnl libgetdata interface age (current interface - oldest supported interface)
-AC_SUBST(GETDATA_IFACE_AGE, [0])
+dnl export version information from m4/version.m4
+AC_SUBST(GETDATA_IFACE_VERSION, [getdata_iface_version])
+AC_SUBST(GETDATA_IMPL_REVISION, [getdata_iface_revision])
+AC_SUBST(GETDATA_IFACE_AGE, [getdata_iface_revision])
+AC_SUBST(GETDATAXX_VERSION, [getdataxx_version])
+AC_SUBST(FGETDATA_VERSION, [fgetdata_version])
+AC_SUBST(F95GETDATA_VERSION, [f95getdata_version])
 
-dnl libgetdata++ interface version info
-AC_SUBST(GETDATAXX_VERSION, [2:0:0])
-
-dnl libfgetdata interface version info
-AC_SUBST(FGETDATA_VERSION, [2:1:0])
-
-dnl libf95getdata interface version info
-AC_SUBST(F95GETDATA_VERSION, [2:0:0])
-
 AC_CONFIG_SRCDIR([src/getdata.c])
 AC_CONFIG_HEADER([src/config.h])
 
@@ -815,7 +802,8 @@
 AM_CONDITIONAL(USE_MODULES, [test "x$use_modules" != "xno"])
 AM_CONDITIONAL(TEST_PYTHON, [test "x$NO_DLOPEN_TESTS" = "x0"])
 AM_CONDITIONAL(TEST_IDL, [test "x$NO_DLOPEN_TESTS" = "x0"])
-AM_CONDITIONAL(HAVE_DIFF, test "x$DIFF" != "x")
+AM_CONDITIONAL(HAVE_DIFF, [test "x$DIFF" != "x"])
+AM_CONDITIONAL(GDIDL_EXTERNAL, [false])
 
 dnl we do this here to avoid screwing up other tests
 LDFLAGS="${LDFLAGS}${NO_UNDEFINED}"
@@ -841,18 +829,18 @@
   BINDINGS_LEFT="${BINDINGS_LEFT} Fortran-95"
 fi
 
-if test "x$make_pybindings" != "xno"; then
-  BINDINGS_BUILT="${BINDINGS_BUILT} Python"
-else
-  BINDINGS_LEFT="${BINDINGS_LEFT} Python"
-fi
-
 if test "x$make_idlbindings" != "xno"; then
   BINDINGS_BUILT="${BINDINGS_BUILT} IDL"
 else
   BINDINGS_LEFT="${BINDINGS_LEFT} IDL"
 fi
 
+if test "x$make_pybindings" != "xno"; then
+  BINDINGS_BUILT="${BINDINGS_BUILT} Python"
+else
+  BINDINGS_LEFT="${BINDINGS_LEFT} Python"
+fi
+
 if test "x$BINDINGS_BUILT" = "x"; then
   BINDINGS_BUILT=" none"
 fi

Modified: trunk/getdata/m4/idl.m4
===================================================================
--- trunk/getdata/m4/idl.m4	2011-03-05 04:08:48 UTC (rev 509)
+++ trunk/getdata/m4/idl.m4	2011-03-12 03:46:23 UTC (rev 510)
@@ -119,7 +119,7 @@
 AC_SUBST([IDL_CFLAGS])
 
 AC_SUBST([IDL_CFLAGS])
-IDL_LIBS=`(echo 'print,"@@@"+!MAKE_DLL.LD' | $IDL 2>&1) | $GREP '@@@' | sed -e 's/@@@@<:@^ @:>@* \(.*\?\) -o.*/\1/'`
+IDL_LIBS=`(echo 'print,"@@@"+!MAKE_DLL.LD' | $IDL 2>&1) | $GREP '@@@' | sed -e 's/@@@@<:@^ @:>@* \(.*\?\) -o.*/\1/' | sed -e 's/-m /-m/g'`
 AC_MSG_CHECKING([IDL linker flags])
 AC_MSG_RESULT([$IDL_LIBS])
 AC_SUBST([IDL_LIBS])

Added: trunk/getdata/m4/version.m4
===================================================================
--- trunk/getdata/m4/version.m4	                        (rev 0)
+++ trunk/getdata/m4/version.m4	2011-03-12 03:46:23 UTC (rev 510)
@@ -0,0 +1,42 @@
+dnl Copyright (C) 2008-2010 D. V. Wiebe
+dnl
+dnl llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+dnl
+dnl This file is part of the GetData project.
+dnl
+dnl GetData is free software; you can redistribute it and/or modify it under
+dnl the terms of the GNU Lesser General Public License as published by the
+dnl Free Software Foundation; either version 2.1 of the License, or (at your
+dnl option) any later version.
+dnl
+dnl GetData is distributed in the hope that it will be useful, but WITHOUT
+dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+dnl FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+dnl License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public License
+dnl along with GetData; if not, write to the Free Software Foundation, Inc.,
+dnl 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+m4_define(getdata_major,    0)
+m4_define(getdata_minor,    7)
+m4_define(getdata_revision, 1)
+m4_define(getdata_extra,    [])
+m4_define(getdata_version,
+          getdata_major.getdata_minor.getdata_revision[]getdata_extra)
+
+dnl libgetdata current interface version
+m4_define(getdata_iface_version,    4)
+dnl libgetdata current interface implementation revision
+m4_define(getdata_iface_revision,   1)
+dnl libgetdata interface age (current interface - oldest supported interface)
+m4_define(getdata_iface_revision,   0)
+
+dnl libgetdata++ interface version info
+m4_define(getdataxx_version, 2:0:0)
+
+dnl libfgetdata interface version info
+m4_define(fgetdata_version, 2:1:0)
+
+dnl libf95getdata interface version info
+m4_define(f95getdata_version, 2:0:0)

Modified: trunk/getdata/src/Makefile.am
===================================================================
--- trunk/getdata/src/Makefile.am	2011-03-05 04:08:48 UTC (rev 509)
+++ trunk/getdata/src/Makefile.am	2011-03-12 03:46:23 UTC (rev 510)
@@ -66,6 +66,7 @@
 
 if USE_MODULES
 EXPORT_DYNAMIC=-export-dynamic
+DGETDATA_MODULEDIR=-DGETDATA_MODULEDIR="\"$(moduledir)\""
 else
 EXTERNAL_CPPFLAGS=$(SLIM_CPPFLAGS) $(GZIP_CPPFLAGS) $(BZIP2_CPPFLAGS) \
 									$(LZMA_CPPFLAGS)
@@ -90,7 +91,7 @@
 endif
 
 pkgconfigdir = @libdir@/pkgconfig
-AM_CFLAGS = ${WALL} ${WEXTRA} -DGETDATA_MODULEDIR="\"$(moduledir)\""
+AM_CFLAGS = ${WALL} ${WEXTRA} $(DGETDATA_MODULEDIR)
 AM_CPPFLAGS = $(LTDLINCL) $(EXTERNAL_CPPFLAGS)
 
 BUILT_SOURCES = getdata.h


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2010	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (5)	Oct (20)	Nov (21)	Dec (16)
2011	Jan (1)	Feb (1)	Mar (56)	Apr (20)	May (4)	Jun (2)	Jul (3)	Aug (11)	Sep (2)	Oct (4)	Nov (18)	Dec (16)
2012	Jan (8)	Feb (12)	Mar (30)	Apr (13)	May (10)	Jun (17)	Jul (18)	Aug (19)	Sep	Oct (1)	Nov (1)	Dec (9)
2013	Jan (1)	Feb (4)	Mar (27)	Apr (6)	May (3)	Jun (1)	Jul (10)	Aug	Sep (3)	Oct (15)	Nov (4)	Dec (9)
2014	Jan	Feb (3)	Mar (4)	Apr (10)	May (15)	Jun	Jul (14)	Aug	Sep (2)	Oct (6)	Nov	Dec (9)
2015	Jan (2)	Feb (3)	Mar (1)	Apr (2)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

getdata-commits Mailing List for GetData (Page 18)

Scientific Database Format

getdata-commits — An automated log of GetData Subversion activity.