updated docs for ver. 1.2.1

INSTALL

@@ -3,7 +3,7 @@ Prerequisites
 =============
 
 *  C++ compiler (e.g. GCC)
-*  Boost libraries (headers only)
+*  Boost libraries >= 1.35 (headers only)
 *  Lua >= 5.1
 *  zlib library
 *  xylib library - http://xylib.sf.net

NEWS

@@ -1,4 +1,4 @@
-User-visible changes in version 1.2.1  (2012-  -  ):
+User-visible changes in version 1.2.1  (2012-11-05):
 * added commands '=' and 'exec=' - shorthands 'lua return' and 'lua F:execute'
 * API: default dataset in a few functions changed from @0 to the currently used
 * GUI: new dialog GUI > Configure > Default Directories

TODO

@@ -2,7 +2,7 @@
 
 * GUI: Re-execute script -> Recent scripts
 
-* NLopt interface
+* use optimization algorithms from NLopt library
 
 * FFT data transformation using FFTW library,
   fft[-inv]-xx, where xx is re, im, amp, e.g. @n = fft-re(@3)
@@ -79,10 +79,6 @@
                        http://dx.doi.org/10.1002/cem.1005
                        http://www.ncbi.nlm.nih.gov/pmc/articles/PMC2631518/
 
-* fitting: consider using NLopt for alternative optimization methods
-  (http://ab-initio.mit.edu/wiki/index.php/NLopt) and a library for
-  Genetic Algorithms.
-
 * fitting: in addition to the least squares fit, add so-called robust fit 
   (it is called robust fit in the Numerical Recipes book), i.e. optimize
   assuming the error distribution is other then Gaussian, eg. Lorenzian...;

doc/index.rst

@@ -104,7 +104,9 @@ after the end of subscription.
 
 * `1 month subscription <https://www.plimus.com/jsp/buynow.jsp?contractId=2918496>`_: $115 (≈ €90)
 
-* `1 year subscription <https://www.plimus.com/jsp/buynow.jsp?contractId=2918202>`_: $265 (≈ €200)
+* `1 year subscription <https://www.plimus.com/jsp/buynow.jsp?contractId=2918202>`_: $199 (≈ €150)
+
+* `2 years subscription <https://www.plimus.com/jsp/buynow.jsp?contractId=3146878>`_: $299 (≈ €230)
 
 .. raw:: html
 
@@ -126,7 +128,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.2.0 was released on 2012-05-24
+Version 1.2.1 was released on 2012-11-05
 (`changelog <https://github.com/wojdyr/fityk/raw/master/NEWS>`_).
 New version `notifications <http://fityk-announce.nieto.pl/>`_
 are delivered via email and feeds.

fityk.iss.in

@@ -17,8 +17,8 @@ ChangesAssociations=yes
 
 
 [Files]
-Source: src\fityk.exe; DestDir: {app}
-Source: src\cfityk.exe; DestDir: {app}
+Source: fityk\*.exe; DestDir: {app}
+Source: fityk\*.dll; DestDir: {app}
 Source: COPYING; DestDir: {app}
 Source: TODO; DestDir: {app}
 Source: NEWS; DestDir: {app}

release.sh

@@ -4,7 +4,6 @@ version=1.2.1
 WEB="iris.unipress.waw.pl:www/fityk2/"
 
 MINGW_DIR=mingw-build
-ALL_WIN_FILES=all_files #inside of $MINGW_DIR
 
 win_setup_filename=$MINGW_DIR/all_files/Output/fityk-$version-setup.exe
 tarball_filename=fityk-$version.tar.bz2
@@ -69,37 +68,35 @@ elif [ $1 -eq 3 ]; then
 
 elif [ $1 -eq 4 ]; then
  echo Building MS Windows version
- SRC_DIR=fityk-$version/
  MDIR=$HOME/local/mingw32
- #BOOST_DIR=$HOME/local/src/boost_1_42_0/
- BOOST_DIR=/usr/local/boost
+ BOOST_DIR=$HOME/local/src/boost_1_50_0
 # 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
-# #       from Fedora: i686-w64-mingw32
-# $SRC_DIR/configure --host=i686-w64-mingw32 \
+ # host: MinGW from .deb: i586-mingw32msvc, built locally: i586-pc-mingw32
+ #       from Fedora: i686-w64-mingw32
+# ../configure --host=i686-w64-mingw32 \
 #   CPPFLAGS="-I$BOOST_DIR -I$MDIR/include/" \
-#   CXXFLAGS="-O3" LDFLAGS="-s -L$MDIR/lib" \
+#   CXXFLAGS="-O3" LDFLAGS="-s -fno-keep-inline-dllexport -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/*.lua \
-    $SRC_DIR/samples/README $ALL_WIN_FILES/samples/
- #cp wxgui/fityk.exe cli/cfityk.exe $ALL_WIN_FILES/fityk/
+
+ make -j2 || exit
+ mkdir -p all_files/samples all_files/fityk
+ cp fityk.iss ../fityk.url ../COPYING ../TODO ../NEWS all_files/
+ cp -r ../doc/html/ all_files/
+ cp ../samples/*.fit ../samples/*.dat ../samples/*.lua \
+    ../samples/README all_files/samples/
+ #cp wxgui/fityk.exe cli/cfityk.exe all_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/
+    all_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
+    /usr/i686-w64-mingw32/sys-root/mingw/bin/zlib1.dll \
+    all_files/fityk/
+ echo everything is in: `pwd`/all_files
 
 
 elif [ $1 -eq 8 ]; then

wxgui/Makefile.am

@@ -63,8 +63,9 @@ powdifpat_CPPFLAGS = $(WX_CPPFLAGS) -DSTANDALONE_POWDIFPAT
 powdifpat_LDADD = libceria.a $(WX_LIBS) -lxy $(powdifpat_res)
 endif
 
+#stylesheet from https://xylib.svn.sourceforge.net/svnroot/xylib/trunk/web.css
 xyconvert.html: xyconvert.rst
-	rst2html --stylesheet-path=$$HOME/xylib/trunk/web.css $< $@
+	rst2html --stylesheet-path=$$HOME/xylib/web.css $< $@
 
 
 ## to find icons not listed here use (in bash):

wxgui/xyconvert.rst

@@ -19,10 +19,11 @@ Installation
 Linux, FreeBSD, etc.
 --------------------
 
-xyconvert is distributed with fityk_, but it requires wxWidgets (wxGTK) >= 2.9,
-so it's not included in any distros yet.
-To compile it, you need to install wxGTK, boost and xylib, download fityk
-source and do ``./configure && cd src/wxgui/ && make xyconvert``.
+xyconvert source is distributed with fityk_. Building fityk will also build
+xyconvert. Binary packages for popular Linux distributions are available
+in `OBS repository`__.
+
+__ http://software.opensuse.org/download?project=home:wojdyr&package=xyconvert
 
 .. _fityk: http://www.unipress.waw.pl/fityk/