Mercurial > mxe-octave
changeset 3473:3f500a3bf813
merge away extra head
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 29 Jan 2014 08:42:12 -0500 |
parents | 6a97f4d1dedb (diff) c81b61989b61 (current diff) |
children | 90e45130eab8 |
files | |
diffstat | 7 files changed, 48 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Wed Jan 29 08:41:05 2014 -0500 +++ b/Makefile.in Wed Jan 29 08:42:12 2014 -0500 @@ -372,6 +372,8 @@ OCTAVE_FORGE_BASE_URL := 'http://sourceforge.net/projects/octave/files/Octave Forge Packages/Individual Package Releases' OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim specfun general signal communications image io statistics control geometry windows odepkg linear-algebra sockets zenity actuarial data-smoothing fuzzy-logic-toolkit quaternion fits fl-core tsa dicom) +BLAS_PACKAGES := blas openblas + MAKE_SHARED_FROM_STATIC := \ $(TOP_DIR)/tools/make-shared-from-static $(MAKE_SHARED_FROM_STATIC_OPTIONS) @@ -445,6 +447,9 @@ .PHONY: octave-forge-packages octave-forge-packages: $(OCTAVE_FORGE_PACKAGES) +.PHONY: blas-packages +blas-packages: $(BLAS_PACKAGES) + configure: configure.ac autoconf
--- a/binary-dist-rules.mk Wed Jan 29 08:41:05 2014 -0500 +++ b/binary-dist-rules.mk Wed Jan 29 08:42:12 2014 -0500 @@ -20,6 +20,7 @@ BINARY_DIST_DEPS := \ $(OCTAVE_TARGET) \ + blas-packages \ octave-forge-packages \ units \ transfig \ @@ -88,6 +89,8 @@ && tar -c $(TAR_H_OPTION) -f - notepad++ | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ) echo " README.html..." cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/ + echo " refblas..." + cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll endef endif
--- a/build_packages.m Wed Jan 29 08:41:05 2014 -0500 +++ b/build_packages.m Wed Jan 29 08:42:12 2014 -0500 @@ -16,7 +16,7 @@ pkg install communications-1.2.0.tar.gz pkg install image-2.2.0.tar.gz pkg install io-2.0.2.tar.gz -pkg install statistics-1.1.3.tar.gz +pkg install statistics-1.2.3.tar.gz pkg install geometry-1.7.0.tar.gz pkg install windows-1.2.1.tar.gz pkg install odepkg-0.8.4.tar.gz
--- a/index.html Wed Jan 29 08:41:05 2014 -0500 +++ b/index.html Wed Jan 29 08:42:12 2014 -0500 @@ -2059,7 +2059,7 @@ </tr> <tr> <td id="of-statistics-package">of-statistics</td> - <td id="of-statistics-version">1.2.2</td> + <td id="of-statistics-version">1.2.3</td> <td id="of-statistics-website"><a href="http://octave.sf.net/">Octave Forge statistics package</a></td> </tr> <tr>
--- a/installer-files/README.html Wed Jan 29 08:41:05 2014 -0500 +++ b/installer-files/README.html Wed Jan 29 08:42:12 2014 -0500 @@ -24,6 +24,16 @@ for more information about the release and how you can help us with GUI development and speed up the 4.0 release. </p> +<h2>BLAS Library selection</h2> +<p> +During the install, a BLAS library was selected. The installer contains 2 BLAS implementations, +the <a href="http://www.netlib.org/blas/">NetLib reference BLAS</a> and +<a href="http://www.openblas.net/">OpenBLAS</a>. +</p> +<p> +Either can be selected after the install by copying librefblas.dll or libopenblas.dll +to libblas.dll in the bin folder of the Octave installation. +</p> <h2>Included Octave Forge Packages</h2> <p> A number of Octave-forge packages have been included with this install Octave,
--- a/makeinst-script.sh Wed Jan 29 08:41:05 2014 -0500 +++ b/makeinst-script.sh Wed Jan 29 08:42:12 2014 -0500 @@ -71,6 +71,12 @@ ; custom dialogs !include nsDialogs.nsh +!macro __DropList_GetCurSel CONTROL VAR + SendMessage \${CONTROL} \${CB_GETCURSEL} 0 0 \${VAR} +!macroend + +!define DropList_GetCurSel \`!insertmacro __DropList_GetCurSel\` + ; additional logic !include LogicLib.nsh @@ -123,6 +129,8 @@ Var InstallShortcutsCtrl Var RegisterOctaveFileType Var RegisterOctaveFileTypeCtrl +Var InstallBlasLibCtrl +Var InstallBlasLib Function octaveOptionsPage Push \$0 @@ -145,6 +153,15 @@ Pop \$RegisterOctaveFileTypeCtrl \${NSD_SetState} \$RegisterOctaveFileTypeCtrl \${BST_CHECKED} + \${NSD_CreateLabel} 0 70 110u 12u "BLAS library implementation:" + Pop \$0 + + \${NSD_CreateDropList} 120u 70 100u 80u "" + Pop \$InstallBlasLibCtrl + \${NSD_CB_AddString} \$InstallBlasLibCtrl "Reference BLAS" + \${NSD_CB_AddString} \$InstallBlasLibCtrl "OpenBLAS" + \${NSD_CB_SelectString} \$InstallBlasLibCtrl "Reference BLAS" + !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing" nsDialogs::Show Pop \$0 @@ -154,6 +171,7 @@ \${NSD_GetState} \$InstallAllUsersCtrl \$InstallAllUsers \${NSD_GetState} \$InstallShortcutsCtrl \$InstallShortcuts \${NSD_GetState} \$RegisterOctaveFileTypeCtrl \$RegisterOctaveFileType + \${DropList_GetCurSel} \$InstallBlasLibCtrl \$InstallBlasLib FunctionEnd ###################################################################### @@ -244,6 +262,15 @@ CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0 \${Endif} + ; BLAS set up + \${If} \$InstallBlasLib == 1 + ; 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 Section "FileTypeRego"
--- a/src/of-statistics.mk Wed Jan 29 08:41:05 2014 -0500 +++ b/src/of-statistics.mk Wed Jan 29 08:42:12 2014 -0500 @@ -3,7 +3,7 @@ PKG := of-statistics $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 8c3260308e8011c0425ab3965d79f15b4abc37a0 +$(PKG)_CHECKSUM := fba40342a265053323c36c590a74d9567e4a0870 $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := statistics $(PKG)_FILE := statistics-$($(PKG)_VERSION).tar.gz