Mercurial > mxe-octave
changeset 3387:0779856e1186
Add desktop shortcut and octave-versionxxxxx-installer.exe naming.
* makeinst-script.mk: change installer name to octave-VERSION.exe,
add checkbox option to create deskyop shortcuts.
* mk-dist: when in stable mode use folder name of octave-VERSION.
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Fri, 03 Jan 2014 02:14:54 -0500 |
| parents | 17ef0d555e71 |
| children | 58b5ed5a0247 |
| files | makeinst-script.sh mk-dist |
| diffstat | 2 files changed, 30 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/makeinst-script.sh Wed Jan 01 19:34:01 2014 -0500 +++ b/makeinst-script.sh Fri Jan 03 02:14:54 2014 -0500 @@ -36,7 +36,7 @@ !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" -!define INSTALLER_NAME "octave-installer.exe" +!define INSTALLER_NAME "octave-$OCTAVE_VERSION-installer.exe" !define MAIN_APP_EXE "octave.exe" !define INSTALL_TYPE "SetShellVarContext current" !define PRODUCT_ROOT_KEY "HKLM" @@ -86,6 +86,18 @@ !insertmacro MUI_PAGE_INSTFILES +; set up checkbox to create desktop icon +Function finishpage_desktopshortcut + SetOutPath "\$INSTDIR\\bin" + CreateShortCut "\$desktop\\Octave-$VERSION.lnk" "\$INSTDIR\\bin\\octave.exe" "" "\$INSTDIR\\$ICON" 0 + CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0 +FunctionEnd + +!define MUI_FINISHPAGE_SHOWREADME "" +!define MUI_FINISHPAGE_SHOWREADME_CHECKED +!define MUI_FINISHPAGE_SHOWREADME_TEXT "Create Desktop Shortcut" +!define MUI_FINISHPAGE_SHOWREADME_FUNCTION finishpage_desktopshortcut + !define MUI_FINISHPAGE_RUN "\$INSTDIR\\bin\\\${MAIN_APP_EXE}" !insertmacro MUI_PAGE_FINISH @@ -172,6 +184,8 @@ Delete "\$SMPROGRAMS\\Octave\\*.*" RMDir "\$SMPROGRAMS\\Octave" + Delete "\$desktop\\Octave-$VERSION.lnk" + Delete "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" EOF # insert dir list (backwards order) for uninstall files
--- a/mk-dist Wed Jan 01 19:34:01 2014 -0500 +++ b/mk-dist Fri Jan 03 02:14:54 2014 -0500 @@ -6,6 +6,16 @@ jobs=0 OCTAVE_TARGET=octave +TOPDIR=$(pwd) +PATH=$TOPDIR/usr/bin:$PATH +TARGET=i686-pc-mingw32 +PREFIX=/usr/$TARGET +STRIP=$TARGET-strip +DATE=$(date +%Y-%m-%d-%H-%M) +OCTAVE_DIST_DIR=$TOPDIR/dist/octave-$DATE +INSTALLER_PKG= + +OCTAVE_VERSION=`head -1 $TOPDIR/octave/octave-version` strip=yes installer=no @@ -22,7 +32,9 @@ fi ;; --stable) + # for stable, use octave-version as the folder OCTAVE_TARGET=stable-octave + OCTAVE_DIST_DIR=$TOPDIR/dist/octave-$OCTAVE_VERSION shift ;; --no-strip) @@ -41,15 +53,6 @@ esac done -TOPDIR=$(pwd) -PATH=$TOPDIR/usr/bin:$PATH -TARGET=i686-pc-mingw32 -PREFIX=/usr/$TARGET -STRIP=$TARGET-strip -DATE=$(date +%Y-%m-%d-%H-%M) -OCTAVE_DIST_DIR=$TOPDIR/dist/$OCTAVE_TARGET-$DATE -INSTALLER_PKG= - if [ $installer = "yes" ]; then echo "Adding installer to build dependancies" INSTALLER_PKG="nsis" @@ -129,18 +132,18 @@ cd $TOPDIR/dist if [ $installer = "yes" ]; then - ../makeinst-script.sh $OCTAVE_TARGET-$DATE + ../makeinst-script.sh $OCTAVE_DIST_DIR echo "Generating installer ..." $TOPDIR/usr/bin/$TARGET-makensis octave.nsi > /dev/null - if [ -e octave-installer.exe ]; then + if [ -e octave-$OCTAVE_VERSION-installer.exe ]; then echo "Installer created" rm octave.nsi fi else echo "creating zip file..." - zip -q -9 -r $OCTAVE_TARGET-$DATE.zip $OCTAVE_TARGET-$DATE + zip -q -9 -r $OCTAVE_DIST_DIR.zip $OCTAVE_DIST_DIR fi