# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1395256373 14400
# Node ID c7725f7221554a79eaedd8302a3ecc1bc8319255
# Parent  c53ea91b338b6294b7996b4b7f886a89214699cd
NSIS installer: use Open BLAS by default

diff -r c53ea91b338b -r c7725f722155 makeinst-script.sh
--- a/makeinst-script.sh	Wed Mar 19 15:11:56 2014 -0400
+++ b/makeinst-script.sh	Wed Mar 19 15:12:53 2014 -0400
@@ -10,11 +10,16 @@
 TOPDIR=`dirname $1`
 OCTAVE_SOURCE=`basename $1`
 
-echo "Generating installer script ... "
-
 cd $TOPDIR
 MXEDIR=`cd ..; pwd`
 
+if [ -e $OCTAVE_SOURCE/bin/libopenblas.dll ]; then
+  DEFAULT_BLAS="OpenBLAS"
+else
+  DEFAULT_BLAS="Reference BLAS"
+fi
+
+
 # find octave shortcut icon
 ICON=`find $OCTAVE_SOURCE -name octave-logo.ico -printf "%P" | head -1 | sed 's,/,\\\\,g'`
 
@@ -161,7 +166,6 @@
 
   \${NSD_CreateDropList} 120u 70 100u 80u ""
   Pop \$InstallBlasLibCtrl
-  \${NSD_CB_AddString} \$InstallBlasLibCtrl "Reference BLAS"
 EOF
    # add option to install libopenblas if we have the dll present
    if [ -e $OCTAVE_SOURCE/bin/libopenblas.dll ]; then
@@ -170,7 +174,11 @@
 EOF
   fi
   cat >> $OUTFILE << EOF
-  \${NSD_CB_SelectString} \$InstallBlasLibCtrl "Reference BLAS"
+  \${NSD_CB_AddString} \$InstallBlasLibCtrl "Reference BLAS"
+EOF
+
+  cat >> $OUTFILE << EOF
+  \${NSD_CB_SelectString} \$InstallBlasLibCtrl "$DEFAULT_BLAS"
 
   !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing"
   nsDialogs::Show  
@@ -284,11 +292,11 @@
 
   ; BLAS set up
   \${If} \$InstallBlasLib == 1
+    ; Reference BLAS
+    CopyFiles /SILENT "\$INSTDIR\\bin\\librefblas.dll" "\$INSTDIR\\bin\\libblas.dll"
+  \${Else}
     ; OpenBLAS
     CopyFiles /SILENT "\$INSTDIR\\bin\\libopenblas.dll" "\$INSTDIR\\bin\\libblas.dll"
-  \${Else}
-    ; Reference BLAS
-    CopyFiles /SILENT "\$INSTDIR\\bin\\librefblas.dll" "\$INSTDIR\\bin\\libblas.dll"
   \${EndIf}
 
 SectionEnd
@@ -468,5 +476,3 @@
   Pop \$R0
 FunctionEnd
 EOF
-
-echo "Generation Completed"