version number set to 1.2.0

and changes in release.sh script

NEWS

@@ -1,11 +1,12 @@
-User-visible changes in version 1.1.2  (2012-04-  ):
+User-visible changes in version 1.2.0  (2012-05-24):
 * added fitting method "mpfit" -- wrapper around MINPACK-1 based MPFIT library
   (http://www.physics.wisc.edu/~craigm/idl/cmpfit.html)
 * changed public API of libfityk; now cfityk uses only public API
 * added C API and Ruby and Java bindings to libfityk
 * enhanced Python API and added Python equivalent of cfityk (samples/cfityk.py)
-* CLI: cfityk can be linked with libedit (but it works better with readline)
+* CLI: cfityk can be built with libedit (but it works better with readline)
 * in scripts, backslash (\) at the end of line means line continuation
+* bug fixes, as usually
 
 User-visible changes in version 1.1.1  (2011-09-28):
 * option exit_on_warning=0/1 was replaced with on_error=stop/exit; new option

TODO

@@ -1,9 +1,4 @@
 
-* Windows build: use readline lib if possible, investigate signing .exe,
-  use xylib.dll -DXYLIB_DLL?
-
------ 1.1.2
-
 * NLopt interface
 
 * FFT data transformation using FFTW library,

configure.ac

@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([fityk],[1.1.2])
-LIBRARY_VERSION_FLAG="-version-info 3:1:0"
+AC_INIT([fityk],[1.2.0])
+LIBRARY_VERSION_FLAG="-version-info 4:0:0"
 
 AC_CONFIG_SRCDIR([fityk/voigt.h])
 AC_CONFIG_AUX_DIR(build-aux)

doc/conf.py

@@ -25,7 +25,7 @@
 master_doc = 'fityk-manual'
 project = 'Fityk'
 copyright = '2001-2012, Fityk Developers'
-version = '1.1.2'
+version = '1.2.0'
 release = version
 default_role = None
 

doc/index.rst

@@ -126,7 +126,7 @@ and Linux (Ubuntu PPA_ and RPMs from OBS_).
 Source code: `GitHub <https://github.com/wojdyr/fityk>`_
 :html:`<a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://fityk.nieto.pl"></a>`
 
-Version 1.1.1 was released on 2011-09-28
+Version 1.2.0 was released on 2012-05-24
 (`changelog <https://github.com/wojdyr/fityk/raw/master/NEWS>`_).
 New version `notifications <http://fityk-announce.nieto.pl/>`_
 are delivered via email and feeds.

fityk/Makefile.am

@@ -4,7 +4,7 @@ BUILT_SOURCES = swig/fityk_lua.cpp swig/luarun.h
 
 lib_LTLIBRARIES = libfityk.la
 
-libfityk_la_LDFLAGS = $(LIBRARY_VERSION_FLAG)
+libfityk_la_LDFLAGS = $(LIBRARY_VERSION_FLAG) -no-undefined
 libfityk_la_LIBADD = -lxy -lz $(LUA_LIB)
 libfityk_la_CPPFLAGS = $(LUA_INCLUDE)
 
@@ -41,7 +41,7 @@ endif
 
 swig__fityk_la_SOURCES = swig/fityk_python.cpp
 swig__fityk_la_CPPFLAGS = $(PYTHON_CPPFLAGS) -I$(srcdir)
-swig__fityk_la_LDFLAGS = -module -avoid-version -shared
+swig__fityk_la_LDFLAGS = -module -avoid-version -shared -no-undefined
 swig__fityk_la_LIBADD = libfityk.la
 
 $(srcdir)/swig/luarun.h:

release.sh

@@ -1,6 +1,6 @@
 #!/bin/bash 
 
-version=1.1.1
+version=1.2.0
 WEB="iris.unipress.waw.pl:www/fityk2/"
 
 MINGW_DIR=mingw-build
@@ -70,26 +70,35 @@ elif [ $1 -eq 3 ]; then
 elif [ $1 -eq 4 ]; then
  echo Building MS Windows version
  SRC_DIR=fityk-$version/
- MDIR=$HOME/local/mingw32msvc
- BOOST_DIR=$HOME/local/src/boost_1_42_0/
- rm -rf $MINGW_DIR
- mkdir -p $MINGW_DIR
+ MDIR=$HOME/local/mingw32
+ #BOOST_DIR=$HOME/local/src/boost_1_42_0/
+ BOOST_DIR=/usr/local/boost
+# rm -rf $MINGW_DIR
+# mkdir -p $MINGW_DIR
  cd $MINGW_DIR
- tar xjf ../$tarball_filename || exit 1
- # host: MinGW from .deb: i586-mingw32msvc, built locally: i586-pc-mingw32
- $SRC_DIR/configure --build=x86_64-pc-linux-gnu --host=i586-mingw32msvc \
-   CPPFLAGS="-I$BOOST_DIR -I$MDIR/include/" \
-   CXXFLAGS="-O3" LDFLAGS="-s -L$MDIR/lib" \
-   --without-readline --enable-static --disable-shared \
-   --with-wx-config=$MDIR/bin/wx-config
- make || exit
+# tar xjf ../$tarball_filename || exit 1
+# # host: MinGW from .deb: i586-mingw32msvc, built locally: i586-pc-mingw32
+# #       from Fedora: i686-w64-mingw32
+# $SRC_DIR/configure --host=i686-w64-mingw32 \
+#   CPPFLAGS="-I$BOOST_DIR -I$MDIR/include/" \
+#   CXXFLAGS="-O3" LDFLAGS="-s -L$MDIR/lib" \
+#   --without-readline --with-wx-config=$MDIR/bin/wx-config \
+#   --disable-static --enable-shared
+#   #--enable-static --disable-shared
+# make || exit
  mkdir -p $ALL_WIN_FILES/samples $ALL_WIN_FILES/fityk
  cp fityk.iss $SRC_DIR/fityk.url $SRC_DIR/COPYING $SRC_DIR/TODO \
     $SRC_DIR/NEWS $ALL_WIN_FILES
  cp -r $SRC_DIR/doc/html/ $ALL_WIN_FILES/
- cp $SRC_DIR/samples/*.fit $SRC_DIR/samples/*.dat $SRC_DIR/samples/README \
-    $ALL_WIN_FILES/samples/
- cp wxgui/fityk.exe cli/cfityk.exe $ALL_WIN_FILES/fityk/
+ cp $SRC_DIR/samples/*.fit $SRC_DIR/samples/*.dat $SRC_DIR/samples/*.lua \
+    $SRC_DIR/samples/README $ALL_WIN_FILES/samples/
+ #cp wxgui/fityk.exe cli/cfityk.exe $ALL_WIN_FILES/fityk/
+ cp wxgui/.libs/fityk.exe cli/.libs/cfityk.exe fityk/.libs/libfityk-*.dll \
+    $MDIR/bin/libxy-*.dll $MDIR/bin/xyconv.exe $MDIR/bin/lua5*.dll \
+    $ALL_WIN_FILES/fityk/
+ cp /usr/i686-w64-mingw32/sys-root/mingw/bin/libgcc_s_sjlj-1.dll \
+    /usr/i686-w64-mingw32/sys-root/mingw/bin/libstdc++-6.dll \
+    $ALL_WIN_FILES/fityk/
  echo everything is in: `pwd`/$ALL_WIN_FILES