From 7c90441a29a93984bffec781f7448d8bcfaabf09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr>
Date: Wed, 14 Mar 2012 17:26:21 +0100
Subject: [PATCH] Various fixes to the Windows packaging
---
windows/README.txt | 18 +++++++++---------
windows/dynare.nsi | 6 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/windows/README.txt b/windows/README.txt
index 6c653b544b..bf78798376 100644
--- a/windows/README.txt
+++ b/windows/README.txt
@@ -54,14 +54,14 @@ specify a MOD file.
Using Dynare with Octave
------------------------
-Dynare is now available for GNU Octave, a free clone of MATLAB (R) (see
+Dynare also works on top of GNU Octave, a free clone of MATLAB (R) (see
<http://www.octave.org>).
-This version of Dynare is compiled for Octave 3.6.1 (MinGW build), and may not
-work with other versions of Octave. You can download an installer for the right
-version of Octave from the following page:
+This version of Dynare is compiled for Octave 3.6.1 (MinGW), and may not work
+with other versions of Octave. You can download an installer for the right
+version of Octave at:
- http://www.dynare.org/DynareWiki/DynareOctave
+ http://www.dynare.org/octave/Octave3.6.1_gcc4.6.2_20120303-setup.exe
Every time you run Octave, you should type the two following commands (assuming
that you have installed Dynare at the standard location, and replacing '4.x.y'
@@ -69,10 +69,10 @@ by correct version number):
addpath c:\dynare\4.x.y\matlab
-NOTE: if you don't want to type this command every time you run
-Octave, you can put it in a file called '.octaverc' in your home
-directory (generally 'c:\Documents and Settings\USERNAME\'). This file
-is run by Octave at every startup.
+NOTE: if you don't want to type this command every time you run Octave, you can
+put it in a file called '.octaverc' in your home directory ('c:\Documents and
+Settings\USERNAME\' for Windows XP or 'c:\Users\USERNAME' for Windows 7). This
+file is run by Octave at every startup.
You can test your installation by typing 'dynare' at the Octave prompt. This
should give you an error message complaining that you did not specify a MOD
diff --git a/windows/dynare.nsi b/windows/dynare.nsi
index 65002d85d4..627236d5ba 100644
--- a/windows/dynare.nsi
+++ b/windows/dynare.nsi
@@ -87,7 +87,7 @@ SectionEnd
Section "MEX files for MATLAB 32-bit, version 7.5 to 7.14 (R2007b to R2012a)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-7.14
- File ..\mex\matlab\win32-7.5-7.13\*.mexw32
+ File ..\mex\matlab\win32-7.5-7.14\*.mexw32
SectionEnd
# Currently we don't have that version of MATLAB
@@ -108,12 +108,12 @@ SectionEnd
Section "MEX files for MATLAB 64-bit, version 7.8 to 7.14 (R2009a to R2012a)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-7.14
- File ..\mex\matlab\win64-7.8-7.13\*.mexw64
+ File ..\mex\matlab\win64-7.8-7.14\*.mexw64
SectionEnd
SectionGroupEnd
-Section "MEX files for Octave 3.6.1 (MinGW build)"
+Section "MEX files for Octave 3.6.1 (MinGW)"
SetOutPath $INSTDIR\mex\octave
File ..\mex\octave\*.mex ..\mex\octave\*.oct
SectionEnd
--
GitLab