Skip to content

Commit

Permalink
preparing for release (v1.3)
Browse files Browse the repository at this point in the history
  • Loading branch information
wojdyr committed Jan 25, 2014
1 parent 47cf4e8 commit 15e12da
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
6 changes: 5 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ DOWNLOAD
* `tarball`_
* GitHub repository_ |travis-status|_ (requires ``autoreconf -i`` after cloning)

.. _`tarball`: http://downloads.sourceforge.net/xylib/xylib-1.1.tar.bz2
.. _`tarball`: https://github.com/wojdyr/xylib/releases/download/v1.3/xylib-1.3.tar.bz2
.. _repository: https://github.com/wojdyr/xylib
.. _travis-status: https://travis-ci.org/wojdyr/xylib/
.. |travis-status| image:: https://api.travis-ci.org/wojdyr/xylib.png
Expand Down Expand Up @@ -137,6 +137,10 @@ CREDITS
HISTORY
=======

* 1.3 (2014-01-24)

- bug fixes only

* 1.2 (2013-08-01)

- added SpecsLab2 xy format (Matthias Richter)
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Process this file with `autoreconf -i` to produce a configure script.
AC_INIT(xylib, 1.2)
AC_INIT(xylib, 1.3)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_MACRO_DIR(build-aux)
AC_CONFIG_SRCDIR(xylib/xylib.cpp)
Expand Down
12 changes: 7 additions & 5 deletions release.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

VERSION=1.2
VERSION=1.3

if [ $# -eq 0 ]; then
echo Usage: $0 step
Expand All @@ -22,6 +22,8 @@ arg=$1
# 0. check version numbers and soname
if [ $arg -eq 0 ]; then
echo version: $VERSION
echo configure.ac:
grep AC_INIT configure.ac
echo in xylib/xylib.h:
grep 'define XYLIB_VERSION' xylib/xylib.h
echo in README.rst:
Expand Down Expand Up @@ -65,7 +67,7 @@ if [ $arg -eq 3 ]; then
#make index.html
rst2html --stylesheet-path=web.css README.rst index.html
cp index.html README.dev TODO COPYING sample-urls xylib_win-$VERSION/docs
echo copy files xylib.dll and xyconv.exe to `pwd`/xylib_win-$VERSION
echo copy files xylib-*.dll and xyconv.exe to `pwd`/xylib_win-$VERSION
echo and do: zip -r xylib_win-$VERSION.zip xylib_win-$VERSION/
fi

Expand Down Expand Up @@ -107,9 +109,9 @@ if [ $arg -eq 9 ]; then
rm -rf mingw32
mkdir mingw32
cd mingw32
MDIR=$HOME/local/mingw32msvc
../configure --host=i586-mingw32msvc --enable-static --disable-shared \
CPPFLAGS="-I$HOME/local/src/boost_1_42_0/ -I$MDIR/include/" \
MDIR=$HOME/local/mingw32
../configure --host=i686-w64-mingw32 --enable-static --disable-shared \
CPPFLAGS="-I$HOME/local/src/boost_1_50_0/ -I$MDIR/include/" \
CXXFLAGS="-O3" LDFLAGS="-s -L$MDIR/lib" --without-bzlib \
--prefix=$MDIR && \
make install
Expand Down
2 changes: 1 addition & 1 deletion xylib/xylib.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
* XYLIB_VERSION / 100 % 100 is the minor version
* XYLIB_VERSION / 10000 is the major version
*/
#define XYLIB_VERSION 10200 /* 1.2.0 */
#define XYLIB_VERSION 10300 /* 1.3.0 */

#ifdef __cplusplus

Expand Down

0 comments on commit 15e12da

Please sign in to comment.