Skip to content

Commit 157f7e6

Browse files
committed
version 1.6
1 parent 88c7900 commit 157f7e6

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

README.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ Supported formats:
3232
*(only 1-D data is supported)*
3333
- χPLOT CHI_
3434
- Ron Unwin's Spectra XPS format (VGX-900 compatible)
35+
- Freiberg Instruments XSYG (from lexsyg)
36+
- Bruker SPC/PAR
3537

3638
.. _CHI: http://www.esrf.eu/computing/scientific/FIT2D/FIT2D_REF/node115.html#SECTION0001851500000000000000
3739

@@ -113,7 +115,7 @@ __ https://github.com/wojdyr/xylib/releases
113115
* `tarball`_
114116
* GitHub repository_ |travis-status|_ |appveyor-status|_
115117

116-
.. _`tarball`: https://github.com/wojdyr/xylib/releases/download/v1.5/xylib-1.5.tar.bz2
118+
.. _`tarball`: https://github.com/wojdyr/xylib/releases/download/v1.6/xylib-1.6.tar.bz2
117119
.. _repository: https://github.com/wojdyr/xylib
118120
.. _travis-status: https://travis-ci.org/wojdyr/xylib/
119121
.. |travis-status| image:: https://api.travis-ci.org/wojdyr/xylib.png
@@ -123,7 +125,7 @@ __ https://github.com/wojdyr/xylib/releases
123125
**To compile** the source code you need:
124126

125127
* C++ compiler (all popular ones are tested: GCC, Clang, MSVC, icc)
126-
* Boost_ libraries (only headers).
128+
* Boost_ libraries >= 1.46.1 (only headers).
127129
* optionally, zlib and bzlib libraries (for reading compressed files)
128130
* optionally, wxWidgets 3.0 (for xyconvert - GUI converter)
129131

@@ -181,7 +183,9 @@ CREDITS
181183
HISTORY
182184
=======
183185

184-
* 1.6 (unreleased)
186+
* 1.6 (2020-09-08)
187+
- added XSYG format from Freiberg Instruments' lexsyg (Johannes Friedrich)
188+
- added Bruker SPC binary format (Sebastian Kreutzer)
185189
- added PANalytical XRDML
186190

187191
* 1.5 (2016-12-17)

configure.ac

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ AC_PROG_CXX
2424
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
2525
LT_INIT([disable-static win32-dll])
2626

27+
AM_MAINTAINER_MODE dnl disable (by default) maintainer mode
28+
2729
# Checks for libraries.
2830
XYLIB_ADDLIB=
2931
if test "x$with_zlib" != xno; then
@@ -72,6 +74,8 @@ AC_CHECK_HEADER([boost/spirit/version.hpp], [],
7274
[AC_MSG_ERROR([Boost::Spirit headers were not found.])])
7375
AC_CHECK_HEADER([boost/tokenizer.hpp], [],
7476
[AC_MSG_ERROR([Boost Tokenizer header not found.])])
77+
AC_CHECK_HEADER([boost/property_tree/ptree.hpp], [],
78+
[AC_MSG_ERROR([Boost PropertyTree header not found.])])
7579
AC_CHECK_HEADER([sys/types.h], [],
7680
[AC_MSG_ERROR([Header sys/types.h not found.
7781
Please inform xylib maintainer about this problem,

0 commit comments

Comments
 (0)