From 81e60b82f1fd1f6391393e662ad74c5bd0ddf5a7 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Fri, 18 Dec 2015 18:47:21 +0100 Subject: [PATCH] Update software version to 1.0.0. --- NEWS | 11 +++++++---- README | 4 ++-- configure.ac | 23 ++++++++++++++++++++++- ctools.pc.in | 4 ++-- doc/Doxyfile | 2 +- doc/source/conf.py | 4 ++-- pyext/Makefile.am | 4 ++-- src/Makefile.am | 1 + src/ctbin/Makefile.am | 1 + src/ctbkgcube/Makefile.am | 1 + src/ctbutterfly/Makefile.am | 1 + src/ctcubemask/Makefile.am | 1 + src/cterror/Makefile.am | 1 + src/ctexpcube/Makefile.am | 1 + src/ctlike/Makefile.am | 1 + src/ctmodel/Makefile.am | 1 + src/ctobssim/Makefile.am | 2 +- src/ctpsfcube/Makefile.am | 1 + src/ctselect/Makefile.am | 1 + src/ctskymap/Makefile.am | 1 + src/cttsmap/Makefile.am | 1 + src/ctulimit/Makefile.am | 1 + src/support/Makefile.am | 1 + 23 files changed, 54 insertions(+), 15 deletions(-) diff --git a/NEWS b/NEWS index 38b5d60..726f545 100644 --- a/NEWS +++ b/NEWS @@ -1,15 +1,15 @@ -New Features and Important Changes in ctools 1.1.0 +New Features and Important Changes in ctools 1.0.0 Author(s) : Juergen Knoedlseder -17 December 2015 +18 December 2015 1. Introduction --------------- This document briefly summarizes executable by executable the most important -changes made since the last release of ctools. The code complies to GammaLib -version 1.1.0 or above. +changes made since the last release of ctools. The code complies to ctools +version 1.0.0 or above. 2. Configuration @@ -112,6 +112,9 @@ The following scripts have been added: - csmodelmerge: merge model containers into single container - cstsmapmerge: merge sliced TS map into single map - csobs2caldb: creates calibration database from observation +- csiactdata: inspects IACT data + +The cshessobs script has been renamed to csiactobs. All GExceptions are replaced by Python RuntimeErrors as the GException classes are not exposed to Python. diff --git a/README b/README index f7d9f7f..ff2e503 100644 --- a/README +++ b/README @@ -1,8 +1,8 @@ ctools information ================== -Version: 1.1.0 (24 November 2015) +Version: 1.0.0 (18 December 2015) Author: Juergen Knodlseder (jurgen.knodlseder@irap.omp.eu) -GammaLib dependency: 1.1.0 +GammaLib dependency: 1.0.0 License information diff --git a/configure.ac b/configure.ac index 837d511..ac17295 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ ############################################################################# # Initialisation # ############################################################################# -AC_INIT([ctools], [1.1.0.dev], [jurgen.knodlseder@irap.omp.eu], [ctools]) +AC_INIT([ctools], [1.0.0], [jurgen.knodlseder@irap.omp.eu], [ctools]) AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp]) AC_CONFIG_MACRO_DIR([m4]) #AM_INIT_AUTOMAKE([gnu no-dependencies]) @@ -39,6 +39,27 @@ AC_CONFIG_HEADER([config.h]) ############################################################################# +# Library versioning (current:revision:age) # +# ------------------------------------------------------------------------- # +# Here are a set of rules to update your library version information: # +# 1. Update the version information only immediately before a public # +# release of your software. More frequent updates are unnecessary, # +# and only guarantee that the current interface number gets larger # +# faster. # +# 2. If the library source code has changed at all since the last update, # +# then increment revision. # +# 3. If any interfaces have been added, removed, or changed since the last # +# update, increment current, and set revision to 0. # +# 4. If any interfaces have been added since the last public release, then # +# increment age. # +# 5. If any interfaces have been removed or changed since the last public # +# release, then set age to 0. # +############################################################################# +CTOOLS_LT_VERSION="1:0:0" +AC_SUBST(CTOOLS_LT_VERSION) + + +############################################################################# # Set prefix # # ------------------------------------------------------------------------- # # By default, ctools get installed into "/usr/local/gamma". The default # diff --git a/ctools.pc.in b/ctools.pc.in index 340a402..f150c20 100644 --- a/ctools.pc.in +++ b/ctools.pc.in @@ -6,9 +6,9 @@ includedir=${prefix}/include Name: ctools Description: CTA science analysis tools URL: http://cta.irap.omp.eu/ctools -Version: 1.1.0 +Version: 1.0.0 Requires: -Requires.private: gammalib >= 1.1.0 +Requires.private: gammalib >= 1.0.0 Conflicts: Cflags: -I${includedir}/ctools @OPENMP_CXXFLAGS@ Libs: -L${libdir} -lctools diff --git a/doc/Doxyfile b/doc/Doxyfile index 9f07c4f..5e00812 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -32,7 +32,7 @@ PROJECT_NAME = ctools # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.1.0.dev +PROJECT_NUMBER = 1.0.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/doc/source/conf.py b/doc/source/conf.py index f4a4890..0288704 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -66,10 +66,10 @@ copyright = u'2014-2015, ctools developers' # built documents. # # The short X.Y version. -version = '1.1' +version = '1.0' # The full version, including alpha/beta/rc tags. -release = '1.1.0.dev' +release = '1.0.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pyext/Makefile.am b/pyext/Makefile.am index 0916392..dcde606 100755 --- a/pyext/Makefile.am +++ b/pyext/Makefile.am @@ -97,8 +97,8 @@ build: ctools/tools_wrap.cpp ctools/tools.py if IS_ELCAPITAN -for f in build/ctools/ctools/_*.so; do \ echo "Post process module "$$f; \ - install_name_tool -change $(libdir)/libctools.0.dylib @rpath/libctools.0.dylib $$f; \ - install_name_tool -change $(libdir)/libgamma.0.dylib @rpath/libgamma.0.dylib $$f; \ + install_name_tool -change $(libdir)/libctools.1.dylib @rpath/libctools.1.dylib $$f; \ + install_name_tool -change $(libdir)/libgamma.1.dylib @rpath/libgamma.1.dylib $$f; \ install_name_tool -add_rpath $(libdir) $$f; \ install_name_tool -add_rpath $(abs_top_srcdir)/src/.libs $$f; \ done diff --git a/src/Makefile.am b/src/Makefile.am index 80424b8..25b1a9b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,6 +46,7 @@ libctools_la_LIBADD = support/libsupport.la \ ctbutterfly/libctbutterfly.la \ ctulimit/libctulimit.la \ cterror/libcterror.la +libctools_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@ # Distribute scripts EXTRA_DIST = $(scripts) diff --git a/src/ctbin/Makefile.am b/src/ctbin/Makefile.am index 34199eb..01c598f 100644 --- a/src/ctbin/Makefile.am +++ b/src/ctbin/Makefile.am @@ -12,6 +12,7 @@ sources = ctbin.cpp # Libtool library noinst_LTLIBRARIES = libctbin.la libctbin_la_SOURCES = $(sources) +libctbin_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@ # Program definition ctbin_SOURCES = main.cpp diff --git a/src/ctbkgcube/Makefile.am b/src/ctbkgcube/Makefile.am index fde8dec..a9d0317 100644 --- a/src/ctbkgcube/Makefile.am +++ b/src/ctbkgcube/Makefile.am @@ -12,6 +12,7 @@ sources = ctbkgcube.cpp # Libtool library noinst_LTLIBRARIES = libctbkgcube.la libctbkgcube_la_SOURCES = $(sources) +libctbkgcube_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@ # Program definition ctbkgcube_SOURCES = main.cpp diff --git a/src/ctbutterfly/Makefile.am b/src/ctbutterfly/Makefile.am index efd235c..8f809fd 100644 --- a/src/ctbutterfly/Makefile.am +++ b/src/ctbutterfly/Makefile.am @@ -12,6 +12,7 @@ sources = ctbutterfly.cpp # Libtool library noinst_LTLIBRARIES = libctbutterfly.la libctbutterfly_la_SOURCES = $(sources) +libctbutterfly_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@ # Program definition ctbutterfly_SOURCES = main.cpp diff --git a/src/ctcubemask/Makefile.am b/src/ctcubemask/Makefile.am index 8d1c440..cb2f265 100644 --- a/src/ctcubemask/Makefile.am +++ b/src/ctcubemask/Makefile.am @@ -12,6 +12,7 @@ sources = ctcubemask.cpp # Libtool library (only needed for python bindings) noinst_LTLIBRARIES = libctcubemask.la libctcubemask_la_SOURCES = $(sources) +libctcubemask_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@ # Program definition ctcubemask_SOURCES = main.cpp diff --git a/src/cterror/Makefile.am b/src/cterror/Makefile.am index 98cfe05..443203e 100644 --- a/src/cterror/Makefile.am +++ b/src/cterror/Makefile.am @@ -12,6 +12,7 @@ sources = cterror.cpp # Libtool library noinst_LTLIBRARIES = libcterror.la libcterror_la_SOURCES = $(sources) +libcterror_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@ # Program definition cterror_SOURCES = main.cpp diff --git a/src/ctexpcube/Makefile.am b/src/ctexpcube/Makefile.am index f24f80d..f50a335 100644 --- a/src/ctexpcube/Makefile.am +++ b/src/ctexpcube/Makefile.am @@ -12,6 +12,7 @@ sources = ctexpcube.cpp # Libtool library noinst_LTLIBRARIES = libctexpcube.la libctexpcube_la_SOURCES = $(sources) +libctexpcube_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@ # Program definition ctexpcube_SOURCES = main.cpp diff --git a/src/ctlike/Makefile.am b/src/ctlike/Makefile.am index a998ae4..a954e9c 100644 --- a/src/ctlike/Makefile.am +++ b/src/ctlike/Makefile.am @@ -12,6 +12,7 @@ sources = ctlike.cpp # Libtool library noinst_LTLIBRARIES = libctlike.la libctlike_la_SOURCES = $(sources) +libctlike_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@ # Program definition ctlike_SOURCES = main.cpp diff --git a/src/ctmodel/Makefile.am b/src/ctmodel/Makefile.am index 1484720..a7d6af1 100644 --- a/src/ctmodel/Makefile.am +++ b/src/ctmodel/Makefile.am @@ -12,6 +12,7 @@ sources = ctmodel.cpp # Libtool library noinst_LTLIBRARIES = libctmodel.la libctmodel_la_SOURCES = $(sources) +libctmodel_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@ # Program definition ctmodel_SOURCES = main.cpp diff --git a/src/ctobssim/Makefile.am b/src/ctobssim/Makefile.am index 6f39ece..a8728d6 100644 --- a/src/ctobssim/Makefile.am +++ b/src/ctobssim/Makefile.am @@ -12,7 +12,7 @@ sources = ctobssim.cpp # Libtool library noinst_LTLIBRARIES = libctobssim.la libctobssim_la_SOURCES = $(sources) -libctobssim_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@ +libctobssim_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@ # Program definition ctobssim_SOURCES = main.cpp diff --git a/src/ctpsfcube/Makefile.am b/src/ctpsfcube/Makefile.am index 8149b99..59392f7 100644 --- a/src/ctpsfcube/Makefile.am +++ b/src/ctpsfcube/Makefile.am @@ -12,6 +12,7 @@ sources = ctpsfcube.cpp # Libtool library noinst_LTLIBRARIES = libctpsfcube.la libctpsfcube_la_SOURCES = $(sources) +libctpsfcube_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@ # Program definition ctpsfcube_SOURCES = main.cpp diff --git a/src/ctselect/Makefile.am b/src/ctselect/Makefile.am index 186b525..2d5cef6 100644 --- a/src/ctselect/Makefile.am +++ b/src/ctselect/Makefile.am @@ -12,6 +12,7 @@ sources = ctselect.cpp # Libtool library (only needed for python bindings) noinst_LTLIBRARIES = libctselect.la libctselect_la_SOURCES = $(sources) +libctselect_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@ # Program definition ctselect_SOURCES = main.cpp diff --git a/src/ctskymap/Makefile.am b/src/ctskymap/Makefile.am index bb362fa..b7c2ba9 100644 --- a/src/ctskymap/Makefile.am +++ b/src/ctskymap/Makefile.am @@ -12,6 +12,7 @@ sources = ctskymap.cpp # Libtool library noinst_LTLIBRARIES = libctskymap.la libctskymap_la_SOURCES = $(sources) +libctskymap_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@ # Program definition ctskymap_SOURCES = main.cpp diff --git a/src/cttsmap/Makefile.am b/src/cttsmap/Makefile.am index 4285a3d..84cf01d 100644 --- a/src/cttsmap/Makefile.am +++ b/src/cttsmap/Makefile.am @@ -12,6 +12,7 @@ sources = cttsmap.cpp # Libtool library noinst_LTLIBRARIES = libcttsmap.la libcttsmap_la_SOURCES = $(sources) +libcttsmap_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@ # Program definition cttsmap_SOURCES = main.cpp diff --git a/src/ctulimit/Makefile.am b/src/ctulimit/Makefile.am index d5d844a..f94235a 100644 --- a/src/ctulimit/Makefile.am +++ b/src/ctulimit/Makefile.am @@ -12,6 +12,7 @@ sources = ctulimit.cpp # Libtool library noinst_LTLIBRARIES = libctulimit.la libctulimit_la_SOURCES = $(sources) +libctulimit_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@ # Program definition ctulimit_SOURCES = main.cpp diff --git a/src/support/Makefile.am b/src/support/Makefile.am index be9a20c..76f0812 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -6,3 +6,4 @@ sources = ctool.cpp # Build libtool library noinst_LTLIBRARIES = libsupport.la libsupport_la_SOURCES = $(sources) +libsupport_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@ -- libgit2 0.21.4