Commit ca8e2d51 authored by Ole Streicher's avatar Ole Streicher

Updated version 3.0.0+dfsg from 'upstream/3.0.0+dfsg'

with Debian dir e7f438b687cebc4e0cc6f730d806171db4087edf
parents 3c4c64a9 c75fe6e5
3.0.0 19/04/2017 Renamed 2.9.9 as 3.0.0 for public release
2.9.9 03/04/2017 Fixed PIPE-7147
2.9.8 23/02/2017 Candidate April 2017 release (fixed RBS cfg)
2.9.7 23/02/2017 Candidate April 2017 release (fixed use of standard DO rules)
2.9.6 21/02/2017 Candidate April 2017 release (updated user manual)
2.9.5 13/02/2017 Candidate April 2017 release (clean gasgano oca rules location)
2.9.4 10/02/2017 Candidate April 2017 release
2.9.3 03/01/2017 m4macros from common svn location
2.9.2 19/12/2016 Added simple extraction method and parameters to control extraction
2.9.1 29/06/2016 Fixed bug estimation and correction of sky background during extraction (PIPE-6697)
2.9.0 03/03/2016 April release 2016: added INSTRUME in reflex wkf oca rules key check PIPE-6495 2.9.0 03/03/2016 April release 2016: added INSTRUME in reflex wkf oca rules key check PIPE-6495
2.8.0 15/02/2016 April release 2016 (with cleaned documentation) 2.8.0 15/02/2016 April release 2016 (with cleaned documentation)
2.8.0b2 08/02/2016 Candidate release (removed check for CEX library in configure.ac) 2.8.0b2 08/02/2016 Candidate release (removed check for CEX library in configure.ac)
......
# Makefile.in generated by automake 1.13.4 from Makefile.am. # Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@ # @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 # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
...@@ -15,7 +15,17 @@ ...@@ -15,7 +15,17 @@
@SET_MAKE@ @SET_MAKE@
VPATH = @srcdir@ 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 = \ am__make_running_with_option = \
case $${target_option-} in \ case $${target_option-} in \
?) ;; \ ?) ;; \
...@@ -79,16 +89,6 @@ POST_UNINSTALL = : ...@@ -79,16 +89,6 @@ POST_UNINSTALL = :
build_triplet = @build@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
target_triplet = @target@ target_triplet = @target@
DIST_COMMON = $(top_srcdir)/admin/html.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 = . subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4macros/cpl.m4 \ am__aclocal_m4_deps = $(top_srcdir)/m4macros/cpl.m4 \
...@@ -98,10 +98,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/cpl.m4 \ ...@@ -98,10 +98,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/cpl.m4 \
$(top_srcdir)/m4macros/ltsugar.m4 \ $(top_srcdir)/m4macros/ltsugar.m4 \
$(top_srcdir)/m4macros/ltversion.m4 \ $(top_srcdir)/m4macros/ltversion.m4 \
$(top_srcdir)/m4macros/lt~obsolete.m4 \ $(top_srcdir)/m4macros/lt~obsolete.m4 \
$(top_srcdir)/m4macros/purify.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(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 \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d mkinstalldirs = $(install_sh) -d
...@@ -194,6 +195,15 @@ ETAGS = etags ...@@ -194,6 +195,15 @@ ETAGS = etags
CTAGS = ctags CTAGS = ctags
CSCOPE = cscope CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS) DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.purify.in \
$(srcdir)/config.h.in $(top_srcdir)/admin/compile \
$(top_srcdir)/admin/config.guess \
$(top_srcdir)/admin/config.sub $(top_srcdir)/admin/html.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) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION) distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir) top_distdir = $(distdir)
...@@ -247,12 +257,11 @@ AWK = @AWK@ ...@@ -247,12 +257,11 @@ AWK = @AWK@
CC = @CC@ CC = @CC@
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
CPL_CFLAGS = @CPL_CFLAGS@
CPL_INCLUDES = @CPL_INCLUDES@ CPL_INCLUDES = @CPL_INCLUDES@
CPL_LDFLAGS = @CPL_LDFLAGS@ CPL_LDFLAGS = @CPL_LDFLAGS@
CPP = @CPP@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CX_INCLUDES = @CX_INCLUDES@
CX_LDFLAGS = @CX_LDFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
...@@ -278,7 +287,6 @@ IRPLIB_LDFLAGS = @IRPLIB_LDFLAGS@ ...@@ -278,7 +287,6 @@ IRPLIB_LDFLAGS = @IRPLIB_LDFLAGS@
LATEX = @LATEX@ LATEX = @LATEX@
LD = @LD@ LD = @LD@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBCEXT = @LIBCEXT@
LIBCPLCORE = @LIBCPLCORE@ LIBCPLCORE = @LIBCPLCORE@
LIBCPLDFS = @LIBCPLDFS@ LIBCPLDFS = @LIBCPLDFS@
LIBCPLDRS = @LIBCPLDRS@ LIBCPLDRS = @LIBCPLDRS@
...@@ -295,6 +303,7 @@ LTLIBOBJS = @LTLIBOBJS@ ...@@ -295,6 +303,7 @@ LTLIBOBJS = @LTLIBOBJS@
LT_AGE = @LT_AGE@ LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@ LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@ LT_REVISION = @LT_REVISION@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@ MANIFEST_TOOL = @MANIFEST_TOOL@
...@@ -313,7 +322,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ ...@@ -313,7 +322,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PURIFY_CMD = @PURIFY_CMD@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
...@@ -430,7 +438,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir ...@@ -430,7 +438,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \ $(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile $(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ @case '$?' in \
*config.status*) \ *config.status*) \
...@@ -440,7 +447,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ...@@ -440,7 +447,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac; esac;
$(top_srcdir)/admin/html.am: $(top_srcdir)/admin/html.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck $(SHELL) ./config.status --recheck
...@@ -452,8 +459,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ...@@ -452,8 +459,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps): $(am__aclocal_m4_deps):
config.h: stamp-h1 config.h: stamp-h1
@if test ! -f $@; then rm -f stamp-h1; else :; fi @test -f $@ || rm -f stamp-h1
@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1 @rm -f stamp-h1
...@@ -691,10 +698,16 @@ dist-xz: distdir ...@@ -691,10 +698,16 @@ dist-xz: distdir
$(am__post_remove_distdir) $(am__post_remove_distdir)
dist-tarZ: distdir dist-tarZ: distdir
@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 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir) $(am__post_remove_distdir)
dist-shar: distdir dist-shar: distdir
@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 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir) $(am__post_remove_distdir)
...@@ -729,16 +742,17 @@ distcheck: dist ...@@ -729,16 +742,17 @@ distcheck: dist
esac esac
chmod -R a-w $(distdir) chmod -R a-w $(distdir)
chmod u+w $(distdir) chmod u+w $(distdir)
mkdir $(distdir)/_build $(distdir)/_inst mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir) chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \ test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \ && am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \ && $(am__cd) $(distdir)/_build/sub \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) check \
...@@ -917,6 +931,8 @@ uninstall-am: uninstall-local uninstall-pipedocsDATA ...@@ -917,6 +931,8 @@ uninstall-am: uninstall-local uninstall-pipedocsDATA
ps ps-am tags tags-am uninstall uninstall-am uninstall-local \ ps ps-am tags tags-am uninstall uninstall-am uninstall-local \
uninstall-pipedocsDATA uninstall-pipedocsDATA
.PRECIOUS: Makefile
@MAINTAINER_MODE_TRUE@clean-local: clean-html @MAINTAINER_MODE_TRUE@clean-local: clean-html
......
This diff is collapsed.
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC 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>. # Written by Tom Tromey <tromey@cygnus.com>.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
......
#! /bin/sh #! /bin/sh
# Attempt to guess a canonical system name. # Attempt to guess a canonical system name.
# Copyright 1992-2014 Free Software Foundation, Inc. # Copyright 1992-2015 Free Software Foundation, Inc.
timestamp='2014-03-23' timestamp='2015-01-01'
# This file is free software; you can redistribute it and/or modify it # 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 # under the terms of the GNU General Public License as published by
...@@ -24,12 +24,12 @@ timestamp='2014-03-23' ...@@ -24,12 +24,12 @@ timestamp='2014-03-23'
# program. This Exception is an additional permission under section 7 # program. This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3"). # of the GNU General Public License, version 3 ("GPLv3").
# #
# Originally written by Per Bothner. # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
# #
# You can get the latest version of this script from: # You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
# #
# Please send patches with a ChangeLog entry to config-patches@gnu.org. # Please send patches to <config-patches@gnu.org>.
me=`echo "$0" | sed -e 's,.*/,,'` me=`echo "$0" | sed -e 's,.*/,,'`
...@@ -50,7 +50,7 @@ version="\ ...@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp) GNU config.guess ($timestamp)
Originally written by Per Bothner. Originally written by Per Bothner.
Copyright 1992-2014 Free Software Foundation, Inc. Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
...@@ -579,8 +579,9 @@ EOF ...@@ -579,8 +579,9 @@ EOF
else else
IBM_ARCH=powerpc IBM_ARCH=powerpc
fi fi
if [ -x /usr/bin/oslevel ] ; then if [ -x /usr/bin/lslpp ] ; then
IBM_REV=`/usr/bin/oslevel` IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else else
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi fi
......
#! /bin/sh #! /bin/sh
# Configuration validation subroutine script. # Configuration validation subroutine script.
# Copyright 1992-2014 Free Software Foundation, Inc. # Copyright 1992-2015 Free Software Foundation, Inc.
timestamp='2014-07-28' timestamp='2015-01-01'
# This file is free software; you can redistribute it and/or modify it # 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 # under the terms of the GNU General Public License as published by
...@@ -25,7 +25,7 @@ timestamp='2014-07-28' ...@@ -25,7 +25,7 @@ timestamp='2014-07-28'
# of the GNU General Public License, version 3 ("GPLv3"). # 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. # Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument. # Supply the specified configuration type as an argument.
...@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>." ...@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\ version="\
GNU config.sub ($timestamp) GNU config.sub ($timestamp)
Copyright 1992-2014 Free Software Foundation, Inc. Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
...@@ -260,7 +260,7 @@ case $basic_machine in ...@@ -260,7 +260,7 @@ case $basic_machine in
| c4x | c8051 | clipper \ | c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \ | d10v | d30v | dlx | dsp16xx \
| epiphany \ | epiphany \
| fido | fr30 | frv \ | fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \ | hexagon \
| i370 | i860 | i960 | ia64 \ | i370 | i860 | i960 | ia64 \
...@@ -302,6 +302,7 @@ case $basic_machine in ...@@ -302,6 +302,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \ | pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \ | powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \ | pyramid \
| riscv32 | riscv64 \
| rl78 | rx \ | rl78 | rx \
| score \ | 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[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
...@@ -312,6 +313,7 @@ case $basic_machine in ...@@ -312,6 +313,7 @@ case $basic_machine in
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \ | ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
| we32k \ | we32k \
| x86 | xc16x | xstormy16 | xtensa \ | x86 | xc16x | xstormy16 | xtensa \
| z8k | z80) | z8k | z80)
...@@ -326,6 +328,9 @@ case $basic_machine in ...@@ -326,6 +328,9 @@ case $basic_machine in
c6x) c6x)
basic_machine=tic6x-unknown basic_machine=tic6x-unknown
;; ;;
leon|leon[3-9])
basic_machine=sparc-$basic_machine
;;
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown basic_machine=$basic_machine-unknown
os=-none os=-none
...@@ -436,6 +441,7 @@ case $basic_machine in ...@@ -436,6 +441,7 @@ case $basic_machine in
| ubicom32-* \ | ubicom32-* \
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \ | vax-* \
| visium-* \
| we32k-* \ | we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \ | xstormy16-* | xtensa*-* \
...@@ -773,6 +779,9 @@ case $basic_machine in ...@@ -773,6 +779,9 @@ case $basic_machine in
basic_machine=m68k-isi basic_machine=m68k-isi
os=-sysv os=-sysv
;; ;;
leon-*|leon[3-9]-*)
basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
;;
m68knommu) m68knommu)
basic_machine=m68k-unknown basic_machine=m68k-unknown
os=-linux os=-linux
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
scriptversion=2013-05-30.07; # UTC 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 # 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 # it under the terms of the GNU General Public License as published by
......
This diff is collapsed.
This diff is collapsed.
#! /bin/sh #! /bin/sh
# Common wrapper for a few potentially missing GNU programs. # Common wrapper for a few potentially missing GNU programs.
scriptversion=2012-06-26.16; # UTC 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. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
...@@ -160,7 +160,7 @@ give_advice () ...@@ -160,7 +160,7 @@ give_advice ()
;; ;;
autom4te*) autom4te*)
echo "You might have modified some maintainer files that require" echo "You might have modified some maintainer files that require"
echo "the 'automa4te' program to be rebuilt." echo "the 'autom4te' program to be rebuilt."
program_details 'autom4te' program_details 'autom4te'
;; ;;
bison*|yacc*) bison*|yacc*)
......
#! /bin/sh #! /bin/sh
# test-driver - basic testsuite driver script. # test-driver - basic testsuite driver script.
scriptversion=2012-06-27.10; # UTC 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 # 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 # it under the terms of the GNU General Public License as published by
...@@ -44,13 +44,12 @@ print_usage () ...@@ -44,13 +44,12 @@ print_usage ()
Usage: Usage:
test-driver --test-name=NAME --log-file=PATH --trs-file=PATH test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
[--expect-failure={yes|no}] [--color-tests={yes|no}] [--expect-failure={yes|no}] [--color-tests={yes|no}]
[--enable-hard-errors={yes|no}] [--] TEST-SCRIPT [--enable-hard-errors={yes|no}] [--]
TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
The '--test-name', '--log-file' and '--trs-file' options are mandatory. The '--test-name', '--log-file' and '--trs-file' options are mandatory.
END END
} }
# TODO: better error handling in option parsing (in particular, ensure
# TODO: $log_file, $trs_file and $test_name are defined).
test_name= # Used for reporting. test_name= # Used for reporting.
log_file= # Where to save the output of the test script. log_file= # Where to save the output of the test script.
trs_file= # Where to save the metadata of the test run. trs_file= # Where to save the metadata of the test run.
...@@ -69,10 +68,23 @@ while test $# -gt 0; do ...@@ -69,10 +68,23 @@ while test $# -gt 0; do
--enable-hard-errors) enable_hard_errors=$2; shift;; --enable-hard-errors) enable_hard_errors=$2; shift;;
--) shift; break;; --) shift; break;;
-*) usage_error "invalid option: '$1'";; -*) usage_error "invalid option: '$1'";;
*) break;;
esac esac
shift shift
done done
missing_opts=
test x"$test_name" = x && missing_opts="$missing_opts --test-name"
test x"$log_file" = x && missing_opts="$missing_opts --log-file"
test x"$trs_file" = x && missing_opts="$missing_opts --trs-file"
if test x"$missing_opts" != x; then
usage_error "the following mandatory options are missing:$missing_opts"
fi
if test $# -eq 0; then
usage_error "missing argument"
fi
if test $color_tests = yes; then if test $color_tests = yes; then
# Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
red='' # Red. red='' # Red.
...@@ -94,11 +106,14 @@ trap "st=143; $do_exit" 15 ...@@ -94,11 +106,14 @@ trap "st=143; $do_exit" 15
# Test script is run here. # Test script is run here.
"$@" >$log_file 2>&1 "$@" >$log_file 2>&1
estatus=$? estatus=$?
if test $enable_hard_errors = no && test $estatus -eq 99; then if test $enable_hard_errors = no && test $estatus -eq 99; then
estatus=1 tweaked_estatus=1
else
tweaked_estatus=$estatus
fi fi
case $estatus:$expect_failure in case $tweaked_estatus:$expect_failure in
0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
0:*) col=$grn res=PASS recheck=no gcopy=no;; 0:*) col=$grn res=PASS recheck=no gcopy=no;;
77:*) col=$blu res=SKIP recheck=no gcopy=yes;; 77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
...@@ -107,6 +122,12 @@ case $estatus:$expect_failure in ...@@ -107,6 +122,12 @@ case $estatus:$expect_failure in
*:*) col=$red res=FAIL recheck=yes gcopy=yes;; *:*) col=$red res=FAIL recheck=yes gcopy=yes;;
esac 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. # Report outcome to console.
echo "${col}${res}${std}: $test_name" echo "${col}${res}${std}: $test_name"
......
...@@ -592,8 +592,49 @@ Context: process ...@@ -592,8 +592,49 @@ Context: process
Type: integer Type: integer
Value Format: %d Value Format: %d
Unit: Unit:
Comment Field: Number of arc lines used Comment Field: Average Number of arc lines used
Description: Number of arc lines used to evaluate dispersion Description: Average Number of arc lines used to evaluate dispersion
#Not dumped
Parameter Name: QC WAVE NLINES MIN
Class: header|qc-log
Context: process
Type: integer
Value Format: %d
Unit:
Comment Field: Minimum Number of arc lines detected
Description: Minimum Number of arc lines detected
#Not dumped
Parameter Name: QC WAVE NLINES MAX
Class: header|qc-log
Context: process
Type: integer
Value Format: %d
Unit:
Comment Field: Maximum Number of arc lines detected
Description: Maximum Number of arc lines detected
#Not dumped
Parameter Name: QC WAVE NLINES MIN POS
Class: header|qc-log
Context: process
Type: integer
Value Format: %d
Unit:
Comment Field: Column at which detected lines number is minimum
Description: First occurrence of column at which detected lines number is minimum
#Not dumped
Parameter Name: QC WAVE NLINES MAX POS
Class: header|qc-log
Context: process
Type: integer
Value Format: %d
Unit:
Comment Field: Column at which detected lines number is maximum
Description: First occurrence of column at which detected lines number is maximum
Parameter Name: QC WAVE NPIXSAT Parameter Name: QC WAVE NPIXSAT
......
# Gasgano Application Properties # Gasgano Application Properties
# Date: Wed Oct 05 15:27:15 MEST 2005 # Date: Wed Oct 05 15:27:15 MEST 2005
AUTO_DISPLAY=false AUTO_DISPLAY=false
CLASSRULE_FILE=/cal/sinfo/rul/sinfo.oca CLASSRULE_FILE=/usr/share/esopipes/rul/sinfo.oca
COMPONENT_FONT=Dialog:14 COMPONENT_FONT=Dialog:14
CUBE_TO_VIEWER= CUBE_TO_VIEWER=
CUBE_VIEWER_TYPE=SHELLCOMMAND CUBE_VIEWER_TYPE=SHELLCOMMAND
DATA_FILES= DATA_FILES=/usr/share/esopipes/datastatic/sinfo-3.0.0
DBOBS_DISPLAY_COLUMNS=CLASSIFICATION:RA:DEC:TPL.EXPNO:TPL.NEXP DBOBS_DISPLAY_COLUMNS=CLASSIFICATION:RA:DEC:TPL.EXPNO:TPL.NEXP
DBOBS_DISPLAY_COLUMNS_SIZE=0:0:0:0:0 DBOBS_DISPLAY_COLUMNS_SIZE=0:0:0:0:0
DBOBS_INSTRUMENT=All DBOBS_INSTRUMENT=All
...@@ -41,7 +41,7 @@ PRINTER_NAME=lp ...@@ -41,7 +41,7 @@ PRINTER_NAME=lp
PRINT_FONT=Monospaced:16 PRINT_FONT=Monospaced:16
PRINT_ORIENTATION=P PRINT_ORIENTATION=P
RADEC_CONVERSION=true RADEC_CONVERSION=true
RECIPE_SET=sinfo_rec_detlin=/home/quality/pipelines/sinfo/lib/esopipes-plugins/sinfo-2.9.0/sinfo_rec_detlin.so;sinfo_rec_distortion=/home/quality/pipelines/sinfo/lib/esopipes-plugins/sinfo-2.9.0/sinfo_rec_distortion.so;sinfo_rec_jitter=/home/quality/pipelines/sinfo/lib/esopipes-plugins/sinfo-2.9.0/sinfo_rec_jitter.so;sinfo_rec_mdark=/home/quality/pipelines/sinfo/lib/esopipes-plugins/sinfo-2.9.0/sinfo_rec_mdark.so;sinfo_rec_mflat=/home/quality/pipelines/sinfo/lib/esopipes-plugins/sinfo-2.9.0/sinfo_rec_mflat.so;sinfo_rec_pupil=/home/quality/pipelines/sinfo/lib/esopipes-plugins/sinfo-2.9.0/sinfo_rec_pupil.so;sinfo_rec_wavecal=/home/quality/pipelines/sinfo/lib/esopipes-plugins/sinfo-2.9.0/sinfo_rec_wavecal.so;sinfo_utl_bp_mask_add=/home/quality/pipelines/sinfo/lib/esopipes-plugins/sinfo-2.9.0/sinfo_utl_bp_mask_add.so;sinfo_utl_cube2ima=/home/quality/pipelines/sinfo/lib/esopipes-plugins/sinfo-2.9.0/sinfo_utl_cube2ima.so;sinfo_utl_cube_combine=/home/quality/pipelines/sinfo/lib/esopipes-plugins/sinfo-2.9.0/sinfo_utl_cube_combine.so;sinfo_utl_cube2spectrum=/home/quality/pipelines/sinfo/lib/esopipes-plugins/sinfo-2.9.0/sinfo_utl_cube2spectrum.so;sinfo_utl_cube_arith=/home/quality/pipelines/sinfo/lib/esopipes-plugins/sinfo-2.9.0/sinfo_utl_cube_arith.so;sinfo_utl_ima_arith=/home/quality/pipelines/sinfo/lib/esopipes-plugins/sinfo-2.9.0/sinfo_utl_ima_arith.so;sinfo_utl_skycor=/home/quality/pipelines/sinfo/lib/esopipes-plugins/sinfo-2.9.0/sinfo_utl_skycor.so;sinfo_utl_skymap=/home/quality/pipelines/sinfo/lib/esopipes-plugins/sinfo-2.9.0/sinfo_utl_skymap.so;sinfo_utl_spectrum_divide_by_blackbody=/home/quality/pipelines/sinfo/lib/esopipes-plugins/sinfo-2.9.0/sinfo_utl_spectrum_divide_by_blackbody.so;sinfo_utl_spectrum_wavelength_shift=/home/quality/pipelines/sinfo/lib/esopipes-plugins/sinfo-2.9.0/sinfo_utl_spectrum_wavelength_shift.so RECIPE_SET=sinfo_rec_detlin=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_rec_detlin.so;sinfo_rec_distortion=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_rec_distortion.so;sinfo_rec_jitter=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_rec_jitter.so;sinfo_rec_mdark=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_rec_mdark.so;sinfo_rec_mflat=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_rec_mflat.so;sinfo_rec_pupil=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_rec_pupil.so;sinfo_rec_wavecal=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_rec_wavecal.so;sinfo_utl_bp_mask_add=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_bp_mask_add.so;sinfo_utl_cube2ima=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_cube2ima.so;sinfo_utl_cube_combine=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_cube_combine.so;sinfo_utl_cube2spectrum=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_cube2spectrum.so;sinfo_utl_cube_arith=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_cube_arith.so;sinfo_utl_ima_arith=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_ima_arith.so;sinfo_utl_skycor=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_skycor.so;sinfo_utl_skymap=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_skymap.so;sinfo_utl_spectrum_divide_by_blackbody=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_spectrum_divide_by_blackbody.so;sinfo_utl_spectrum_wavelength_shift=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_spectrum_wavelength_shift.so
SCRIPTS_DIR=/home/astro4/gasgano/scripts/gas-scripts SCRIPTS_DIR=/home/astro4/gasgano/scripts/gas-scripts
SHORTEN_FILES_PATH=false SHORTEN_FILES_PATH=false
SHORT_FILENAME=true SHORT_FILENAME=true
......
if DPR.CATG == "ACQUISITION" then
{
DO.CATG = "ACQUISITION";
}
if DPR.CATG == "TEST" then
{
DO.CATG = "TEST";
}
if DPR.CATG like "%TEST%" and DPR.TYPE like "%DARK%" and DPR.TECH like "%IFU%" then if DPR.CATG like "%TEST%" and DPR.TYPE like "%DARK%" and DPR.TECH like "%IFU%" then
{ {
DO.CATG = "DARK_tec_Focus"; DO.CATG = "DARK_tec_Focus";
...@@ -184,6 +193,15 @@ if DPR.TECH like "%IFU,NODDING%" and DPR.TECH like "%DITHER%" and DPR.TYPE like ...@@ -184,6 +193,15 @@ if DPR.TECH like "%IFU,NODDING%" and DPR.TECH like "%DITHER%" and DPR.TYPE like