From 2a60e57dfc51ba9a47f3414ccedf19e139e94383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=28Charybdis=29?= Date: Fri, 7 Sep 2018 15:45:15 +0200 Subject: [PATCH 01/12] Changed remote for m-unit-tests submodule. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index ec91857fd..5b3623555 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,7 +12,7 @@ url = http://www.dynare.org/git/dmm.git [submodule "matlab/utilities/tests"] path = matlab/utilities/tests - url = https://github.com/DynareTeam/m-unit-tests.git + url = https://git.dynare.org/Dynare/m-unit-tests.git [submodule "matlab/particles"] path = matlab/particles url = https://git.dynare.org/Dynare/particles.git From 51416bf2ae492c672166fe8afa0c145d5cbaa7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Thu, 6 Sep 2018 17:12:15 +0200 Subject: [PATCH 02/12] Always use "isoctave" for testing Octave context --- matlab/add_path_to_mex_files.m | 2 +- matlab/utilities/general/dyn_mex.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/matlab/add_path_to_mex_files.m b/matlab/add_path_to_mex_files.m index e7f5967b3..2f1fa058d 100644 --- a/matlab/add_path_to_mex_files.m +++ b/matlab/add_path_to_mex_files.m @@ -21,7 +21,7 @@ if nargin<2 modifypath = true; end -if exist('OCTAVE_VERSION') +if isoctave if ispc() && strcmpi(computer(), 'i686-w64-mingw32') mexpath = {[dynareroot '../mex/octave32/']}; else diff --git a/matlab/utilities/general/dyn_mex.m b/matlab/utilities/general/dyn_mex.m index f20f1fb0a..185e061f5 100644 --- a/matlab/utilities/general/dyn_mex.m +++ b/matlab/utilities/general/dyn_mex.m @@ -44,7 +44,7 @@ if ~isempty(Dmex) end end -if ~exist('OCTAVE_VERSION') +if ~isoctave % Some mex commands are enclosed in an eval(), because otherwise it will make Octave fail if ispc if strcmp(win_compiler,'msvc') From d3c618e8a1188ca3e1c0d94e0732584a8b36eb47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Fri, 7 Sep 2018 18:44:40 +0200 Subject: [PATCH 03/12] Upgrade to Octave 4.4.1 for Windows installer --- windows/README.txt | 2 +- windows/dynare.nsi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/README.txt b/windows/README.txt index 886fca456..094b88ecb 100644 --- a/windows/README.txt +++ b/windows/README.txt @@ -57,7 +57,7 @@ Using Dynare with Octave Dynare also works on top of GNU Octave, a free clone of MATLAB (R) (see ). -This version of Dynare is compiled for Octave 4.4.0 (MinGW, 32bit and 64bit), and may not work +This version of Dynare is compiled for Octave 4.4.1 (MinGW, 32bit and 64bit), and may not work with other versions of Octave. The recommended version of Octave can be downloaded at: diff --git a/windows/dynare.nsi b/windows/dynare.nsi index a468186e2..7bad24fd4 100644 --- a/windows/dynare.nsi +++ b/windows/dynare.nsi @@ -112,12 +112,12 @@ SectionGroupEnd SectionGroup "MEX files for Octave" -Section "MEX files for Octave 4.4.0 (MinGW, 64bit)" +Section "MEX files for Octave 4.4.1 (MinGW, 64bit)" SetOutPath $INSTDIR\mex\octave File ..\mex\octave\* SectionEnd -Section "MEX files for Octave 4.4.0 (MinGW, 32bit)" +Section "MEX files for Octave 4.4.1 (MinGW, 32bit)" SetOutPath $INSTDIR\mex\octave32 File ..\mex\octave32\* SectionEnd From 740f5d3481c5b9820a0ee179035edf408623417b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=28Charybdis=29?= Date: Mon, 10 Sep 2018 09:48:32 +0200 Subject: [PATCH 04/12] Changed remote for dates submodule. Also changed branch to master. --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5b3623555..5b16ed194 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,8 +18,8 @@ url = https://git.dynare.org/Dynare/particles.git [submodule "matlab/modules/dates"] path = matlab/modules/dates - url = https://github.com/DynareTeam/dates.git - branch = old-oop-style + url = https://git.dynare.org/Dynare/dates.git + branch = master [submodule "matlab/modules/dseries"] path = matlab/modules/dseries url = https://github.com/DynareTeam/dseries.git From 7438498acd31635e8b42e6ebfc95f85eed59ea9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=28Charybdis=29?= Date: Mon, 10 Sep 2018 10:07:28 +0200 Subject: [PATCH 05/12] Changed remote for dseries submodule. Also changed branch to master. --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5b16ed194..1b91a8e10 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,8 +22,8 @@ branch = master [submodule "matlab/modules/dseries"] path = matlab/modules/dseries - url = https://github.com/DynareTeam/dseries.git - branch = old-oop-style + url = https://git.dynare.org/Dynare/dseries.git + branch = master [submodule "matlab/modules/reporting"] path = matlab/modules/reporting url = https://github.com/DynareTeam/reporting.git From bcdca088d38bf05bd4474def645bb8acd0a10305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=28Charybdis=29?= Date: Mon, 10 Sep 2018 10:23:21 +0200 Subject: [PATCH 06/12] Changed remote for reporting submodule. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 1b91a8e10..bd4564241 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,7 +26,7 @@ branch = master [submodule "matlab/modules/reporting"] path = matlab/modules/reporting - url = https://github.com/DynareTeam/reporting.git + url = https://git.dynare.org/Dynare/reporting.git [submodule "contrib/jsonlab"] path = contrib/jsonlab url = https://github.com/fangq/jsonlab.git From 1f82fd8c724672af659bf76482f48d86e528b0e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=28Charybdis=29?= Date: Mon, 10 Sep 2018 11:13:04 +0200 Subject: [PATCH 07/12] Changed remote of preprocessor submodule. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index bd4564241..7efeef8ac 100644 --- a/.gitmodules +++ b/.gitmodules @@ -32,4 +32,4 @@ url = https://github.com/fangq/jsonlab.git [submodule "preprocessor"] path = preprocessor - url = https://github.com/DynareTeam/dynare-preprocessor.git + url = https://git.dynare.org/Dynare/preprocessor.git From 7b834bef29d6f36fcf189bc3edfa379433a8b4f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Mon, 10 Sep 2018 11:55:04 +0200 Subject: [PATCH 08/12] Update URLs for the move to GitLab --- CONTRIBUTING.md | 18 +++++++++--------- README.md | 8 ++++---- doc/dynare.texi | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 82db8052d..ad1942620 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,13 +10,13 @@ If something is not clear, don't hesitate to ask if you can't find the answer on Please note that the repositories under the purview of this page are: -* [Dynare](https://github.com/DynareTeam/dynare) -* [Particles](https://github.com/DynareTeam/particles) -* [Dates](https://github.com/DynareTeam/dates) -* [Dseries](https://github.com/DynareTeam/dseries) -* [Reporting](https://github.com/DynareTeam/reporting) -* [Testsuite](https://github.com/DynareTeam/testsuite) -* [M-unit-tests](https://github.com/DynareTeam/m-unit-tests) +* [Dynare](https://git.dynare.org/Dynare/dynare) +* [Particles](https://git.dynare.org/Dynare/particles) +* [Dates](https://git.dynare.org/Dynare/dates) +* [Dseries](https://git.dynare.org/Dynare/dseries) +* [Reporting](https://git.dynare.org/Dynare/reporting) +* [Testsuite](https://git.dynare.org/Dynare/testsuite) +* [M-unit-tests](https://git.dynare.org/Dynare/m-unit-tests) ## Making your Intentions Known @@ -26,7 +26,7 @@ Before making changes to the codebase, it'd be helpful if you communicated your You can report bugs in both the stable and unstable versions of Dynare. Before reporting a bug in the stable version of Dynare, please check the [Known Bugs](http://www.dynare.org/DynareWiki/KnownBugs) page to ensure it has not already been encountered/fixed. If reporting a bug in the unstable version of Dynare, please ensure the bug exists in the latest [unstable Dynare snapshot](http://www.dynare.org/download/dynare-unstable). -To report a bug in Dynare, simply open a GitHub issue in the repository where the bug resides. For example, to report a bug in Dynare itself, go to the [Dynare repository issue page](https://github.com/DynareTeam/dynare/issues) and click on "New Issue." +To report a bug in Dynare, simply open a GitHub issue in the repository where the bug resides. For example, to report a bug in Dynare itself, go to the [Dynare repository issue page](https://git.dynare.org/Dynare/dynare/issues) and click on "New Issue." The minimal information to add is a subject and a description of the steps needed to reproduce the bug. However, the most helpful description would also provide the code to reproduce the bug (often times a `.mod` file). The most helpful `.mod` file is a minimal, quick-running example that reproduces the bug, but we'll take anything that will help us squash a bug. @@ -45,7 +45,7 @@ So, now you've reported the bug or asked for an enhancemnt by creating a GitHub Now, if you want to go the extra mile, you'll volunteer to contribute code to fix the GitHub issue you created above. Once we've agreed that you'll do it, please do the following: 1. Clone the Dynare repository: - * `git clone https://github.com/DynareTeam/dynare.git` + * `git clone https://git.dynare.org/Dynare/dynare.git` 1. [Fork the Dynare repository](https://help.github.com/articles/fork-a-repo) 1. Change into the `dynare` folder and add the forked repository as a remote: * `cd dynare` diff --git a/README.md b/README.md index 562c7074c..9c647ea06 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ available via the Dynare homepage: +- via git, at - using the stable source archive of the latest Dynare version (currently 4.4) from - using a source snapshot of the unstable version, from @@ -91,7 +91,7 @@ If you have downloaded the sources from an official source archive or the source If you want to use Git, do the following from a terminal: - git clone --recursive https://github.com/DynareTeam/dynare.git + git clone --recursive https://git.dynare.org/Dynare/dynare.git cd dynare autoreconf -si @@ -326,7 +326,7 @@ The following commands will download the Dynare source code and compile it. They should be entered at the command prompt in Terminal.app from the folder where you want Dynare installed. -- `git clone https://github.com/DynareTeam/dynare.git` +- `git clone https://git.dynare.org/Dynare/dynare.git` - `cd dynare` - `PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH"` - `autoreconf -si` diff --git a/doc/dynare.texi b/doc/dynare.texi index a8a05bff0..72d8758a1 100644 --- a/doc/dynare.texi +++ b/doc/dynare.texi @@ -407,7 +407,7 @@ all commands and features in a systematic fashion. Other useful sources of information include the @uref{http://www.dynare.org/DynareWiki,old Dynare wiki}, the -@uref{https://github.com/DynareTeam/dynare/wiki,new Dynare wiki}, the documentation +@uref{https://git.dynare.org/Dynare/dynare/wikis/home,new Dynare wiki}, the documentation section of the @uref{http://www.dynare.org/documentation-and-support,Dynare website} and the @uref{https://forum.dynare.org/,Dynare forum}. @@ -568,7 +568,7 @@ You need to download Dynare source code from the Then you will need to recompile the pre-processor and the dynamic loadable libraries. Please refer to -@uref{https://github.com/DynareTeam/dynare/blob/master/README.md,README.md}. +@uref{https://git.dynare.org/Dynare/dynare/blob/master/README.md,README.md}. @node Compiler installation @section Compiler installation @@ -9749,7 +9749,7 @@ that of the parameter at @code{t-1}. @end table -In case of estimating a MS-DSGE model,@footnote{An example can be found at @uref{https://github.com/DynareTeam/dynare/blob/master/tests/ms-dsge/test_ms_dsge.mod}.} in addition the following options are allowed: +In case of estimating a MS-DSGE model,@footnote{An example can be found at @uref{https://git.dynare.org/Dynare/dynare/blob/master/tests/ms-dsge/test_ms_dsge.mod}.} in addition the following options are allowed: @table @code From 2ba50d3b3b4182a1df5a6d1a77b36837d7252d0d Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Tue, 11 Sep 2018 12:04:22 +0200 Subject: [PATCH 09/12] preprocessor: submodule update --- preprocessor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preprocessor b/preprocessor index 74dd6a69e..f71c861d5 160000 --- a/preprocessor +++ b/preprocessor @@ -1 +1 @@ -Subproject commit 74dd6a69e94b1a7d2969e6a8135eb922a86d3769 +Subproject commit f71c861d5eed854e9ed1f7dc0d74463de926da35 From 62db2e59f55007ff50e314f5bb18ac657b2b6f1f Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Wed, 12 Sep 2018 12:07:51 +0200 Subject: [PATCH 10/12] preprocessor: submodule update --- preprocessor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preprocessor b/preprocessor index f71c861d5..0376f7f17 160000 --- a/preprocessor +++ b/preprocessor @@ -1 +1 @@ -Subproject commit f71c861d5eed854e9ed1f7dc0d74463de926da35 +Subproject commit 0376f7f1733f560b5ec96eb49a4430ae2f2f4840 From 9367981b5816a4c815e4acca5c7a76286e5c5ebd Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Wed, 12 Sep 2018 18:02:25 +0200 Subject: [PATCH 11/12] preprocessor: submodule update --- preprocessor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preprocessor b/preprocessor index 0376f7f17..dc9ecbb49 160000 --- a/preprocessor +++ b/preprocessor @@ -1 +1 @@ -Subproject commit 0376f7f1733f560b5ec96eb49a4430ae2f2f4840 +Subproject commit dc9ecbb49a71f1da4486605d3e10ef4e366a786c From 3d2bc65df6e6aa39fd48ff5b338d055a90e457b0 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Wed, 12 Sep 2018 18:27:37 +0200 Subject: [PATCH 12/12] preprocessor: submodule update --- preprocessor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preprocessor b/preprocessor index dc9ecbb49..dfb0629c2 160000 --- a/preprocessor +++ b/preprocessor @@ -1 +1 @@ -Subproject commit dc9ecbb49a71f1da4486605d3e10ef4e366a786c +Subproject commit dfb0629c252dd1ea0641e90ccebb1c744570ac74