Commit e62ba59e authored by John Douglas Veitch's avatar John Douglas Veitch

Merge the master branch

Original: b47b2fea436d3bb57958d70066f3e3b3381d6bc7
parent 530ee46c
......@@ -8,7 +8,7 @@ fail () {
}
## Run 00boot in subdirs
for d in lal lalapps; do
for d in lal lalframe lalxml lalstochastic lalapps; do
echo "00boot: running 00boot in $d"
(cd "$d" && ./00boot 1>/dev/null) || fail "00boot in $d"
done
......
ACLOCAL_AMFLAGS = -I lal/misc
SUBDIRS = @subdirs@
distcleancheck_listfiles = find . -type f \! -name "LALVCSInfo.h" -print
MAINTAINERCLEANFILES = lalsuite.spec
vcs-clean: cvs-clean
cvs-clean: maintainer-clean
......
AC_INIT([lalsuite],[6.2],[lal-discuss@gravity.phys.uwm.edu])
AC_INIT([lalsuite],[6.4],[lal-discuss@gravity.phys.uwm.edu])
AC_CONFIG_SRCDIR([lal/configure.ac])
AC_CONFIG_AUX_DIR([lal/misc])
AC_CONFIG_MACRO_DIR([lal/misc])
......@@ -7,71 +7,52 @@ AC_CONFIG_FILES([lalsuite.spec])
AM_INIT_AUTOMAKE([foreign])
AC_PREFIX_DEFAULT([/opt/lscsoft/lalsuite])
LAL_ENABLE_FRAME
LAL_ENABLE_METAIO
LAL_ENABLE_XML
AM_PROG_LIBTOOL
AC_PROG_LIBTOOL
lalsuite_top_builddir='$(top_builddir)/..'
lalsuite_top_srcdir='$(top_srcdir)/..'
LALSUITE_BUILD="true"
LAL_LIBS="${lalsuite_top_builddir}/lal/lib/liblal.la"
LAL_CFLAGS="-I${lalsuite_top_builddir}/lal/include"
export LALSUITE_BUILD LAL_LIBS LAL_CFLAGS
LAL_TOP_SRCDIR="${lalsuite_top_srcdir}/lal"
export LALSUITE_BUILD LAL_LIBS LAL_CFLAGS LAL_TOP_SRCDIR
LALSUPPORT_LIBS="${lalsuite_top_builddir}/lal/packages/support/src/liblalsupport.la"
export LALSUPPORT_LIBS
LALSTOCHASTIC_LIBS="${lalsuite_top_builddir}/lal/packages/stochastic/src/liblalstochastic.la"
export LALSTOCHASTIC_LIBS
LALMETAIO_LIBS="${lalsuite_top_builddir}/lal/packages/support/src/liblalmetaio.la"
export LALMETAIO_LIBS
LALFRAME_LIBS="${lalsuite_top_builddir}/lalframe/src/liblalframe.la"
LALFRAME_CFLAGS="-I${lalsuite_top_builddir}/lalframe/include"
export LALFRAME_LIBS LALFRAME_CFLAGS
LALXML_LIBS="${lalsuite_top_builddir}/lalxml/src/liblalxml.la"
LALXML_CFLAGS="-I${lalsuite_top_builddir}/lalxml/include"
export LALXML_LIBS LALXML_CFLAGS
LALSTOCHASTIC_LIBS="${lalsuite_top_builddir}/lalstochastic/src/liblalstochastic.la"
LALSTOCHASTIC_CFLAGS="-I${lalsuite_top_builddir}/lalstochastic/include"
export LALSTOCHASTIC_LIBS LALSTOCHASTIC_CFLAGS
if test "$frame" = "true" ; then
LIBS_save="$LIBS"
CPPFLAGS_save="$CPPFLAGS"
PKG_CHECK_MODULES(FRAME, libframe, [ true ], [ false ])
LIBS="$FRAME_LIBS $LIBS"
CPPFLAGS="$CPPFLAGS $FRAME_CFLAGS"
AC_SEARCH_LIBS(FrLibIni, Frame, , [AC_MSG_WARN(disabling framelib support)]
[frame="false"])
CPPFLAGS="$CPPFLAGS_save"
LIBS="$LIBS_save"
fi
if test "$metaio" = "true" ; then
LIBS_save="$LIBS"
CPPFLAGS_save="$CPPFLAGS"
PKG_CHECK_MODULES(METAIO, libmetaio, [ true ], [ false ])
LIBS="$METAIO_LIBS $LIBS"
CPPFLAGS="$CPPFLAGS $METAIO_CFLAGS"
AC_SEARCH_LIBS(MetaioOpen, metaio dataflow, , [AC_MSG_WARN(disabling metaio support)]
[metaio="false"])
CPPFLAGS="$CPPFLAGS_save"
LIBS="$LIBS_save"
LIBS_save="$LIBS"
CPPFLAGS_save="$CPPFLAGS"
fi
if test "$xml" = "true" ; then
PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= 2.6, [ true ], [ false ])
LIBS="$LIBXML2_LIBS $LIBS"
CPPFLAGS="$CPPFLAGS $LIBXML2_CFLAGS"
AC_SEARCH_LIBS(xmlInitParser, xml2, , [AC_MSG_WARN(disabling xml support)]
[xml="false"])
CPPFLAGS="$CPPFLAGS_save"
LIBS="$LIBS_save"
LIBS_save="$LIBS"
CPPFLAGS_save="$CPPFLAGS"
PKG_CHECK_MODULES([METAIO],[libmetaio],[true],[false])
LIBS="$METAIO_LIBS $LIBS"
CPPFLAGS="$CPPFLAGS $METAIO_CFLAGS"
AC_SEARCH_LIBS([MetaioOpen],[metaio],,[AC_MSG_WARN([disabling metaio support])]
[metaio="false"])
CPPFLAGS="$CPPFLAGS_save"
LIBS="$LIBS_save"
fi
if test "$frame" = "true" ; then
LALFRAME_LIBS="${lalsuite_top_builddir}/lal/packages/framedata/src/liblalframe.la"
export LALFRAME_LIBS
fi
if test "$metaio" = "true" ; then
LALMETAIO_LIBS="${lalsuite_top_builddir}/lal/packages/support/src/liblalmetaio.la"
export LALMETAIO_LIBS
fi
if test "$xml" = "true" ; then
LALXML_LIBS="${lalsuite_top_builddir}/lal/packages/support/src/liblalxml.la"
export LALXML_LIBS
LALMETAIO_LIBS="${lalsuite_top_builddir}/lal/packages/support/src/liblalmetaio.la"
export LALMETAIO_LIBS
fi
AC_CONFIG_SUBDIRS([lal])
AC_CONFIG_SUBDIRS([lalframe])
AC_CONFIG_SUBDIRS([lalxml])
AC_CONFIG_SUBDIRS([lalstochastic])
AC_CONFIG_SUBDIRS([lalapps])
AC_OUTPUT
......@@ -45,7 +45,8 @@ config.status : configure
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
--enable-nightly=no \
--enable-frame --enable-metaio \
--disable-debug
--disable-debug \
--disable-gcc-flags
#DEBUG#
#ls -lR
#DEBUG#
......
......@@ -112,24 +112,10 @@ packages/fft/test/AvgSpecTest
packages/fft/test/ComplexFFTTest
packages/fft/test/RealFFTTest
packages/fft/test/TimeFreqFFTTest
packages/fft/src/CudaFFT.c
packages/fft/src/CudaFFT.linkinfo
packages/findchirp/test/FindChirpBCVSpinTest
packages/findchirp/test/FindChirpTDTest
packages/framedata/src/FrameSeries.c
packages/framedata/test/AggregationCacheTest
packages/framedata/test/AggregationTest
packages/framedata/test/FrameCacheTest
packages/framedata/test/FrameStreamTest
packages/framedata/test/H1:LSC-AS_Q.*
packages/framedata/test/MakeFrames
packages/framedata/test/Read40mData
packages/framedata/test/ReadGEOData
packages/framedata/test/ReadLHOData
packages/framedata/test/catalog
packages/framedata/test/catalog.test
packages/framedata/test/dq_vector.dat
packages/framedata/test/series.dat
packages/framedata/test/series_dq.dat
packages/framedata/test/state_vector.dat
packages/hello/test/LALHelloTest
packages/houghpulsar/test/OutHistogram.asc
packages/houghpulsar/test/OutHough.asc
......@@ -188,21 +174,6 @@ packages/std/test/LALGSLTest
packages/std/test/LALMallocTest
packages/std/test/LALVersionTest
packages/std/test/StringConvertTest
packages/stochastic/test/??_714382918*.dat
packages/stochastic/test/AstroOmegaTest
packages/stochastic/test/CZeroPadAndFFTTest
packages/stochastic/test/OverlapReductionFunctionTest
packages/stochastic/test/SZeroPadAndFFTTest
packages/stochastic/test/SimulatePopcornTest
packages/stochastic/test/SimulateSBTest
packages/stochastic/test/StochasticCrossCorrelationSpectrumTest
packages/stochastic/test/StochasticCrossCorrelationStatisticTest
packages/stochastic/test/StochasticHeterodynedCrossCorrelationStatisticTest
packages/stochastic/test/StochasticInverseNoiseTest
packages/stochastic/test/StochasticOmegaGWTest
packages/stochastic/test/StochasticOptimalFilterNormalizationTest
packages/stochastic/test/StochasticOptimalFilterTest
packages/stochastic/test/WHITENED-SB?
packages/support/src/PrintFrequencySeries.c
packages/support/src/PrintTimeSeries.c
packages/support/src/PrintVector.c
......@@ -220,7 +191,6 @@ packages/support/test/?TS*.dat
packages/support/test/ConfigFileTest
packages/support/test/LALMath3DPlotTest
packages/support/test/LALMathNDPlotTest
packages/support/test/LALXMLTest
packages/support/test/Math3DNotebook.nb
packages/support/test/MathNDNotebook.nb
packages/support/test/NRWaveIOTest
......
......@@ -146,10 +146,6 @@ cd packages/stats/src || fail "creating sources in packages/stats/src"
${M4} LALMoment.m4 > LALMoment.c || fail "creating sources in packages/stats/src"
cd ../../.. || fail "creating sources in packages/stats/src"
cd packages/framedata/src || fail "creating sources in packages/framedata/src"
${M4} FrameSeries.m4 > FrameSeries.c || fail "creating sources in packages/framedata/src"
cd ../../.. || fail "creating sources in packages/framedata/src"
cd packages/pulsar/test || fail "creating sources in packages/pulsar/test"
/bin/sh ephemtoilwd.sh earth98.dat > earth98.ilwd || fail "creating sources in packages/pulsar/test"
/bin/sh ephemtoilwd.sh sun98.dat > sun98.ilwd || fail "creating sources in packages/pulsar/test"
......
Ajith, P.
Allen, B.
Anderson, W. G.
Ausmus, D.
......
......@@ -4,27 +4,17 @@ SUBDIRS = include packages doc lib misc debian @subdirs@
MAINTAINERCLEANFILES = lal.spec
distcleancheck_listfiles = find . -type f \! -name "LALVCSInfo.h" -print
EXTRA_DIST = README.bugs README.contrib README.install \
lal.pc.in lalsupport.pc.in lalframe.pc.in lalmetaio.pc.in lalxml.pc.in \
lalstochastic.pc.in lal-config.in aclocal.m4 lal.spec.in lal.spec
lal.pc.in lalsupport.pc.in lalmetaio.pc.in \
lal-config.in aclocal.m4 lal.spec.in lal.spec
bin_SCRIPTS = lal-config
if FRAME
LALFRAMEPC = lalframe.pc
else
LALFRAMEPC =
endif
if METAIO
LALMETAIOPC = lalmetaio.pc
else
LALMETAIOPC =
endif
if XML
LALXMLPC = lalxml.pc
else
LALXMLPC =
endif
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = lal.pc lalsupport.pc lalstochastic.pc $(LALFRAMEPC) $(LALMETAIOPC) $(LALXMLPC)
pkgconfig_DATA = lal.pc lalsupport.pc $(LALMETAIOPC)
# cvs-clean: more than maintainer-clean, this cleans
# everything not in the cvs archive.
......
......@@ -5,17 +5,15 @@ A message from the librarian:
When developing a package for LAL, please test the code with gcc using
the following compiler flags:
-g3 -O4 -ansi -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wshadow
-Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common
-Wnested-externs -D__NO_STRING_INLINES -Wno-long-long
-g3 -O4 -Wall -W -Wmissing-prototypes -Wstrict-prototypes
-Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings
-fno-common -Wnested-externs -Wno-format-zero-length
These flags provide a useful way to detect potential bugs. (The
-D__NO_STRING_INLINES turns off a bug in one of the include files on
Linux systems). The package should compile cleanly. (Add -Werror to
enforce this.)
These flags provide a useful way to detect potential bugs. (Add -Werror
to enforce this.)
You can turn on these flags when configuring LAL (with gcc as the
compiler) using the --with-gcc-flags configure option.
These flags are enabled by default, you can turn them off using the
--disable-gcc-flags configure option.
*******************************************************************************
......
This diff is collapsed.
lal (6.4-1lscsoft1) unstable; urgency=low
* LAL 6.4
-- Steffen Grunewald <steffen.grunewald@aei.mpg.de> Thu, 30 Sep 2009 10:00:00 +0200
lal (6.3.2-1lscsoft1) unstable; urgency=low
* LAL 6.3.2
-- Adam Mercer <adam.mercer@ligo.org> Thu, 23 Oct 2009 10:59:32 -0600
lal (6.3.1-1lscsoft1) unstable; urgency=low
* LAL 6.3.1
-- Adam Mercer <adam.mercer@ligo.org> Thu, 08 Oct 2009 17:50:41 +0200
lal (6.3-1lscsoft1) unstable; urgency=low
* LAL 6.3
-- Steffen Grunewald <steffen.grunewald@aei.mpg.de> Thu, 03 Sep 2009 16:00:00 +0200
lal (6.2-1lscsoft1) unstable; urgency=low
* LAL 6.2
-- Adam Mercer <adam.mercer@ligo.org> Thu, 6 Aug 2009 12:02:09 -0600
lal (6.1.1-1lscsoft1) unstable; urgency=low
* LAL 6.1.1
......
......@@ -2,12 +2,12 @@ Source: lal
Section: lscsoft
Priority: optional
Maintainer: Steffen Grunewald <steffen.grunewald@aei.mpg.de>
Build-Depends: debhelper (>= 5), autotools-dev, automake, m4, libgsl0-dev (>= 1.9), libframe-dev (>= 8.0), libmetaio-dev (>= 8.2), fftw3-dev, zlib1g-dev, libxml2-dev (>= 2.6), libcfitsio3-dev, git-core (>= 1.5), pkg-config, python2.4-dev, python2.5-dev
Build-Depends: debhelper (>= 5), autotools-dev, automake, m4, libgsl0-dev (>= 1.9), libframe-dev (>= 8.0), libmetaio-dev (>= 8.2), fftw3-dev, zlib1g-dev, libcfitsio3-dev, git-core (>= 1.5), pkg-config, python2.4-dev, python2.5-dev
Standards-Version: 3.7.2
Package: lal
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libgsl0 (>= 1.9) | libgsl0ldbl (>= 1.10), libframe1 (>= 8.0), libmetaio1 (>= 8.2), fftw3, zlib1g, libxml2 (>= 2.6), python2.4
Depends: ${shlibs:Depends}, ${misc:Depends}, libgsl0 (>= 1.9) | libgsl0ldbl (>= 1.10), libframe1 (>= 8.0), libmetaio1 (>= 8.2), fftw3, zlib1g, python2.4
Description: LSC Algorithm Library
The LSC Algorithm Library for gravitational wave analysis.
This package contains the shared-object libraries needed to run applications
......@@ -15,7 +15,7 @@ Description: LSC Algorithm Library
Package: lal-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libgsl0-dev (>= 1.9), libframe-dev (>= 8.0), libmetaio-dev (>= 8.2), fftw3-dev, zlib1g-dev, libxml2-dev (>= 2.6), python2.4
Depends: ${shlibs:Depends}, ${misc:Depends}, libgsl0-dev (>= 1.9), libframe-dev (>= 8.0), libmetaio-dev (>= 8.2), fftw3-dev, zlib1g-dev, python2.4
Description: Files and documentation needed for compiling programs that use LAL
The LSC Algorithm Library for gravitational wave analysis.
This package contains files needed to build applications that use the LAL library
......
......@@ -42,7 +42,8 @@ config.status : configure
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
--enable-nightly=no \
--enable-frame --enable-metaio \
--disable-debug
--disable-debug \
--disable-gcc-flags
build : build-stamp
......
......@@ -59,9 +59,6 @@
/* Define if using fftw3 library */
#undef LAL_FFTW3_ENABLED
/* Define if using Frame library */
#undef LAL_FRAME_ENABLED
/* Define if using MetaIo library */
#undef LAL_METAIO_ENABLED
......
......@@ -7,5 +7,5 @@ Name: LAL
Description: LSC Algorithm Library
Version: @VERSION@
Requires: fftw3 fftw3f gsl
Libs: -L${libdir} -llal
Cflags: -I${includedir}
Libs: -L${libdir} -llal @CUDA_LIBS@
Cflags: -I${includedir} @CUDA_CFLAGS@
......@@ -11,7 +11,7 @@ Source: %{name}-%{version}.tar.gz
URL: http://www.lsc-group.phys.uwm.edu/lal
Packager: Jolien Creighton <jolien@uwm.edu>
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Requires: python gsl fftw libframe libmetaio libxml2
Requires: python gsl fftw libmetaio
Prefix: %{_prefix}
%description
......@@ -23,7 +23,7 @@ that use the LAL library.
Summary: Files and documentation needed for compiling programs that use LAL
Group: LAL
Requires: %{name} = %{version}
Requires: gsl-devel libframe-devel libmetaio-devel libxml2-devel
Requires: gsl-devel libmetaio-devel
%description devel
The LSC Algorithm Library for gravitational wave data analysis.
This package contains files needed build applications that use the LAL library
......@@ -35,7 +35,7 @@ as well as the documentation for the library.
%build
source /opt/lscsoft/lscsoft-user-env.sh
nightly_version=@NIGHTLY_VERSION@
%configure --enable-nightly=${nightly_version:-no} --disable-debug
%configure --enable-nightly=${nightly_version:-no} --disable-gcc-flags --disable-debug
%{__make}
%install
......
......@@ -19,9 +19,12 @@
* Copyright (C) 2009 Adam Mercer
*/
#include <string.h>
#include "config.h"
#include <LALVCSInfo.h>
/* global variables for vcs information */
const char *lalVCSVersion = LAL_VERSION;
const char *lalVCSId = LAL_VCS_ID;
const char *lalVCSDate = LAL_VCS_DATE;
const char *lalVCSBranch = LAL_VCS_BRANCH;
......@@ -31,10 +34,30 @@ const char *lalVCSCommitter = LAL_VCS_COMMITTER;
const char *lalVCSStatus = LAL_VCS_STATUS;
/* library vcs information structure */
struct tagLALVCSInfo lalLibraryVCSInfo = {LAL_VCS_ID, \
struct tagLALVCSInfo lalLibraryVCSInfo = {LAL_VERSION, LAL_VCS_ID, \
LAL_VCS_DATE, LAL_VCS_BRANCH, LAL_VCS_TAG, LAL_VCS_AUTHOR, \
LAL_VCS_COMMITTER, LAL_VCS_STATUS};
/* fucntion to compare two LALVCSInfo structures */
int XLALVCSInfoCompare(LALVCSInfo *header, LALVCSInfo *library)
{
/* check for header/library mismatch */
if (strcmp(header->version, library->version) || \
strcmp(header->vcsId, library->vcsId) || \
strcmp(header->vcsDate, library->vcsDate) || \
strcmp(header->vcsBranch, library->vcsBranch) || \
strcmp(header->vcsTag, library->vcsTag) || \
strcmp(header->vcsAuthor, library->vcsAuthor) || \
strcmp(header->vcsCommitter, library->vcsCommitter) || \
strcmp(header->vcsStatus, library->vcsStatus))
{
/* version mismatch */
return 1;
}
return 0;
}
/*
* vim: tw=0 ts=2 et
*/
......@@ -22,6 +22,8 @@
#ifndef _LALVCSINFO_H
#define _LALVCSINFO_H
#include <lal/LALConfig.h>
#ifdef __cplusplus
extern "C" {
#endif
......@@ -36,6 +38,7 @@ extern "C" {
#define LAL_VCS_STATUS "$@STATUS@ $"
/* global variables for vcs information, defined in LALVCSInfo.c */
extern const char *lalVCSVersion;
extern const char *lalVCSId;
extern const char *lalVCSDate;
extern const char *lalVCSBranch;
......@@ -47,6 +50,7 @@ extern const char *lalVCSStatus;
/* define vcs information structure */
typedef struct tagLALVCSInfo
{
const char *version;
const char *vcsId;
const char *vcsDate;
const char *vcsBranch;
......@@ -58,10 +62,17 @@ typedef struct tagLALVCSInfo
/* header and library vcs information structures */
extern struct tagLALVCSInfo lalLibraryVCSInfo;
static struct tagLALVCSInfo lalHeaderVCSInfo = {LAL_VCS_ID, \
static const struct tagLALVCSInfo lalHeaderVCSInfo = {LAL_VERSION, LAL_VCS_ID, \
LAL_VCS_DATE, LAL_VCS_BRANCH, LAL_VCS_TAG, LAL_VCS_AUTHOR, \
LAL_VCS_COMMITTER, LAL_VCS_STATUS};
/*
* function prototypes
*/
/* function to compare two LALVCSInfo structures */
int XLALVCSInfoCompare(LALVCSInfo *header, LALVCSInfo *library);
#ifdef __cplusplus
}
#endif
......
......@@ -39,7 +39,7 @@ LALBuildDate.c: $(liblal_la_DEPENDENCIES)
@echo 'const char *lalBuildDate = "'`date +"%Y-%m-%dT%H:%M:%S%z"`'";' >$@
.vcsinfo:
@touch .vcsinfo
LALVCSInfo.h: LALVCSInfo.h.in .vcsinfo
LALVCSInfo.h: LALVCSInfo.h.in .vcsinfo git_version
@echo "creating LALVCSInfo.h"
@buildd="`pwd`" && cd $(srcdir) && sourced="`pwd`" && cd $$buildd && \
./git_version --sed $$sourced $$buildd
......
......@@ -237,6 +237,17 @@ if git_ok:
sed_cmd += ' -e "s/@AUTHOR@/%s/"' % info.author
sed_cmd += ' -e "s/@COMMITTER@/%s/"' % info.committer
sed_cmd += ' -e "s/@STATUS@/%s/"' % info.status
# create tmp file
cmd = 'sed %s %s > %s' % (sed_cmd, infile, tmpfile)
p = subprocess.Popen(cmd, shell=True)
os.waitpid(p.pid, 0)
# update LALVCSInfo.h, if appropriate
if (os.access(dstfile, os.F_OK) and not filecmp.cmp(dstfile, tmpfile)) or not os.access(dstfile, os.F_OK):
os.rename(tmpfile, dstfile)
else:
os.remove(tmpfile)
else:
# output version info
print info.id
......@@ -247,17 +258,6 @@ if git_ok:
print info.committer
print info.status
# create tmp file
cmd = 'sed %s %s > %s' % (sed_cmd, infile, tmpfile)
p = subprocess.Popen(cmd, shell=True)
os.waitpid(p.pid, 0)
# update LALVCSInfo.h, if appropriate
if (os.access(dstfile, os.F_OK) and not filecmp.cmp(dstfile,