Mercurial > mxe-octave

comparison tools/makeinst-script.sh.in @ 4752:e839056b9a65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow building of unreleased stable branch (4.4.0x) (bug #54176). * src/stable-octave.mk: Define PKG_VERSION to 4.4.0x to match configure.ac for stable branch. Define new variable PKG_WIN_VERSION=4.4.0.5 which is used for unreleased stable branch on Windows. Write PKG_WIN_VERSION to octave-version file. * tools/makeinst-script.sh.in: Define new INSTALLER_VERSION variable. If VERSION is already 4 digits (4.4.0.5) then leave unchanged, otherwise add a fourth zero so that version number matches windows expectations.
author Rik <rik@octave.org>
date Tue, 03 Jul 2018 19:00:22 -0700
parents 12bfaba26c8d
children e76d54c038ef
comparison
equal deleted inserted replaced
4751:2e43e7e36a8e 4752:e839056b9a65
27 ICON=`find $OCTAVE_SOURCE -name octave-logo.ico -printf "%P\n" | head -1 | sed 's,/,\\\\,g'` 27 ICON=`find $OCTAVE_SOURCE -name octave-logo.ico -printf "%P\n" | head -1 | sed 's,/,\\\\,g'`
28 28
29 # extract version number 29 # extract version number
30 OCTAVE_VERSION=`head -1 $MXEDIR/octave/octave-version` 30 OCTAVE_VERSION=`head -1 $MXEDIR/octave/octave-version`
31 VERSION=`echo $OCTAVE_VERSION | sed -n 's,\([0-9\.]*\).*,\1,p'` 31 VERSION=`echo $OCTAVE_VERSION | sed -n 's,\([0-9\.]*\).*,\1,p'`
32 if [ `echo $VERSION | grep -o '\.' | wc -l` -le 2 ]; then
33 INSTALLER_VERSION="$VERSION.0"
34 else
35 INSTALLER_VERSION=$VERSION
36 fi
32 37
33 # estimated size of installed files 38 # estimated size of installed files
34 SIZE=`du -slk $OCTAVE_SOURCE | awk '{print \$1}'` 39 SIZE=`du -slk $OCTAVE_SOURCE | awk '{print \$1}'`
35 40
36 # create installer script 41 # create installer script
39 # installer settings 44 # installer settings
40 cat >> $OUTFILE << EOF 45 cat >> $OUTFILE << EOF
41 !define APP_NAME "GNU Octave" 46 !define APP_NAME "GNU Octave"
42 !define COMP_NAME "GNU Project" 47 !define COMP_NAME "GNU Project"
43 !define WEB_SITE "https://www.octave.org" 48 !define WEB_SITE "https://www.octave.org"
44 !define VERSION "$VERSION.0" 49 !define VERSION "$INSTALLER_VERSION"
45 !define OCTAVE_VERSION "$OCTAVE_VERSION" 50 !define OCTAVE_VERSION "$OCTAVE_VERSION"
46 !define COPYRIGHT "Copyright © 2013-2018 John W. Eaton and others." 51 !define COPYRIGHT "Copyright © 2013-2018 John W. Eaton and others."
47 !define DESCRIPTION "GNU Octave is a high-level programming language, primarily intended for numerical computations." 52 !define DESCRIPTION "GNU Octave is a high-level programming language, primarily intended for numerical computations."
48 !define INSTALLER_FILES "$TOPDIR/installer-files" 53 !define INSTALLER_FILES "$TOPDIR/installer-files"
49 !define INSTALLER_NAME "$INSTALLER_NAME" 54 !define INSTALLER_NAME "$INSTALLER_NAME"