Johan Bregeon / ctools

Commit 6aea09e8427808674094941936cb209774fb0dd6

Authored by Jürgen Knödlseder
2 parents 1a57b85c 3faa2702

Merge branch 'bugfix-1.0.1' into integration 

# Conflicts:
#	ChangeLog
#	NEWS
#	README
#	ctools.pc.in
Inline Side-by-side
Showing 20 changed files with 62 additions and 30 deletions
ChangeLog
  View file @6aea09e
1   -2016-01-04 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
  1 +2016-01-06 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
2 2  
3 3 * Version 1.1.0 released
4 4 ========================
5 5  
6 6  
7   -2015-12-20 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
  7 +2016-01-06 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
8 8  
9 9 * Bug fix version 1.0.1 released
10 10 ================================
11 11  
12 12 Re-enable ctmodel computation for stacked analysis (#1609)
  13 + Solve compatibility issues with Anaconda on Mac OS X (#1607)
13 14  
14 15  
15 16 2015-12-18 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
... ...
... ... @@ -2,7 +2,7 @@ New Features and Important Changes in ctools 1.1.0
2 2  
3 3 Author(s) : Juergen Knoedlseder
4 4  
5   -4 January 2016
  5 +6 January 2016
6 6  
7 7  
8 8 1. Introduction
... ...
1 1 ctools information
2 2 ==================
3   -Version: 1.1.0dev (4 January 2016)
  3 +Version: 1.1.0dev (6 January 2016)
4 4 Author: Juergen Knodlseder (jurgen.knodlseder@irap.omp.eu)
5 5 GammaLib dependency: 1.1.0dev
6 6  
... ...
configure.ac
  View file @6aea09e
... ... @@ -93,10 +93,12 @@ AC_CANONICAL_HOST
93 93 # A special kluge was added for Mac OS X >=10.7. As Apple switched to clang #
94 94 # we search from this version on for the clang compiler. #
95 95 # #
96   -# We also signal whether Mac OS X >=10.11 (El Capitan). #
  96 +# We also signal whether Mac OS X >=10.9 (Mavericks) and Mac OS X >=10.11 #
  97 +# (El Capitan). #
97 98 #############################################################################
98 99 # Set default Mac OS X version flags
99 100 osx_lion=no
  101 +osx_mavericks=no
100 102 osx_el_capitan=no
101 103  
102 104 # Set default compiler lists
... ... @@ -111,6 +113,9 @@ if test `uname -s` = &quot;Darwin&quot;; then
111 113 cc_list="clang gcc cc cl.exe"
112 114 osx_lion=yes
113 115 fi
  116 + if [ test $version -ge 109 ]; then
  117 + osx_mavericks=yes
  118 + fi
114 119 if [ test $version -ge 1011 ]; then
115 120 osx_el_capitan=yes
116 121 fi
... ... @@ -121,6 +126,12 @@ if [test &quot;x$osx_lion&quot; = &quot;xyes&quot;]; then
121 126 else
122 127 AC_MSG_RESULT(no)
123 128 fi
  129 +AC_MSG_CHECKING([for Mac OS X >= 10.9])
  130 +if [test "x$osx_mavericks" = "xyes"]; then
  131 + AC_MSG_RESULT(yes)
  132 +else
  133 + AC_MSG_RESULT(no)
  134 +fi
124 135 AC_MSG_CHECKING([for Mac OS X >= 10.11])
125 136 if [test "x$osx_el_capitan" = "xyes"]; then
126 137 AC_MSG_RESULT(yes)
... ... @@ -633,21 +644,41 @@ else
633 644  
634 645 # If we have distutils then get python path from distutils ...
635 646 if test -z "$ac_distutils_result"; then
636   - if test ${PYTHON_VERSION} '<' 3; then
637   - python_path=`$PYTHON -c "import distutils.sysconfig; \
638   - print distutils.sysconfig.get_python_inc();"`
639   - else
640   - python_path=`$PYTHON -c "import distutils.sysconfig; \
641   - print(distutils.sysconfig.get_python_inc());"`
642   - fi
  647 + python_path=`$PYTHON -c "import distutils.sysconfig; \
  648 + print(distutils.sysconfig.get_python_inc());"`
643 649 if test -n "${python_path}"; then
644 650 AC_CHECK_HEADERS($python_path/Python.h, [has_python_h="yes"], [has_python_h="no"])
645 651 python_path="-I$python_path"
646 652 fi
647 653 PYTHON_CPPFLAGS=$python_path
648   - CPPFLAGS="${CPPFLAGS} ${python_path}"
649 654 AC_SUBST([PYTHON_CPPFLAGS])
650 655  
  656 + # If we have Mavericks then get the MACOSX_DEPLOYMENT_TARGET from Python
  657 + # If the target is older then Mavericks then set the MACOSX_DEPLOYMENT_TARGET
  658 + # to this value as otherwise we get trouble with name mangling (that changed)
  659 + if [test "x$osx_mavericks" = "xyes"]; then
  660 + AC_MSG_CHECKING([Python MACOSX_DEPLOYMENT_TARGET])
  661 + python_target=`$PYTHON -c "from distutils import sysconfig; \
  662 + print(sysconfig.get_config_vars()[['MACOSX_DEPLOYMENT_TARGET']]);" 2> /dev/null`
  663 + python_compact_target=`echo $python_target | sed 's/\(10\.[[0-9]]*\).*/\1/' | sed -e 's/\.//g'`
  664 + case $python_compact_target in
  665 + (*[!0-9]*|'')
  666 + AC_MSG_RESULT(unknown)
  667 + ;;
  668 + (*)
  669 + AC_MSG_RESULT(${python_target})
  670 + if [ test $python_compact_target -le 108 ]; then
  671 + CONFIGURE_MACOSX_DEPLOYMENT_TARGET="$python_target"
  672 + MACOSX_DEPLOYMENT_TARGET="$python_target"
  673 + export MACOSX_DEPLOYMENT_TARGET
  674 + EXPORT_MACOSX_DEPLOYMENT_TARGET=''
  675 + LIBS="${LIBS} -lstdc++"
  676 + AC_MSG_NOTICE([set MACOSX_DEPLOYMENT_TARGET to ${python_target}])
  677 + fi
  678 + ;;
  679 + esac
  680 + fi
  681 +
651 682 # ... otherwise check for includes relative to exectuable (obsolete?)
652 683 else
653 684  
... ...
pyext/setup.py.in
  View file @6aea09e
... ... @@ -121,10 +121,10 @@ if &#39;@IS_ELCAPITAN_TRUE@&#39; != &#39;#&#39;:
121 121 # Setup
122 122 setup(name='@PACKAGE_NAME@',
123 123 version='@PACKAGE_VERSION@',
124   - description='ctools Python bindings',
  124 + description='ctools Python module',
125 125 author='Juergen Knoedlseder',
126 126 author_email='@PACKAGE_BUGREPORT@',
127   - url='http://gammalib.sourceforge.net/',
  127 + url='http://cta.irap.omp.eu/ctools/',
128 128 py_modules=['ctools.tools'],
129 129 ext_modules=[Extension('ctools._tools', ['ctools/tools_wrap.cpp'],
130 130 include_dirs=include_dirs,
... ...
src/ctbin/Makefile.am
  View file @6aea09e
... ... @@ -12,7 +12,7 @@ sources = ctbin.cpp
12 12 # Libtool library
13 13 noinst_LTLIBRARIES = libctbin.la
14 14 libctbin_la_SOURCES = $(sources)
15   -libctbin_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
  15 +libctbin_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
16 16  
17 17 # Program definition
18 18 ctbin_SOURCES = main.cpp
... ...
src/ctbkgcube/Makefile.am
  View file @6aea09e
... ... @@ -12,7 +12,7 @@ sources = ctbkgcube.cpp
12 12 # Libtool library
13 13 noinst_LTLIBRARIES = libctbkgcube.la
14 14 libctbkgcube_la_SOURCES = $(sources)
15   -libctbkgcube_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
  15 +libctbkgcube_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
16 16  
17 17 # Program definition
18 18 ctbkgcube_SOURCES = main.cpp
... ...
src/ctbutterfly/Makefile.am
  View file @6aea09e
... ... @@ -12,7 +12,7 @@ sources = ctbutterfly.cpp
12 12 # Libtool library
13 13 noinst_LTLIBRARIES = libctbutterfly.la
14 14 libctbutterfly_la_SOURCES = $(sources)
15   -libctbutterfly_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
  15 +libctbutterfly_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
16 16  
17 17 # Program definition
18 18 ctbutterfly_SOURCES = main.cpp
... ...
src/ctcubemask/Makefile.am
  View file @6aea09e
... ... @@ -12,7 +12,7 @@ sources = ctcubemask.cpp
12 12 # Libtool library (only needed for python bindings)
13 13 noinst_LTLIBRARIES = libctcubemask.la
14 14 libctcubemask_la_SOURCES = $(sources)
15   -libctcubemask_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
  15 +libctcubemask_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
16 16  
17 17 # Program definition
18 18 ctcubemask_SOURCES = main.cpp
... ...
src/cterror/Makefile.am
  View file @6aea09e
... ... @@ -12,7 +12,7 @@ sources = cterror.cpp
12 12 # Libtool library
13 13 noinst_LTLIBRARIES = libcterror.la
14 14 libcterror_la_SOURCES = $(sources)
15   -libcterror_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
  15 +libcterror_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
16 16  
17 17 # Program definition
18 18 cterror_SOURCES = main.cpp
... ...
src/ctexpcube/Makefile.am
  View file @6aea09e
... ... @@ -12,7 +12,7 @@ sources = ctexpcube.cpp
12 12 # Libtool library
13 13 noinst_LTLIBRARIES = libctexpcube.la
14 14 libctexpcube_la_SOURCES = $(sources)
15   -libctexpcube_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
  15 +libctexpcube_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
16 16  
17 17 # Program definition
18 18 ctexpcube_SOURCES = main.cpp
... ...
src/ctlike/Makefile.am
  View file @6aea09e
... ... @@ -12,7 +12,7 @@ sources = ctlike.cpp
12 12 # Libtool library
13 13 noinst_LTLIBRARIES = libctlike.la
14 14 libctlike_la_SOURCES = $(sources)
15   -libctlike_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
  15 +libctlike_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
16 16  
17 17 # Program definition
18 18 ctlike_SOURCES = main.cpp
... ...
src/ctmodel/Makefile.am
  View file @6aea09e
... ... @@ -12,7 +12,7 @@ sources = ctmodel.cpp
12 12 # Libtool library
13 13 noinst_LTLIBRARIES = libctmodel.la
14 14 libctmodel_la_SOURCES = $(sources)
15   -libctmodel_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
  15 +libctmodel_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
16 16  
17 17 # Program definition
18 18 ctmodel_SOURCES = main.cpp
... ...
src/ctobssim/Makefile.am
  View file @6aea09e
... ... @@ -12,7 +12,7 @@ sources = ctobssim.cpp
12 12 # Libtool library
13 13 noinst_LTLIBRARIES = libctobssim.la
14 14 libctobssim_la_SOURCES = $(sources)
15   -libctobssim_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
  15 +libctobssim_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
16 16  
17 17 # Program definition
18 18 ctobssim_SOURCES = main.cpp
... ...
src/ctpsfcube/Makefile.am
  View file @6aea09e
... ... @@ -12,7 +12,7 @@ sources = ctpsfcube.cpp
12 12 # Libtool library
13 13 noinst_LTLIBRARIES = libctpsfcube.la
14 14 libctpsfcube_la_SOURCES = $(sources)
15   -libctpsfcube_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
  15 +libctpsfcube_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
16 16  
17 17 # Program definition
18 18 ctpsfcube_SOURCES = main.cpp
... ...
src/ctselect/Makefile.am
  View file @6aea09e
... ... @@ -12,7 +12,7 @@ sources = ctselect.cpp
12 12 # Libtool library (only needed for python bindings)
13 13 noinst_LTLIBRARIES = libctselect.la
14 14 libctselect_la_SOURCES = $(sources)
15   -libctselect_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
  15 +libctselect_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
16 16  
17 17 # Program definition
18 18 ctselect_SOURCES = main.cpp
... ...
src/ctskymap/Makefile.am
  View file @6aea09e
... ... @@ -12,7 +12,7 @@ sources = ctskymap.cpp
12 12 # Libtool library
13 13 noinst_LTLIBRARIES = libctskymap.la
14 14 libctskymap_la_SOURCES = $(sources)
15   -libctskymap_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
  15 +libctskymap_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
16 16  
17 17 # Program definition
18 18 ctskymap_SOURCES = main.cpp
... ...
src/cttsmap/Makefile.am
  View file @6aea09e
... ... @@ -12,7 +12,7 @@ sources = cttsmap.cpp
12 12 # Libtool library
13 13 noinst_LTLIBRARIES = libcttsmap.la
14 14 libcttsmap_la_SOURCES = $(sources)
15   -libcttsmap_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
  15 +libcttsmap_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
16 16  
17 17 # Program definition
18 18 cttsmap_SOURCES = main.cpp
... ...
src/ctulimit/Makefile.am
  View file @6aea09e
... ... @@ -12,7 +12,7 @@ sources = ctulimit.cpp
12 12 # Libtool library
13 13 noinst_LTLIBRARIES = libctulimit.la
14 14 libctulimit_la_SOURCES = $(sources)
15   -libctulimit_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
  15 +libctulimit_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
16 16  
17 17 # Program definition
18 18 ctulimit_SOURCES = main.cpp
... ...
src/support/Makefile.am
  View file @6aea09e
... ... @@ -6,4 +6,4 @@ sources = ctool.cpp
6 6 # Build libtool library
7 7 noinst_LTLIBRARIES = libsupport.la
8 8 libsupport_la_SOURCES = $(sources)
9   -libsupport_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
  9 +libsupport_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
... ...