Nathan Kelley-Hoskins / ctools

Commit 6642ae651d0ee8498d970bde3693a0123b9e8126

Authored by Jürgen Knödlseder
2 parents 2b961924 eb916ad8

Merge branch 'release' into integration 

# Conflicts:
#	NEWS
#	README.md
#	configure.ac
#	doc/Doxyfile
#	doc/source/conf.py
#	sonar-project.properties
Inline Side-by-side
Showing 7 changed files with 82 additions and 33 deletions
ChangeLog
  View file @6642ae6
... ... @@ -4,6 +4,14 @@
4 4 ========================
5 5  
6 6  
  7 +2019-06-05
  8 +
  9 + * Bug fix version 1.6.1 released
  10 + ================================
  11 +
  12 + Fix initialisation script for c-shell (#2724)
  13 +
  14 +
7 15 2019-05-29
8 16  
9 17 * Version 1.6.0 released
... ...
1 1 New Features and Important Changes in ctools 1.7.0
2 2  
3   -29 May 2019
  3 +5 June 2019
4 4  
5 5  
6 6 Introduction
... ...
doc/source/admin/download.rst
  View file @6642ae6
... ... @@ -3,7 +3,7 @@
3 3 Download
4 4 ========
5 5  
6   -The latest ctools release is ``ctools-1.6.0`` (29 May 2019).
  6 +The latest ctools release is ``ctools-1.6.1`` (5 June 2019).
7 7  
8 8 Below a table of ctools releases. Please read the :ref:`sec_release` to
9 9 learn more about new features and corrected bugs in a given release.
... ... @@ -23,6 +23,9 @@ learn more about new features and corrected bugs in a given release.
23 23 * - ctools
24 24 - gammalib
25 25 - Mac OS X (10.7+) binary disk image
  26 + * - `1.6.1 <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.6.1.tar.gz>`_
  27 + - `1.6.1 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.6.1.tar.gz>`_
  28 + - `ctools-1.6.1-macosx10.7.dmg <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.6.1-macosx10.7.dmg>`_
26 29 * - `1.6.0 <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.6.0.tar.gz>`_
27 30 - `1.6.0 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.6.0.tar.gz>`_
28 31 - `ctools-1.6.0-macosx10.7.dmg <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.6.0-macosx10.7.dmg>`_
... ...
doc/source/admin/release_history/1.6.1.rst 0 → 100644
  View file @6642ae6
  1 +.. _1.6.1:
  2 +
  3 +ctools 1.6.1 release (5 June 2019)
  4 +==================================
  5 +
  6 +Overview
  7 +--------
  8 +
  9 +ctools 1.6.1 is a bug fix release for ctools release 1.6.
  10 +
  11 +The following bugs were fixed:
  12 +
  13 +* [`2724 <https://cta-redmine.irap.omp.eu/issues/2724>`_] -
  14 + Fix initialisation script for c-shell
... ...
doc/source/admin/release_history/1.7.rst 0 → 100644
  View file @6642ae6
  1 +.. _1.7:
  2 +
  3 +ctools 1.7 release
  4 +==================
  5 +
  6 +Overview
  7 +--------
  8 +
  9 +ctools 1.7 is a major release that adds significant functionality.
  10 +
  11 +In particular, this release provides:
  12 +
  13 +* ...
  14 +* ...
  15 +
  16 +
  17 +Bug fixes
  18 +---------
  19 +
  20 +
  21 +
  22 +Improvements
  23 +------------
  24 +
  25 +
  26 +
  27 +New features
  28 +------------
  29 +
  30 +
  31 +
  32 +Clean up
  33 +--------
  34 +
... ...
doc/source/admin/release_history/index.rst
  View file @6642ae6
... ... @@ -6,6 +6,8 @@ Release History
6 6 .. toctree::
7 7 :maxdepth: 1
8 8  
  9 + ctools 1.7 <1.7>
  10 + ctools 1.6.1 <1.6.1>
9 11 ctools 1.6 <1.6>
10 12 ctools 1.5.4 <1.5.4>
11 13 ctools 1.5.3 <1.5.3>
... ...
src/ctools-setup.in
  View file @6642ae6
1   -# Filename: ctools-setup(.in)
  1 +#! /bin/sh
  2 +# Filename: ctools-setup(.in)
2 3 # Description: Writes an initialization script for ctools software
3 4 # which is custom fit to the user and the particular
4 5 # software installation. Note that this script is
... ... @@ -82,35 +83,6 @@ if [ -d $prefix/syspfiles/. ]; then
82 83 fi
83 84  
84 85 #
85   -# Set LD_LIBRARY_PATH
86   -# ===================
87   -if [ -z "${LD_LIBRARY_PATH}" ]; then
88   - LD_LIBRARY_PATH=$ctools_lib
89   -else
90   - LD_LIBRARY_PATH=$ctools_lib:$LD_LIBRARY_PATH
91   -fi
92   -
93   -#
94   -# Set DYLD_LIBRARY_PATH if required
95   -# =================================
96   -case $uname_system in
97   - Darwin*)
98   - if [ -z "${DYLD_LIBRARY_PATH}" ]; then
99   - DYLD_LIBRARY_PATH=$ctools_lib
100   - else
101   - DYLD_LIBRARY_PATH=$ctools_lib:$DYLD_LIBRARY_PATH
102   - fi
103   - ;;
104   - CYGWIN*)
105   - if [ -z "${PATH}" ]; then
106   - PATH=$ctools_lib
107   - else
108   - PATH=$ctools_lib:$PATH
109   - fi
110   - ;;
111   -esac
112   -
113   -#
114 86 # Set PYTHONPATH
115 87 # ==============
116 88 if [ -z "${PYTHONPATH}" ]; then
... ... @@ -163,11 +135,27 @@ fi
163 135 #
164 136 # List of variables needed in initialization script
165 137 # =================================================
166   -varlist="LD_LIBRARY_PATH DYLD_LIBRARY_PATH PATH"
  138 +varlist="PATH"
167 139 varlist="$varlist PYTHONPATH PKG_CONFIG_PATH MANPATH"
168 140 varlist="$varlist PFILES PFCLOBBER CALDB"
169 141  
170 142 #
  143 +# Set LD_LIBRARY_PATH
  144 +# ===================
  145 +case $uname_system in
  146 + Darwin*)
  147 + ;;
  148 + *)
  149 + if [ -z "${LD_LIBRARY_PATH}" ]; then
  150 + LD_LIBRARY_PATH=$ctools_lib
  151 + else
  152 + LD_LIBRARY_PATH=$ctools_lib:$LD_LIBRARY_PATH
  153 + fi
  154 + varlist="$varlist LD_LIBRARY_PATH"
  155 + ;;
  156 +esac
  157 +
  158 +#
171 159 # Save values in output initialization shell scripts
172 160 # ==================================================
173 161 # Name of temporary config script
... ...