Commit a2440675 authored by Ole Streicher's avatar Ole Streicher

Merge tag 'upstream/4.3.0+dfsg' into debian

Upstream version 4.3.0+dfsg
parents 3086be83 1b175bbc
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -79,16 +89,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
DIST_COMMON = $(top_srcdir)/admin/doxygen.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(srcdir)/config.h.in \
$(srcdir)/Makefile.purify.in $(top_srcdir)/doxygen/Doxyfile.in \
AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README TODO \
admin/compile admin/config.guess admin/config.sub \
admin/install-sh admin/missing admin/ltmain.sh \
$(top_srcdir)/admin/compile $(top_srcdir)/admin/config.guess \
$(top_srcdir)/admin/config.sub $(top_srcdir)/admin/install-sh \
$(top_srcdir)/admin/ltmain.sh $(top_srcdir)/admin/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4macros/cpl.m4 \
......@@ -98,15 +98,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/cpl.m4 \
$(top_srcdir)/m4macros/ltsugar.m4 \
$(top_srcdir)/m4macros/ltversion.m4 \
$(top_srcdir)/m4macros/lt~obsolete.m4 \
$(top_srcdir)/m4macros/purify.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = Makefile.purify doxygen/Doxyfile
CONFIG_CLEAN_FILES = doxygen/Doxyfile
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
......@@ -194,6 +195,14 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/admin/compile $(top_srcdir)/admin/config.guess \
$(top_srcdir)/admin/config.sub $(top_srcdir)/admin/doxygen.am \
$(top_srcdir)/admin/install-sh $(top_srcdir)/admin/ltmain.sh \
$(top_srcdir)/admin/missing $(top_srcdir)/doxygen/Doxyfile.in \
AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README TODO \
admin/compile admin/config.guess admin/config.sub \
admin/install-sh admin/ltmain.sh admin/missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -295,6 +304,7 @@ LTLIBOBJS = @LTLIBOBJS@
LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
......@@ -313,7 +323,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PURIFY_CMD = @PURIFY_CMD@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
......@@ -379,6 +388,7 @@ prefix = @prefix@
privatelibdir = @privatelibdir@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......@@ -433,7 +443,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -443,7 +452,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
$(top_srcdir)/admin/doxygen.am:
$(top_srcdir)/admin/doxygen.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
......@@ -468,8 +477,6 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
Makefile.purify: $(top_builddir)/config.status $(srcdir)/Makefile.purify.in
cd $(top_builddir) && $(SHELL) ./config.status $@
doxygen/Doxyfile: $(top_builddir)/config.status $(top_srcdir)/doxygen/Doxyfile.in
cd $(top_builddir) && $(SHELL) ./config.status $@
......@@ -694,15 +701,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
......@@ -738,17 +745,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
mkdir $(distdir)/_build $(distdir)/_inst
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure \
&& $(am__cd) $(distdir)/_build/sub \
&& ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=.. --prefix="$$dc_install_base" \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
......@@ -931,6 +938,8 @@ uninstall-am: uninstall-local uninstall-pipedocsDATA
ps ps-am tags tags-am uninstall uninstall-am uninstall-local \
uninstall-pipedocsDATA
.PRECIOUS: Makefile
@MAINTAINER_MODE_TRUE@clean-local: clean-doxygen
......
#*******************************************************************************
# E.S.O. - VLT project
#
# "@(#) $Id: Makefile.purify.in,v 1.2 2008-05-09 14:01:27 cguirao Exp $"
#
# Makefile of Pipeline subsystem.
#
# who when what
# -------- ---------- ----------------------------------------------
#
ifdef MAKE_PURE
ENABLE_PURIFY=on
ENABLE_PURECOV=on
ENABLE_PURE=on
endif
ifdef MAKE_PUREGUI
ENABLE_PURIFY=on
ENABLE_PURECOV=on
endif
ifdef MAKE_PURIFY
ENABLE_PURIFY=on
endif
ifdef MAKE_PURECOV
ENABLE_PURECOV=on
endif
# -user-path="../test:../src:src:test" \
ifdef ENABLE_PURIFY
PURIFY = purify \
-always-use-cache-dir \
-g++=yes \
-log-file=./.purifydir/MemoryReport \
-linker=$(GNU_ROOT)/bin/ld \
-append-logfile=yes \
-messages=batch \
-dlclose-mode=2 \
-view-file=./.purifydir/purify-%v.pv \
-chain-length=100
else
PURIFY =
endif
ifdef MAKE_PUREGUI
PURIFY = purify \
-always-use-cache-dir \
-user-path="../test:../src:src:test" \
-g++=yes \
-linker=$(GNU_ROOT)/bin/ld
endif
ifdef ENABLE_PURECOV
PURECOV = purecov \
-always-use-cache-dir \
-counts-file=./.purifydir/purecov-%v.pcv
ifdef MAKE_PUREGUI
PURECOV = purecov -always-use-cache-dir
endif
else
PURECOV =
endif
ifdef ENABLE_PURIFY
CCLD = "$(PURIFY)" $(CC)
endif
ifdef ENABLE_PURECOV
CCLD = "$(PURECOV)" $(CC)
endif
ifdef ENABLE_PURE
CCLD = "$(PURIFY) $(PURECOV)" $(CC)
endif
pureReport:
@ purecov -export=.purifydir/CoverageReport .purifydir/*.pcv
@ echo "== Purify coverage report in '.purifydir/CoverageReport'."
pureGUI:
@ ls purecov*.pcv > /dev/null 2>&1; if [ $$? = "0" ]; then purecov -view purecov*.pcv &; fi
@ ls purify*.pv > /dev/null 2>&1; if [ $$? = "0" ]; then \
for member in `ls purify*.pv`; \
do purify -view $$member & \
done \
fi
check-am: make_links
make_links:
ifeq ($(ENABLE_PURIFY),on)
-@if [ ! -d .purifydir ]; then mkdir .purifydir ; fi
endif
ifeq ($(ENABLE_PURECOV),on)
-@if [ ! -d .purifydir ]; then mkdir .purifydir ;fi
endif
clean-am: pureClean
pureClean:
-@ rm -rf .purifydir/*
Version 4.3.0 (Public release)
------------------------------
* Update low resolution dispersion relation.
The old relation was very inaccurate especially above 11 µm, the new one
will produce much better wavelength calibration but the accuracy is still in
the order of 5 pixels or 0.05µm.
* Disable application of the linearity correction to the spectroscopic data.
Specially for low signal counts the correction could cause severe signal
distortion. It is now only applied to the uncorrected skyframes during the
wavelength calibration. The object spectrum is not anymore corrected.
Imaging data was already not automatically linearity corrected.
* The pipeline can now handle any jitter angle and width on both detectors.
Previously the pipeline could fail for non-normal angles and width that are
larger than the chop throw in some modes.
* The static bad pixel masks for all the detectors have been merged into a
single file. The file now contains four image extensions for the four
supported detectors (DRS/AQU, IMG/SPC).
* Fix imaging Reflex workflow not converting data to Jy units.
* Fix object selector in imaging Reflex workflow only using half the selected
window size.
* Co-addition is now also performed on multiple cpu cores on Apple OSX.
* Workaround issues with low file descriptor limit on Apple OSX 10.11.
* Added classifications for acquisition frames to gasgano oca rules.
Note there is now a mailing list for new pipeline releases and related
annoucements. To subscribe to the list please go to:
http://eso.org/lists/listinfo/eso-pipelines-announce
Version 4.2.0 (Public release)
------------------------------
......
......@@ -309,7 +309,7 @@ AC_DEFUN([VISIR_CREATE_SYMBOLS],
AC_SUBST(LIBIRPLIB)
# Check for CPL and user defined libraries
AC_REQUIRE([CPL_CHECK_LIBS])
AC_REQUIRE([ESO_CHECK_CPL])
AC_REQUIRE([ESO_CHECK_EXTRA_LIBS])
all_includes='$(VISIR_INCLUDES) $(CPL_INCLUDES) $(EXTRA_INCLUDES)'
......
This diff is collapsed.
......@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
......
This diff is collapsed.
#! /bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2013 Free Software Foundation, Inc.
# Copyright 1992-2015 Free Software Foundation, Inc.
timestamp='2013-08-10'
timestamp='2015-08-20'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -25,7 +25,7 @@ timestamp='2013-08-10'
# of the GNU General Public License, version 3 ("GPLv3").
# Please send patches with a ChangeLog entry to config-patches@gnu.org.
# Please send patches to <config-patches@gnu.org>.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
......@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright 1992-2013 Free Software Foundation, Inc.
Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -117,7 +117,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
......@@ -255,16 +255,18 @@ case $basic_machine in
| arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
| ba \
| be32 | be64 \
| bfin \
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
| epiphany \
| fido | fr30 | frv \
| e2k | epiphany \
| fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| k1om \
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
......@@ -282,8 +284,10 @@ case $basic_machine in
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa32r6 | mipsisa32r6el \
| mipsisa64 | mipsisa64el \
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64r6 | mipsisa64r6el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipsr5900 | mipsr5900el \
......@@ -295,14 +299,14 @@ case $basic_machine in
| nds32 | nds32le | nds32be \
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
| open8 \
| or1k | or32 \
| open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
......@@ -310,6 +314,7 @@ case $basic_machine in
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
......@@ -324,7 +329,10 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
leon|leon[3-9])
basic_machine=sparc-$basic_machine
;;
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
......@@ -369,18 +377,20 @@ case $basic_machine in
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| ba-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| e2k-* | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
| k1om-* \
| le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
......@@ -400,8 +410,10 @@ case $basic_machine in
| mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa32r6-* | mipsisa32r6el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64r6-* | mipsisa64r6el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipsr5900-* | mipsr5900el-* \
......@@ -413,16 +425,18 @@ case $basic_machine in
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
| or1k*-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
| riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile*-* \
......@@ -430,6 +444,7 @@ case $basic_machine in
| ubicom32-* \
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
| visium-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
......@@ -506,6 +521,9 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
asmjs)
basic_machine=asmjs-unknown
;;
aux)
basic_machine=m68k-apple
os=-aux
......@@ -767,6 +785,9 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
leon-*|leon[3-9]-*)
basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
......@@ -822,6 +843,10 @@ case $basic_machine in
basic_machine=powerpc-unknown
os=-morphos
;;
moxiebox)
basic_machine=moxie-unknown
os=-moxiebox
;;
msdos)
basic_machine=i386-pc
os=-msdos
......@@ -1354,7 +1379,7 @@ case $os in
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
......@@ -1367,14 +1392,14 @@ case $os in
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
......@@ -1592,9 +1617,6 @@ case $basic_machine in
mips*-*)
os=-elf
;;
or1k-*)
os=-elf
;;
or32-*)
os=-coff
;;
......
......@@ -3,7 +3,7 @@
scriptversion=2013-05-30.07; # UTC
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
This diff is collapsed.
This diff is collapsed.
......@@ -3,7 +3,7 @@
scriptversion=2013-10-28.13; # UTC
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
......
......@@ -3,7 +3,7 @@
scriptversion=2013-07-13.22; # UTC
# Copyright (C) 2011-2013 Free Software Foundation, Inc.
# Copyright (C) 2011-2014 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -106,11 +106,14 @@ trap "st=143; $do_exit" 15
# Test script is run here.
"$@" >$log_file 2>&1
estatus=$?
if test $enable_hard_errors = no && test $estatus -eq 99; then
estatus=1
tweaked_estatus=1
else
tweaked_estatus=$estatus
fi
case $estatus:$expect_failure in
case $tweaked_estatus:$expect_failure in
0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
0:*) col=$grn res=PASS recheck=no gcopy=no;;
77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
......@@ -119,6 +122,12 @@ case $estatus:$expect_failure in
*:*) col=$red res=FAIL recheck=yes gcopy=yes;;
esac
# Report the test outcome and exit status in the logs, so that one can
# know whether the test passed or failed simply by looking at the '.log'
# file, without the need of also peaking into the corresponding '.trs'
# file (automake bug#11814).
echo "$res $test_name (exit status: $estatus)" >>$log_file
# Report outcome to console.
echo "${col}${res}${std}: $test_name"
......
......@@ -42,7 +42,7 @@ PRINTER_NAME=lp
PRINT_FONT=Monospaced:16
PRINT_ORIENTATION=P
RADEC_CONVERSION=true
RECIPE_SET=visir_img_reduce=/home/quality/pipelines/visir/lib/esopipes-plugins/visir-4.2.0/visir_img_reduce.so;visir_spc_reduce=/home/quality/pipelines/visir/lib/esopipes-plugins/visir-4.2.0/visir_spc_reduce.so;visir_util_repack=/home/quality/pipelines/visir/lib/esopipes-plugins/visir-4.2.0/visir_util_repack.so;visir_util_img_std_cat=/home/quality/pipelines/visir/lib/esopipes-plugins/visir-4.2.0/visir_util_img_std_cat.so;visir_util_spc_std_cat=/home/quality/pipelines/visir/lib/esopipes-plugins/visir-4.2.0/visir_util_spc_std_cat.so;visir_img_dark=/home/quality/pipelines/visir/lib/esopipes-plugins/visir-4.2.0/visir_img_dark.so;visir_util_spc_txt2fits=/home/quality/pipelines/visir/lib/esopipes-plugins/visir-4.2.0/visir_util_spc_txt2fits.so
RECIPE_SET=visir_img_reduce=/home/quality/pipelines/visir/lib/esopipes-plugins/visir-4.3.0/visir_img_reduce.so;visir_spc_reduce=/home/quality/pipelines/visir/lib/esopipes-plugins/visir-4.3.0/visir_spc_reduce.so;visir_util_repack=/home/quality/pipelines/visir/lib/esopipes-plugins/visir-4.3.0/visir_util_repack.so;visir_util_img_std_cat=/home/quality/pipelines/visir/lib/esopipes-plugins/visir-4.3.0/visir_util_img_std_cat.so;visir_util_spc_std_cat=/home/quality/pipelines/visir/lib/esopipes-plugins/visir-4.3.0/visir_util_spc_std_cat.so;visir_img_dark=/home/quality/pipelines/visir/lib/esopipes-plugins/visir-4.3.0/visir_img_dark.so;visir_util_spc_txt2fits=/home/quality/pipelines/visir/lib/esopipes-plugins/visir-4.3.0/visir_util_spc_txt2fits.so
SCRIPTS_DIR=gasgano/scripts
SHORTEN_FILES_PATH=true
SHORT_FILENAME=false
......
......@@ -2,7 +2,11 @@ if DPR.CATG like "%TEST%" then
{
DO.CATG = "TEST_DATA";
}
if DPR.CATG like "%ACQUISITION%" and INS.SLIT1.NAME == "OPEN" then
if DPR.CATG like "%ACQUISITION%" then
{
DO.CATG = "ACQUISITION";
}
if DPR.CATG like "%ACQUISITION%" and (INS.MODE == "SPCIMG" and INS.SLIT1.NAME == "OPEN") or INS.MODE == "IMG" then
{
DO.CATG = "ACQ_OBS_CHO_NOD_JIT";
}
......@@ -345,14 +349,9 @@ if PRO.CATG == "IMG_STD_CATALOG" then
DO.CATG = "IMG_STD_CATALOG";
}
if DPR.CATG like "%CALIB%" and DPR.TECH like "%STATIC_MASK%" and DPR.TECH like "%IMAGE%" then
{
DO.CATG = "STATIC_MASK_IMAGE";
}
if DPR.CATG like "%CALIB%" and DPR.TECH like "%STATIC_MASK%" and DPR.TECH like "%SPECTRUM%" then
if DPR.CATG like "%CALIB%" and DPR.TECH like "%STATIC_MASK%" then
{
DO.CATG = "STATIC_MASK_SPECTRUM";
DO.CATG = "STATIC_MASK";
}
if DPR.CATG like "%CALIB%" and DPR.TECH like "%LINEARITY_TABLE%" then
......@@ -654,7 +653,7 @@ select execute(visir_chopnod_average) from inputFiles where SIG.TEMPLATE == 1 an
action visir_img_reduce
{
minRet = 0; maxRet = 1;
select file as STATIC_MASK from calibFiles where DO.CATG == "STATIC_MASK_IMAGE";
select file as STATIC_MASK from calibFiles where DO.CATG == "STATIC_MASK";
/* limit number or reduced planes to avoid long reductions slowing down later shorter reductions */
recipe visir_img_reduce {
"--planelimit=2000";
......@@ -664,7 +663,7 @@ recipe visir_img_reduce {
action visir_img_reduce_phot
{
minRet = 0; maxRet = 1;
select file as STATIC_MASK from calibFiles where DO.CATG == "STATIC_MASK_IMAGE";
select file as STATIC_MASK from calibFiles where DO.CATG == "STATIC_MASK";
minRet = 1; maxRet = 1;
select file as IMG_STD_CATALOG from calibFiles where DO.CATG == "IMG_STD_CATALOG";
recipe visir_img_reduce;
......@@ -688,7 +687,7 @@ recipe visir_img_trans;
action visir_spc_reduce
{
minRet = 0; maxRet = 1;
select file as STATIC_MASK from calibFiles where DO.CATG == "STATIC_MASK_SPECTRUM";
select file as STATIC_MASK from calibFiles where DO.CATG == "STATIC_MASK";
minRet = 1; maxRet = 1;
select file as SPEC_CAL_LINES from calibFiles where DO.CATG == "SPEC_CAL_LINES";
minRet = 1; maxRet = 1;
......@@ -728,7 +727,7 @@ recipe visir_old_spc_wcal_ech;
action visir_spc_reduce_phot
{
minRet = 0; maxRet = 1;
select file as STATIC_MASK from calibFiles where DO.CATG == "STATIC_MASK_SPECTRUM";
select file as STATIC_MASK from calibFiles where DO.CATG == "STATIC_MASK";
minRet = 1; maxRet = 1;
select file as SPEC_STD_CATALOG from calibFiles where DO.CATG == "SPEC_STD_CATALOG";
minRet = 1; maxRet = 1;
......@@ -775,7 +774,7 @@ recipe visir_old_spc_obs;
action visir_chopnod_average
{
minRet = 0; maxRet = 1;
select file as STATIC_MASK from calibFiles where DO.CATG == "STATIC_MASK_IMAGE";
select file as STATIC_MASK from calibFiles where DO.CATG == "STATIC_MASK";
recipe visir_util_repack {
"--bkgcorrect=chopnod";
}
......
......@@ -77,8 +77,7 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Name of package */
......
This diff is collapsed.
# Process this file with autoconf to produce a configure script.
AC_INIT([VISIR Instrument Pipeline], [4.2.0], [llundin@eso.org], [visir])
AC_INIT([VISIR Instrument Pipeline], [4.3.0], [llundin@eso.org], [visir])
AC_PREREQ([2.59])
AC_CONFIG_SRCDIR([Makefile.am])
......@@ -91,10 +91,7 @@ AC_CHECK_FUNCS([floor pow sqrt isinf isnan erf posix_memalign sysconf posix_fadv
ESO_FUNC_STRDUP
# Check for CPL presence and usability