Commit 018f7a6c authored by Salvatore Vitale's avatar Salvatore Vitale
Browse files

Merge branch 'master' into fix_lib

parents 05dcfffe ff349763
This diff is collapsed.
......@@ -114,6 +114,8 @@ Cristina Valeria Torres <cristina.torres@ligo.org> <cristina>
Curt Cutler <curt.cutler@ligo.org>
Curt Cutler <curt.cutler@ligo.org> <cutler>
D. I. Jones <jones>
Daichi Tsuna <daichi.tsuna@ligo.org>
Daichi Tsuna <daichi.tsuna@ligo.org> <daichi.tsuna@pcdev3.nemo.uwm.edu>
Damir Buskulic <buskulic@lapp.in2p3.fr>
Damir Buskulic <buskulic@lapp.in2p3.fr> <buskulic>
Darren Woods <darren>
......@@ -147,6 +149,7 @@ Evan Goetz <evan.goetz@ligo.org>
Evan Goetz <evan.goetz@ligo.org> <evang>
Evan Ochsner <evan.ochsner@ligo.org>
Evan Ochsner <evan.ochsner@ligo.org> <evano>
Florent Robinet <robinet@lal.in2p3.fr>
Frederique Marion <frederique.marion@ligo.org>
Frederique Marion <frederique.marion@ligo.org> <marionf>
Gareth Jones <gareth>
......@@ -188,6 +191,8 @@ Jolien Creighton <jolien.creighton@ligo.org> <jolien>
Jolien Creighton <jolien.creighton@ligo.org> <jolien@ldas-pcdev1.ligo.caltech.edu>
Jolien Creighton <jolien.creighton@ligo.org> <jolien@uwm.edu>
Jolien Creighton <jolien.creighton@ligo.org> <laltest>
Jonathan Blackman <jonathan.blackman@ligo.org>
Jonathan Blackman <jonathan.blackman@ligo.org> <jonathan.blackman.0@gmail.com>
Jordi Burguet-Castell <jordi.burguet-castell@ligo.org>
Jordi Burguet-Castell <jordi.burguet-castell@ligo.org> <jordi>
Jordi Burguet-Castell <jordi.burguet-castell@ligo.org> <jordi.burguet.castell@gmail.com>
......@@ -206,6 +211,7 @@ Karsten Wiesner <karsten.wiesner@ligo.org> <karsten.wiesner@aei.mpg.de>
Kipp Cannon <kipp.cannon@ligo.org>
Kipp Cannon <kipp.cannon@ligo.org> <kcannon@cita.utoronto.ca>
Kipp Cannon <kipp.cannon@ligo.org> <kipp>
Kipp Cannon <kipp.cannon@ligo.org> <kipp.cannon@m31-01.kagra.icrr.u-tokyo.ac.jp>
Larne Pekowsky <larne.pekowsky@ligo.org>
Larne Pekowsky <larne.pekowsky@ligo.org> <lppekows>
Larne Pekowsky <larne.pekowsky@ligo.org> <lppekows@ldas-pcdev1.ligo-wa.caltech.edu>
......@@ -230,7 +236,10 @@ Mark Stephen Williamsen <msw>
Matt Tibbits <tibbits>
Matthew Pitkin <matthew.pitkin@ligo.org>
Matthew Pitkin <matthew.pitkin@ligo.org> <mpitkin>
Matthew Pitkin <matthew.pitkin@ligo.org> <pitkin@gmail.com>
Max Isi <max.isi@ligo.org>
Maximillian Bensch <maximillian.bensch@ligo.org>
Maximillian Bensch <maximillian.bensch@ligo.org> <maximillian.bensch@aei.mpg.de>
Michael Coughlin <michael.coughlin@ligo.org>
Michael Coughlin <michael.coughlin@ligo.org> <coughlim@carleton.edu>
Michael Coughlin <michael.coughlin@ligo.org> <mcoughlin@sugar-dev2.phy.syr.edu>
......@@ -284,6 +293,7 @@ Rejean Dupuis <rejean@caltech.edu>
Rejean Dupuis <rejean@caltech.edu> <rejean>
Riccardo Sturani <riccardo.sturani@ligo.org>
Riccardo Sturani <riccardo.sturani@ligo.org> <riccardo.sturani@uniurb.it>
Riccardo Sturani <riccardo.sturani@ligo.org> <riccardo@iip.ufrn.br>
Riccardo Sturani <riccardo.sturani@ligo.org> <riccardo@riccardo-laptop.(none)>
Romain Gouaty <romain.gouaty@ligo.org>
Romain Gouaty <romain.gouaty@ligo.org> <romain>
......@@ -310,9 +320,12 @@ Scott Koranda <scott.koranda@ligo.org>
Scott Koranda <scott.koranda@ligo.org> <skoranda>
Sean Seader <sseader>
Sebastian Khan <sebastian.khan@ligo.org>
Sebastian Khan <sebastian.khan@ligo.org> <Sebastian.Khan@LIGO.org>
Sebastian Khan <sebastian.khan@ligo.org> <sebastian.khan@atlas2.atlas.local>
Shin Kee Chung <shinkee.chung@ligo.org>
Shin Kee Chung <shinkee.chung@ligo.org> <shinkee>
Soichiro Morisaki <soichiro.morisaki@ligo.org>
Sophie Hourihane <sophie.hourihane@ligo.org>
Stanislav Babak <Stanislav.Babak@aei.mpg.de>
Stanislav Babak <Stanislav.Babak@aei.mpg.de> <babak>
Stanislav Babak <Stanislav.Babak@aei.mpg.de> <stas@switchblade.aei.mpg.de>
......
# Contributing to LALSuite
This page outlines the recommended procedure for contributing changes to the LALSuite repository. Please read the introduction to [GitLab on git.ligo.org](https://wiki.ligo.org/DASWG/GitLigoOrg) before you start.
This page outlines the recommended procedure for contributing changes to the LALSuite repository. Please read the introduction to [GitLab on git.ligo.org](https://wiki.ligo.org/Computing/GitLigoOrg) before you start.
## Reporting Issues
When reporting issues, please include as much detail as possible to reproduce the error, including information about your operating system and the version of each (relevant) component of LALSuite.
If you have ligo.org authentication, please report issues directly through gitlab.
Otherwise, you can use the service desk address
contact+lscsoft-lalsuite-1438-issue-@support.ligo.org
to send bug reports by e-mail.
In either case, please include as much detail as possible to reproduce the error, including information about your operating system and the version of each (relevant) component of LALSuite.
If possible, please include a brief, self-contained code example that demonstrates the problem.
## Contributing code
......@@ -25,7 +30,7 @@ If you can't see the *Fork* button, make sure that you are logged in by checking
### Clone your fork
Make sure that you have installed and configured [git-lfs](https://wiki.ligo.org/DASWG/GitLFS#Install_the_git_LFS_client) for the management of large files. This is required to successfully build and install your development fork.
Make sure that you have installed and configured [git-lfs](https://wiki.ligo.org/Computing/GitLFS#Install_the_git_LFS_client) for the management of large files. This is required to successfully build and install your development fork.
Then, clone your fork with
......@@ -129,8 +134,8 @@ A feature branch should *not* be repurposed for further development as this can
### Special case: CW codes in LALPulsar and LALApps
For the continuous-wave (CW) related codes in the `lalpulsar/` and `lalapps/src/pulsar` directories,
issues should preferentially be reported [in the CW fork tracker](https://git.ligo.org/CW/lalsuite/issues).
Branches in that fork can also be used for short-term development, please also see the special contributing guide [here](https://git.ligo.org/CW/lalsuite/wikis/contributing).
issues should preferentially be reported [in the CW fork tracker](https://git.ligo.org/CW/software/lalsuite/issues).
Branches in that fork can also be used for short-term development, please also see the special contributing guide [here](https://git.ligo.org/CW/software/lalsuite/wikis/contributing).
## More Information
......
......@@ -2,32 +2,78 @@
This is the main LALSuite development repository.
We now utilize [git-lfs](https://wiki.ligo.org/DASWG/GitLFS#Install_the_git_LFS_client) for the managament of large files and as such `git-lfs` needs to be installed and configured to correctly clone this repository. After installing `git-lfs` it can be configured using:
## Acknowledgment
```
$ git lfs install
```
We request that any academic report, publication, or other academic
disclosure of results derived from the use of this software acknowledge
the use of the software by an appropriate acknowledgment or citation.
This only needs to be done once for each machine you access the repository. It can then be cloned using:
The whole LALSuite software suite can be cited with the DOI
[10.7935/GT1W-FZ16][doi]. An example BibTeX entry could look like this:
```
$ git clone git@git.ligo.org:lscsoft/lalsuite.git
```
@misc{lalsuite,
author = "{LIGO Scientific Collaboration}",
title = "{LIGO} {A}lgorithm {L}ibrary - {LALS}uite",
howpublished = "free software (GPL)",
doi = "10.7935/GT1W-FZ16",
year = "2018"
}
In addition, some codes contained in this package may be directly based
on one or several scientific papers, which should be cited when using
those specific codes; some of these can be discovered through the
documentation.
## Cloning the Repository
We now utilize [Git LFS][gitlfs] for the managament of large files and
as such `git-lfs` needs to be installed and configured to correctly
clone this repository. After installing `git-lfs` it can be configured
using:
$ git lfs install
This only needs to be done once for each machine you access the
repository. It can then be cloned using:
$ git clone git@git.ligo.org:lscsoft/lalsuite.git
## Contributing to LALSuite
The guide to [Contributing](https://git.ligo.org/lscsoft/lalsuite/blob/master/CONTRIBUTING.md) to LALSuite explains how to report issues and contribute fixes or new features using the fork and pull workflow. Please read and follow these directions.
The [guide to contributing to LALSuite][contributing] explains how to
report issues and contribute fixes or new features using the fork and
pull workflow. Please read and follow these directions.
## Nightly Documentation
The Doxygen Documentation is built under GitLab-CI every night and can be viewed at:
https://docs.ligo.org/lscsoft/lalsuite/
The [LALSuite Doxygen documentation][nightlydocs] is built under
GitLab-CI every night.
## Notes on Ancient History
LALSuite was transferred to git.ligo.org in December 2017. Older history has been imported, though commit hashes were rewritten during the GitLFS conversion. Please note:
LALSuite was transferred to `git.ligo.org` in December 2017. Older
history has been imported, though commit hashes were rewritten during
the [Git LFS][gitlfs] conversion. Please note:
1. The `Original:` commit IDs quoted in each commit message can be used
to compare with the [archived reference repo][oldlalsuite], old issue
discussions on the [Redmine tracker][oldredmine], review wiki pages
etc.
1. Commits before December 2017 may also include references to issues
(`#number`). These refer to the corresponding [Redmine
issue][oldredmine] (LVC-authorized access only), and any clickable
link the internal GitLab web interface produces for those old commits
will therefore be spurious.
## For More Information
1. The "Original: " commit IDs quoted in each commit message can be used to compare with the [archived reference repo](https://git.ligo.org/lscsoft/lalsuite-archive), old issue discussions on the [Redmine tracker](https://bugs.ligo.org/redmine/projects/lalsuite), review wiki pages etc.
Please visit the [LALSuite project page][project].
1. Commits before December 2017 may also include references to issues ("#number"). These refer to the corresponding [Redmine issue](https://bugs.ligo.org/redmine/projects/lalsuite) (LVC-authorized access only), and any clickable link the internal gitlab web interface produces for those old commits will be spurious.
[doi]: https://doi.org/10.7935/GT1W-FZ16
[gitlfs]: https://wiki.ligo.org/Computing/GitLFS#Install_the_git_LFS_client
[contributing]: https://git.ligo.org/lscsoft/lalsuite/blob/master/CONTRIBUTING.md
[nightlydocs]: https://lscsoft.docs.ligo.org/lalsuite
[oldlalsuite]: https://git.ligo.org/lscsoft/lalsuite-archive
[oldredmine]: https://bugs.ligo.org/redmine/projects/lalsuite
[project]: https://wiki.ligo.org/Computing/DASWG/LALSuite
AC_PREREQ([2.63])
AC_INIT([LALSuite],[6.48.1],[lal-discuss@ligo.org])
AC_INIT([LALSuite],[6.53.1],[lal-discuss@ligo.org])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([gnuscripts])
AC_CONFIG_MACRO_DIR([gnuscripts])
......@@ -33,12 +33,9 @@ LALSUITE_ENABLE_ALL_LAL
lal=true
LALSUITE_ENABLE_LALFRAME
LALSUITE_ENABLE_LALMETAIO
LALSUITE_ENABLE_LALXML
LALSUITE_ENABLE_LALSIMULATION
LALSUITE_ENABLE_LALBURST
LALSUITE_ENABLE_LALDETCHAR
LALSUITE_ENABLE_LALINSPIRAL
LALSUITE_ENABLE_LALSTOCHASTIC
LALSUITE_ENABLE_LALPULSAR
LALSUITE_ENABLE_LALINFERENCE
LALSUITE_ENABLE_LALAPPS
......@@ -124,12 +121,9 @@ export LALSUPPORT_LIBS LALSUPPORT_CFLAGS LALSUPPORT_DATA_PATH LALSUPPORT_OCTAVE_
# configure optional packages
lalsuite_config_subdir([LALFrame])
lalsuite_config_subdir([LALMetaIO])
lalsuite_config_subdir([LALXML])
lalsuite_config_subdir([LALSimulation])
lalsuite_config_subdir([LALBurst])
lalsuite_config_subdir([LALDetChar])
lalsuite_config_subdir([LALInspiral])
lalsuite_config_subdir([LALStochastic])
lalsuite_config_subdir([LALPulsar])
lalsuite_config_subdir([LALInference])
......@@ -150,12 +144,9 @@ LALSuite has now been successfully configured:
* LALFrame library support is $LALFRAME_ENABLE_VAL
* LALMetaIO library support is $LALMETAIO_ENABLE_VAL
* LALXML library support is $LALXML_ENABLE_VAL
* LALSimulation library support is $LALSIMULATION_ENABLE_VAL
* LALBurst library support is $LALBURST_ENABLE_VAL
* LALDetChar library support is $LALDETCHAR_ENABLE_VAL
* LALInspiral library support is $LALINSPIRAL_ENABLE_VAL
* LALStochastic library support is $LALSTOCHASTIC_ENABLE_VAL
* LALPulsar library support is $LALPULSAR_ENABLE_VAL
* LALInference library support is $LALINFERENCE_ENABLE_VAL
* LALApps library support is $LALAPPS_ENABLE_VAL
......
# -*- mode: autoconf; -*-
# lalsuite_build.m4 - top level build macros
#
# serial 149
# serial 152
# restrict which LALSUITE_... patterns can appearing in output (./configure);
# useful for debugging problems with unexpanded LALSUITE_... Autoconf macros
......@@ -801,19 +801,6 @@ if test "$metaio" = "false"; then
fi
])
AC_DEFUN([LALSUITE_ENABLE_LALXML],
[AC_REQUIRE([LALSUITE_ENABLE_ALL_LAL])
AC_ARG_ENABLE(
[lalxml],
AC_HELP_STRING([--enable-lalxml],[compile code that requires lalxml library [default=no]]),
[ case "${enableval}" in
yes) lalxml=true;;
no) lalxml=false;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-lalxml) ;;
esac
], [ lalxml=${all_lal:-false} ] )
])
AC_DEFUN([LALSUITE_ENABLE_LALSIMULATION],
[AC_REQUIRE([LALSUITE_ENABLE_ALL_LAL])
AC_ARG_ENABLE(
......@@ -846,25 +833,6 @@ if test "$lalsimulation" = "false"; then
fi
])
AC_DEFUN([LALSUITE_ENABLE_LALDETCHAR],
[AC_REQUIRE([LALSUITE_ENABLE_ALL_LAL])
AC_ARG_ENABLE(
[laldetchar],
AC_HELP_STRING([--enable-laldetchar],[compile code that requires laldetchar library [default=yes]]),
[ case "${enableval}" in
yes) laldetchar=true;;
no) laldetchar=false;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-laldetchar) ;;
esac
], [ laldetchar=${all_lal:-false} ] )
if test "$lalmetaio" = "false"; then
laldetchar=false
fi
if test "$lalburst" = "false"; then
laldetchar=false
fi
])
AC_DEFUN([LALSUITE_ENABLE_LALINSPIRAL],
[AC_REQUIRE([LALSUITE_ENABLE_ALL_LAL])
AC_ARG_ENABLE(
......@@ -900,22 +868,6 @@ AC_ARG_ENABLE(
], [ lalpulsar=${all_lal:-true} ] )
])
AC_DEFUN([LALSUITE_ENABLE_LALSTOCHASTIC],
[AC_REQUIRE([LALSUITE_ENABLE_ALL_LAL])
AC_ARG_ENABLE(
[lalstochastic],
AC_HELP_STRING([--enable-lalstochastic],[compile code that requires lalstochastic library [default=yes]]),
[ case "${enableval}" in
yes) lalstochastic=true;;
no) lalstochastic=false;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-lalstochastic) ;;
esac
], [ lalstochastic=${all_lal:-false} ] )
if test "$lalmetaio" = "false"; then
lalstochastic=false
fi
])
AC_DEFUN([LALSUITE_ENABLE_LALINFERENCE],
[AC_REQUIRE([LALSUITE_ENABLE_ALL_LAL])
AC_ARG_ENABLE(
......
include $(top_srcdir)/gnuscripts/lalsuite_top.am
EXTRA_DIST += README
if HAVE_GIT_REPO
# Override automake's default rule for rebuilding aclocal.m4, to ensure that
# ./configure is successfully recreated after certain build system changes which
......
SUFFIXES = .py
.PHONY: pymodule-all-local
.PHONY: pyscripts-all-local
.PHONY: pymodule-mostlyclean-local
.PHONY: pyscripts-mostlyclean-local
.PHONY: py-mostlyclean-local
.PHONY: pybin-install-exec-local
.PHONY: pybin-uninstall-local
.PHONY: pybin-dist-hook
if HAVE_PYTHON
BUILT_SOURCES += $(pymodule_PYTHON) $(pybin_scripts)
BUILT_SOURCES += $(pybin_scripts)
MOSTLYCLEANFILES += $(pybin_scripts)
uninstalled_runner = $(top_srcdir)/gnuscripts/lalsuite_run_uninstalled
......@@ -16,40 +19,50 @@ uninstalled_compiler = $(uninstalled_runner) '$(abs_top_builddir)' '$(abs_buildd
EXTRA_DIST += $(uninstalled_runner)
all-local: pymodule-all-local pyscripts-all-local
pymodule-all-local: pymodule-mostlyclean-local
pymodule-all-local:
$(AM_V_at)if test "x$(builddir)" != "x$(srcdir)"; then \
for file in $(pymodule_PYTHON); do \
if test -r "$(srcdir)/$${file}"; then \
rm -f "$(builddir)/$${file}" || exit 1; \
$(LN_S) "$(srcdir)/$${file}" "$(builddir)/$${file}" || exit 1; \
fi; \
done; \
fi
pyscripts-all-local: pyscripts-mostlyclean-local
pyscripts-all-local:
$(AM_V_at)if test "x$(builddir)" != "x$(srcdir)"; then \
for file in $(pybin_scripts); do \
if test -r "$(srcdir)/$${file}.py"; then \
rm -f "$(builddir)/$${file}.py" || exit 1; \
cp -p "$(srcdir)/$${file}.py" "$(builddir)/$${file}.py" || exit 1; \
fi; \
done; \
fi
mostlyclean-local: pymodule-mostlyclean-local pyscripts-mostlyclean-local
mostlyclean-local: pymodule-mostlyclean-local pyscripts-mostlyclean-local py-mostlyclean-local
pymodule-mostlyclean-local:
$(AM_V_at)if test "x$(builddir)" != "x$(srcdir)"; then \
for file in $(pymodule_PYTHON); do \
if test -r "$(srcdir)/$${file}"; then \
rm -f "$(builddir)/$${file}" "$(builddir)/$${file}c" "$(builddir)/$${file}o" || exit 1; \
echo " rm -f $(builddir)/$${file}"; \
rm -f "$(builddir)/$${file}" || exit 1; \
fi; \
done; \
fi
fi; \
for file in $(pymodule_PYTHON); do \
echo " rm -f $(builddir)/$${file}c $(builddir)/$${file}o"; \
rm -f "$(builddir)/$${file}c" "$(builddir)/$${file}o" || exit 1; \
done
pyscripts-mostlyclean-local:
$(AM_V_at)if test "x$(builddir)" != "x$(srcdir)"; then \
for file in $(pybin_scripts); do \
if test -r "$(srcdir)/$${file}.py"; then \
echo " rm -f $(builddir)/$${file}.py"; \
rm -f "$(builddir)/$${file}.py" || exit 1; \
fi; \
done; \
fi
py-mostlyclean-local:
-rm -rf __pycache__
$(pybin_scripts): Makefile pyscripts-all-local
.py:
......
......@@ -18,10 +18,12 @@ include $(top_srcdir)/gnuscripts/lalsuite_test.am
.PHONY: swig-octave-clean-local
.PHONY: swig-octave-install-hook
.PHONY: swig-octave-uninstall-hook
.PHONY: check-octave-manual
.PHONY: swig-python-all-local
.PHONY: swig-python-clean-local
.PHONY: swig-python-install-hook
.PHONY: swig-python-uninstall-hook
.PHONY: check-python-manual
header-links: header-links-local
......@@ -191,6 +193,9 @@ swig-octave-uninstall-hook:
test_scripts += SWIGTest$(PACKAGE_NAME)Octave.m
check-octave-manual: $(octexec_LTLIBRARIES)
$(AM_V_at)$(TESTS_ENVIRONMENT)$(test_script_compiler) $(RUNTOOL) $(OCTAVE) $(srcdir)/SWIGTest$(PACKAGE_NAME)Octave.m
endif # SWIG_BUILD_OCTAVE
if SWIG_BUILD_PYTHON
......@@ -254,6 +259,9 @@ swig-python-uninstall-hook:
test_scripts += SWIGTest$(PACKAGE_NAME)Python.py
check-python-manual: $(pkgpyexec_LTLIBRARIES)
$(AM_V_at)$(TESTS_ENVIRONMENT)$(test_script_compiler) $(RUNTOOL) $(PYTHON) $(srcdir)/SWIGTest$(PACKAGE_NAME)Python.py
endif # SWIG_BUILD_PYTHON
tags-am:
......
......@@ -329,7 +329,12 @@ AC_DEFUN([LALSUITE_USE_SWIG_OCTAVE],[
# is installed in the same directory as Octave, .oct files will be found by
# Octave without having to add to OCTAVE_PATH
AC_MSG_CHECKING([${OCTAVE} .oct installation directory])
octave_prefix=[`${octave_cfg} -p PREFIX 2>/dev/null | ${SED} -e 's|/*$||'`]
# at least in Debian Buster, "HOME" has been dropped in favour of "OCTAVE_HOME"
octave_prefix=[`${octave_cfg} -p OCTAVE_HOME 2>/dev/null | ${SED} -e 's|/*$||'`]
# fallback if OCTAVE_HOME is yet unknown
AS_IF([test "x${octave_prefix}" = x],[
octave_prefix=[`${octave_cfg} -p PREFIX 2>/dev/null | ${SED} -e 's|/*$||'`]
])
octexecdir=[`${octave_cfg} -p LOCALVEROCTFILEDIR 2>/dev/null | ${SED} -e 's|/*$||'`]
octexecdir=[`echo ${octexecdir} | ${SED} -e "s|^${octave_prefix}/||"`]
AS_IF([test "x`echo ${octexecdir} | ${SED} -n -e '\|^/|p'`" != x],[
......
......@@ -41,11 +41,3 @@ EXTRA_DIST += $(test_script_runner)
SH_LOG_COMPILER = $(SHELL)
M_LOG_COMPILER = $(test_script_compiler) "$(OCTAVE)" -fH
PY_LOG_COMPILER = $(test_script_compiler) "$(PYTHON)" -u
.PHONY: run-octave
run-octave: $(octexec_LTLIBRARIES)
$(AM_V_at)$(TESTS_ENVIRONMENT)$(test_script_compiler) $(RUNTOOL) "$(OCTAVE)" $(RUNARGS)
.PHONY: run-python
run-python: $(pkgpyexec_LTLIBRARIES)
$(AM_V_at)$(TESTS_ENVIRONMENT)$(test_script_compiler) $(RUNTOOL) "$(PYTHON)" $(RUNARGS)
BUILT_SOURCES += $(PACKAGE)-user-env.csh $(PACKAGE)-user-env.sh $(PACKAGE)-user-env.fish
sysconf_DATA += $(PACKAGE)-user-env.csh $(PACKAGE)-user-env.sh $(PACKAGE)-user-env.fish
MOSTLYCLEANFILES += $(PACKAGE)-user-env.csh $(PACKAGE)-user-env.sh $(PACKAGE)-user-env.fish $(PACKAGE)-user-env.shell
EXTRA_DIST += gnuscripts/generate_user_env.awk
EXTRA_DIST += README.md gnuscripts/generate_user_env.awk
$(PACKAGE)-user-env.shell: Makefile $(srcdir)/gnuscripts/generate_user_env.awk
$(AM_V_GEN)if echo "$(user_environment)" | $(AWK) -f $(srcdir)/gnuscripts/generate_user_env.awk >$@; then \
......
......@@ -43,7 +43,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=m4_default([$1], [0.9.0])
_pkg_min_version=m4_default([$1], [0.18.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
AC_MSG_RESULT([yes])
......
LAL
================================
# LAL
Core gravitational wave analysis routines.
Acknowledgment
--------------------------------
## Acknowledgment
We request that any academic report, publication, or other academic
disclosure of results derived from the use of this software acknowledge
the use of the software by an appropriate acknowledgment or citation.
Basic Build Instructions
--------------------------------
The whole LALSuite software suite can be cited with the DOI
[10.7935/GT1W-FZ16][doi]. An example BibTeX entry could look like this:
@misc{lalsuite,
author = "{LIGO Scientific Collaboration}",
title = "{LIGO} {A}lgorithm {L}ibrary - {LALS}uite",
howpublished = "free software (GPL)",
doi = "10.7935/GT1W-FZ16",
year = "2018"
}
In addition, some codes contained in this package may be directly based
on one or several scientific papers, which should be cited when using
those specific codes; some of these can be discovered through the
documentation.
## Basic Build Instructions
./configure --prefix=...
make
......@@ -20,17 +33,18 @@ Basic Build Instructions
Please read the [LALSuite install how-to][install] for more detailed
build instructions.
Bug Reporting
--------------------------------
## Bug Reporting
Please visit the [LALSuite bug reporting system][bugs] (LIGO.org
authentication required).
authentication required to submit new issues), or use the [e-mail
helpdesk][helpdesk].
For More Information
--------------------------------
## For More Information
Please visit the [LALSuite project page][project].
[install]: https://wiki.ligo.org/DASWG/LALSuiteInstall
[bugs]: https://git.ligo.org/lscsoft/lalsuite/issues/
[project]: https://wiki.ligo.org/DASWG/LALSuite
[doi]: https://doi.org/10.7935/GT1W-FZ16
[helpdesk]: mailto:contact+lscsoft-lalsuite-1438-issue-@support.ligo.org
[install]: https://wiki.ligo.org/Computing/DASWG/LALSuiteInstall
[bugs]: https://git.ligo.org/lscsoft/lalsuite/issues/
[project]: https://wiki.ligo.org/Computing/DASWG/LALSuite
AC_PREREQ([2.63])
AC_INIT([LAL],[6.18.0.1],[lal-discuss@ligo.org])
AC_INIT([LAL],[6.19.2.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([src/config.h src/LALConfig.h])
AC_CONFIG_SRCDIR([src/std/LALStdio.h])
AC_CONFIG_AUX_DIR([gnuscripts])
......@@ -88,9 +88,9 @@ LALSUITE_DISTCHECK_CONFIGURE_FLAGS
# then increment age.
# 6. if any interfaces have been removed since the last public release,
# then set age to 0.
AC_SUBST([LIBCURRENT],[14])
AC_SUBST([LIBCURRENT],[16])
AC_SUBST([LIBREVISION],[0])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBAGE],[2])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# set library api info - liblalsupport
......@@ -107,8 +107,8 @@ AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# then increment age.
# 6. if any interfaces have been removed since the last public release,
# then set age to 0.
AC_SUBST([LIBCURRENT_SUPPORT],[11])
AC_SUBST([LIBREVISION_SUPPORT],[0])
AC_SUBST([LIBCURRENT_SUPPORT],[12])
AC_SUBST([LIBREVISION_SUPPORT],[1])
AC_SUBST([LIBAGE_SUPPORT],[0])
AC_SUBST([LIBVERSION_SUPPORT],[${LIBCURRENT_SUPPORT}:${LIBREVISION_SUPPORT}:${LIBAGE_SUPPORT}])
......
lal (6.19.2-1) unstable; urgency=low
* ER14 release
-- Adam Mercer <adam.mercer@ligo.org> Mon, 25 Feb 2019 09:11:52 -0700
lal (6.19.1-1) unstable; urgency=low
* Intel FFT complilation fixes
-- Adam Mercer <adam.mercer@ligo.org> Mon, 07 Jan 2019 14:02:28 +0000
lal (6.19.0-1) unstable; urgency=low
* Pre O3 release
-- Adam Mercer <adam.mercer@ligo.org> Thu, 13 Sep 2018 14:58:14 -0700
lal (6.18.0-1) unstable; urgency=low
* LAL 6.18.0
......
......@@ -11,20 +11,22 @@ Build-Depends: bc,
libgsl0-dev (>= 1.9) | libgsl-dev,
libhdf5-dev,
liboctave-dev,
pkg-config,
pkg-config (>= 0.18.0),
python-all-dev,
python-ligo-segments,
python-glue (>= @MIN_GLUE_VERSION@),
python-numpy,
python-scipy,
python-six,
python-dateutil,
python3-all-dev,
python3-ligo-segments,
python3-glue (>= @MIN_GLUE_VERSION@),
python3-numpy,
python3-scipy,
python3-six,
python3-dateutil,
swig (>= 3.0.7),
swig (>= 3.0.7) | swig3.0 (>= 3.0.7),
zlib1g-dev
X-Python-Version: >= 2.7
X-Python3-Version: >= 3.4
......@@ -74,6 +76,7 @@ Depends: ${misc:Depends},
${shlibs:Depends},
python-ligo-segments,
python-glue (>= @MIN_GLUE_VERSION@),
python-scipy,
python-six,
python-dateutil,
lal (= ${binary:Version})
......@@ -100,6 +103,7 @@ Depends: ${misc:Depends},
${shlibs:Depends},
python3-ligo-segments,
python3-glue (>= @MIN_GLUE_VERSION@),
python3-scipy,
python3-six,
python3-dateutil,
lal (= ${binary:Version})
......
......@@ -46,7 +46,7 @@ html-local: Makefile $(CONFIG_CLEAN_FILES)
export doxygen_exclude; doxygen_exclude=`cat $(abs_srcdir)/exclude.list | tr '\n' ' '`; \
echo '/* Generated by $(subdir)/Makefile */' > autogen.dox; \
echo '/** \mainpage' >> autogen.dox; \
cat in/README >> autogen.dox; \
cat in/README.md >> autogen.dox; \
echo '*/' >> autogen.dox; \