Mercurial > mxe-octave

comparison tools/makeinst-script.sh.in @ 5347:4d6716dcec28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* tools/makeinst-script.sh.in: Install to ProgramFiles by default (bug #53124).
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 21 Feb 2020 12:29:08 +0100
parents 8da894159471
children ec1f5c04ca0b
comparison
equal deleted inserted replaced
5346:e0fd834ea2e1 5347:4d6716dcec28
30 fi 30 fi
31 else 31 else
32 OCTAVE_SUBDIR= 32 OCTAVE_SUBDIR=
33 fi 33 fi
34 34
35 if [ "@ENABLE_WINDOWS_64@" == "yes" ]; then
36 OCTAVE_INSTDIR="\$PROGRAMFILES64\\GNU Octave\\Octave-\${OCTAVE_VERSION}"
37 else
38 OCTAVE_INSTDIR="\$PROGRAMFILES\\GNU Octave\\Octave-\${OCTAVE_VERSION}"
39 fi
35 40
36 if [ -e $OCTAVE_SOURCE/$OCTAVE_SUBDIR/bin/libopenblas.dll ]; then 41 if [ -e $OCTAVE_SOURCE/$OCTAVE_SUBDIR/bin/libopenblas.dll ]; then
37 DEFAULT_BLAS="OpenBLAS" 42 DEFAULT_BLAS="OpenBLAS"
38 else 43 else
39 DEFAULT_BLAS="Reference BLAS" 44 DEFAULT_BLAS="Reference BLAS"
89 Caption "\${APP_NAME}" 94 Caption "\${APP_NAME}"
90 OutFile "\${INSTALLER_NAME}" 95 OutFile "\${INSTALLER_NAME}"
91 BrandingText "\${APP_NAME}" 96 BrandingText "\${APP_NAME}"
92 XPStyle on 97 XPStyle on
93 ManifestDPIAware true 98 ManifestDPIAware true
94 InstallDir "C:\\Octave\\Octave-\${OCTAVE_VERSION}" 99 InstallDir "$OCTAVE_INSTDIR"
95 Icon "\${INSTALLER_FILES}/octave-logo.ico" 100 Icon "\${INSTALLER_FILES}/octave-logo.ico"
96 101
97 ###################################################################### 102 ######################################################################
98 ; StrFunc usage 103 ; StrFunc usage
99 !include "StrFunc.nsh" 104 !include "StrFunc.nsh"
674 679
675 StrCpy \$R1 0 # r1 = counter 680 StrCpy \$R1 0 # r1 = counter
676 space_loop: 681 space_loop:
677 StrCpy \$R0 \$INSTDIR 1 \$R1 # R0 = character in string to check 682 StrCpy \$R0 \$INSTDIR 1 \$R1 # R0 = character in string to check
678 StrCmp \$R0 "" space_end # end of string 683 StrCmp \$R0 "" space_end # end of string
679 StrCmp \$R0 " " space_found
680 StrCmp \$R0 "(" space_found
681 StrCmp \$R0 ")" space_found
682 StrCmp \$R0 "&" space_found 684 StrCmp \$R0 "&" space_found
683 StrCmp \$R0 "%" space_found 685 StrCmp \$R0 "%" space_found
684 StrCmp \$R0 "^" space_found 686 StrCmp \$R0 "^" space_found
685 IntOp \$R1 \$R1 + 1 687 IntOp \$R1 \$R1 + 1
686 GoTo space_loop 688 GoTo space_loop