Mercurial > mxe-octave
changeset 3366:ab6116aa1039
installer: update mk-dist to use make-installer installer file name and use octave-version
* mk-dist: update successful installer exe check to match installer created file.
* make-installer.sh: use octave version from index.html for installer version.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sun, 08 Dec 2013 20:51:14 -0500 |
parents | a88bbf197ddf |
children | cfcbe03c9160 |
files | makeinst-script.sh mk-dist |
diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/makeinst-script.sh Sun Dec 08 20:51:14 2013 -0500 +++ b/makeinst-script.sh Sun Dec 08 20:51:14 2013 -0500 @@ -18,6 +18,10 @@ # find icon ICON=`find $OCTAVE_SOURCE -name octave-logo.ico -printf "%P" | head -1 | sed 's,/,\\\\,g'` +# extract version number +VERSION=`sed -n 's,.*id=\"octave-version\">\([0-9\.]*\).*,\1,p' < ../index.html` +OCTAVE_VERSION=`sed -n 's,.*id=\"octave-version\">\([^<]*\).*,\1,p' < ../index.html` + # create installer script echo "; octave setup script $OCTAVE_SOURCE" > octave.nsi @@ -26,8 +30,8 @@ !define APP_NAME "GNU Octave" !define COMP_NAME "GNU Project" !define WEB_SITE "http://www.octave.org" -!define VERSION "3.7.5.0" -!define OCTAVE_VERSION "3.7.5" +!define VERSION "$VERSION.0" +!define OCTAVE_VERSION "$OCTAVE_VERSION" !define COPYRIGHT "Copyright © 2013 John W. Eaton and others." !define DESCRIPTION "GNU Octave is a high-level programming language, primarily intended for numerical computations." !define INSTALLER_FILES "../installer_files"
--- a/mk-dist Sun Dec 08 20:51:14 2013 -0500 +++ b/mk-dist Sun Dec 08 20:51:14 2013 -0500 @@ -129,7 +129,7 @@ echo "Generating installer ..." $TOPDIR/usr/bin/$TARGET-makensis octave.nsi > /dev/null - if [ -e Octave-Installer.exe ]; then + if [ -e octave-installer.exe ]; then echo "Installer created" rm octave.nsi fi