stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'community/master' into enterprise

time-shift
Houtan Bastani 2019-10-24 12:07:07 +02:00
parent 645ebda638 5f2d60f945
commit 36b83ad079
No known key found for this signature in database
GPG Key ID: 000094FB955BE169
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macOS/build.sh
View File

@ -71,7 +71,7 @@ make -j"$NTHREADS"
##
NAME=dynare-"$VERSION"
PKGFILES="$ROOTDIR"/macOS/pkg/"$NAME"
mkdir -p "$PKGFILES"/mex/matlab/maci64-8.7-9.3
mkdir -p "$PKGFILES"/mex/matlab/maci64-7.9-9.3
mkdir "$PKGFILES"/mex/matlab/maci64-9.4-9.7
mkdir "$PKGFILES"/mex/octave
mkdir -p "$PKGFILES"/doc/dynare++
@ -87,7 +87,7 @@ cp -p "$ROOTDIR"/license.txt "$PKGFILES"
cp -pr "$ROOTDIR"/matlab "$PKGFILES"
cp -pr "$ROOTDIR"/examples "$PKGFILES"
cp -L "$ROOTDIR"/mex/matlab/* "$PKGFILES"/mex/matlab/maci64-8.7-9.3
cp -L "$ROOTDIR"/mex/matlab/* "$PKGFILES"/mex/matlab/maci64-7.9-9.3
cp -p "$ROOTDIR"/scripts/dynare.el "$PKGFILES"/scripts
cp -pr "$ROOTDIR"/contrib/ms-sbvar/TZcode/MatlabFiles "$PKGFILES"/contrib/ms-sbvar/TZcode

2
matlab/add_path_to_mex_files.m
View File

@ -85,7 +85,7 @@ else
% Add macOS paths for Dynare Mac package
if strcmp(computer, 'MACI64')
if matlab_ver_less_than('9.4')
tmp = [dynareroot '../mex/matlab/maci64-8.7-9.3/'];
tmp = [dynareroot '../mex/matlab/maci64-7.9-9.3/'];
if exist(tmp, 'dir')
mexpath = tmp;
if modifypath

2
matlab/modules/reporting

@ -1 +1 @@
Subproject commit 38be99ed8d352ad27ce68a0a5886294ff05c445b
Subproject commit 6701600d1c7b2fc653647f481153bacdc1880036