[Pkg-octave-commit] [SCM] dynare branch, master, updated. bb6bcc2ad7229f408a124db6d4962e4a769cd5d8
Sébastien Villemot
sebastien.villemot at ens.fr
Wed Jan 13 17:47:58 UTC 2010
The following commit has been merged in the master branch:
commit 544ff255ddd930fd2f6cc76fdcda8d0f2ebd52cc
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date: Mon Jan 11 18:07:36 2010 +0100
Refreshed patches
diff --git a/debian/changelog b/debian/changelog
index 1a41943..fc971b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,13 @@ dynare (4.1.0-1) UNRELEASED; urgency=low
debian/patches/manual-fix-for-debian,
debian/patches/rows-name-clash:
Removed patches, incorporated upstream.
+ * debian/patches/build-matlab,
+ debian/patches/extra-addpath,
+ debian/patches/fhs-compliance,
+ debian/patches/testsuite-fs2000:
+ Refreshed patches.
- -- Sébastien Villemot <sebastien.villemot at ens.fr> Mon, 11 Jan 2010 15:47:50 +0100
+ -- Sébastien Villemot <sebastien.villemot at ens.fr> Mon, 11 Jan 2010 16:00:13 +0100
dynare (4.0.4-6) unstable; urgency=low
diff --git a/debian/patches/build-matlab b/debian/patches/build-matlab
index 721dce7..8cb8bd6 100644
--- a/debian/patches/build-matlab
+++ b/debian/patches/build-matlab
@@ -10,23 +10,18 @@ Fix paths to reflect structure of Debian packaging
MATLAB_PATH = matlabroot;
-@@ -71,9 +71,9 @@
+@@ -63,7 +63,7 @@
+ COMPILE_OPTIONS = [ COMPILE_OPTIONS ' -largeArrayDims' ];
end
- if matlab_ver_less_than('7.5')
-- OUTPUT_DIR = '../2007a';
-+ OUTPUT_DIR = '/usr/lib/dynare/mex/2007a';
- else
-- OUTPUT_DIR = '../2007b';
-+ OUTPUT_DIR = '/usr/lib/dynare/mex/2007b';
- end
+-OUTPUT_DIR = '../matlab';
++OUTPUT_DIR = '/usr/lib/dynare/mex/matlab';
+
+ disp(' ')
+ if exist(OUTPUT_DIR,'dir')
+@@ -216,3 +216,5 @@
+ BLAS_PATH ' ' LAPACK_PATH]);
- % Comment next line to suppress compilation debugging info
-@@ -109,4 +109,6 @@
- 'gensylv/cc/Vector.cpp ' ...
- BLAS_PATH ' ' LAPACK_PATH ]);
- disp('Compiling simulate...')
--eval([ COMPILE_COMMAND ' -Isimulate -I../../preprocessor/include simulate/simulate.cc simulate/Interpreter.cc simulate/Mem_Mngr.cc simulate/SparseMatrix.cc' ]);
-+eval([ COMPILE_COMMAND ' -Isimulate simulate/simulate.cc simulate/Interpreter.cc simulate/Mem_Mngr.cc simulate/SparseMatrix.cc' ]);
+ rmdir(LIBDYNAREPP_DIR, 's')
+
+exit
diff --git a/debian/patches/extra-addpath b/debian/patches/extra-addpath
index f019c4e..91f5b5c 100644
--- a/debian/patches/extra-addpath
+++ b/debian/patches/extra-addpath
@@ -7,6 +7,6 @@ Add an extra addpath at the top of dynare.m so that the symlink in /usr/share/oc
+addpath /usr/share/dynare/matlab
+
- warning_config
-
- if exist('OCTAVE_VERSION')
+ if strcmpi(fname,'help')
+ disp(' ')
+ disp(['This is dynare version ' dynare_version() '.'])
diff --git a/debian/patches/fhs-compliance b/debian/patches/fhs-compliance
index 311d1e3..99ca133 100644
--- a/debian/patches/fhs-compliance
+++ b/debian/patches/fhs-compliance
@@ -1,29 +1,61 @@
Hardcode paths in dynare_config.m, reflecting the FHS compliance of the package
--- a/matlab/dynare_config.m
+++ b/matlab/dynare_config.m
-@@ -35,16 +35,17 @@
+@@ -35,41 +35,42 @@
if nargin
addpath(path_to_dynare);
end
--dynareroot = strrep(which('dynare.m'),'dynare.m','');
+-dynareroot = strrep(which('dynare'),'dynare.m','');
+dynareroot = '/usr/lib/dynare/matlab/';
+dynareroot_mfiles = '/usr/share/dynare/matlab/';
- % Add path to distribution-related function if under Matlab
- % without the statistics toolbox
- if ~exist('OCTAVE_VERSION') && isempty(ver('stats'))
-- addpath([dynareroot '/distributions/'])
-+ addpath([dynareroot_mfiles '/distributions/'])
+-addpath([dynareroot '/distributions/'])
+-addpath([dynareroot '/kalman/'])
+-addpath([dynareroot '/kalman/likelihood'])
+-addpath([dynareroot '/AIM/'])
++addpath([dynareroot_mfiles '/distributions/'])
++addpath([dynareroot_mfiles '/kalman/'])
++addpath([dynareroot_mfiles '/kalman/likelihood'])
++addpath([dynareroot_mfiles '/AIM/'])
+
+ % For functions that exist only under some Octave versions
+ % or some MATLAB versions, and for which we provide some replacement functions
+
+ if ~exist('OCTAVE_VERSION')
+ % Replacements for rows() and columns() (inexistent under MATLAB)
+- addpath([dynareroot '/missing/rows_columns'])
++ addpath([dynareroot_mfiles '/missing/rows_columns'])
+ % Replacement for vec() (inexistent under MATLAB)
+- addpath([dynareroot '/missing/vec'])
++ addpath([dynareroot_mfiles '/missing/vec'])
+ if isempty(ver('stats'))
+ % Replacements for functions of the stats toolbox
+- addpath([dynareroot '/missing/stats/'])
++ addpath([dynareroot_mfiles '/missing/stats/'])
+ end
end
--if exist([dynareroot '/AIM'])==7 % Add path to G.Anderson AIM solver (added by GP July'08)
-- addpath([dynareroot '/AIM/']);
-+if exist([dynareroot_mfiles '/AIM'])==7 % Add path to G.Anderson AIM solver (added by GP July'08)
-+ addpath([dynareroot_mfiles '/AIM/']);
+ % ordeig() was introducted in MATLAB 7.0.1, and doesn't exist in Octave
+ if exist('OCTAVE_VERSION') || matlab_ver_less_than('7.0.1')
+- addpath([dynareroot '/missing/ordeig'])
++ addpath([dynareroot_mfiles '/missing/ordeig'])
end
+ % rcond() was introduced in Octave 3.2.0
+ if exist('OCTAVE_VERSION') && octave_ver_less_than('3.2.0')
+- addpath([dynareroot '/missing/rcond'])
++ addpath([dynareroot_mfiles '/missing/rcond'])
+ end
+
+ % orschur() is missing in Octave; we don't have a real replacement;
+ % the one we provide just exits with an error message
if exist('OCTAVE_VERSION')
-@@ -77,10 +78,10 @@
+- addpath([dynareroot '/missing/ordschur'])
++ addpath([dynareroot_mfiles '/missing/ordschur'])
+ end
+
+ % Add path to MEX files
+@@ -140,10 +141,10 @@
%% subfolders if valid mex files exist.
matlab_path = path;
for i=1:number_of_mex_files
@@ -36,12 +68,12 @@ Hardcode paths in dynare_config.m, reflecting the FHS compliance of the package
matlab_path = path;
end
end
-@@ -91,7 +92,7 @@
+@@ -155,7 +156,7 @@
for i=1:number_of_mex_files
- test = (exist(mex_status{i,1}) == 3);
+ test = (exist(mex_status{i,1},'file') == 3);
if ~test
- addpath([dynareroot mex_status{i,2}]);
+ addpath([dynareroot_mfiles mex_status{i,2}]);
message = '[m] ';
else
- message = '[mex] ';
+ message = '[mex] ';
diff --git a/debian/patches/testsuite-fs2000 b/debian/patches/testsuite-fs2000
index c949602..5a123d3 100644
--- a/debian/patches/testsuite-fs2000
+++ b/debian/patches/testsuite-fs2000
@@ -4,9 +4,9 @@ chains does not make the test more stringent.
--- a/tests/fs2000/fs2000.mod
+++ b/tests/fs2000/fs2000.mod
@@ -86,4 +86,4 @@
-
- varobs gp_obs gy_obs;
-
+
+ varobs gp_obs gy_obs;
+
-estimation(datafile=fsdat,nobs=192,loglinear,mh_replic=2000,mh_nblocks=5,mh_jscale=0.8);
\ No newline at end of file
+estimation(datafile=fsdat,nobs=192,loglinear,mh_replic=2000,mh_nblocks=2,mh_jscale=0.8);
--
dynare
More information about the Pkg-octave-commit
mailing list