diff tools/makeinst-script.sh.in @ 4658:213da5688be0

update binary dist rules * binary-dist-rules.mk: Use -w64, -w32, or -w64-64 suffix for Windows binary distributions. New target for creating .7z files. * tools/makeinst-script.sh.in: New arg for name of installer file.
author John W. Eaton <jwe@octave.org>
date Thu, 12 Apr 2018 12:09:22 -0400
parents 2f14bc0c6d0c
children 12bfaba26c8d
line wrap: on
line diff
--- a/tools/makeinst-script.sh.in	Thu Apr 12 12:08:06 2018 -0400
+++ b/tools/makeinst-script.sh.in	Thu Apr 12 12:09:22 2018 -0400
@@ -1,17 +1,16 @@
 #! /bin/bash
 set -e
 
-if [ $# != 2 ]; then
-  echo "usage: makeinst-script.sh dist-dir output-script-name" 1>&2
+if [ $# != 3 ]; then
+  echo "usage: makeinst-script.sh dist-dir installer-name output-script-name" 1>&2
   exit 1
 fi
 
-OUTFILE="$2"
+INSTALLER_NAME="$2"
+OUTFILE="$3"
 TOPDIR=@abs_top_srcdir@
 TOP_BUILD_DIR=@abs_top_builddir@
 
-ENABLE64="@ENABLE_WINDOWS_64@"
-
 OCTAVE_SOURCE=`basename $1`
 
 cd `dirname $1`
@@ -47,7 +46,7 @@
 !define COPYRIGHT "Copyright © 2013-2018 John W. Eaton and others."
 !define DESCRIPTION "GNU Octave is a high-level programming language, primarily intended for numerical computations."
 !define INSTALLER_FILES "$TOPDIR/installer-files"
-!define INSTALLER_NAME "octave-$OCTAVE_VERSION-installer.exe"
+!define INSTALLER_NAME "$INSTALLER_NAME"
 !define MAIN_APP_EXE "octave-firsttime.vbs"
 !define INSTALL_TYPE "SetShellVarContext current"
 !define PRODUCT_ROOT_KEY "HKLM"