From 54d28d65da474c1f1b375abdcb1f20eeb3ea9cf5 Mon Sep 17 00:00:00 2001
From: houtanb <houtan@dynare.org>
Date: Thu, 22 Jun 2017 16:34:52 +0200
Subject: [PATCH] add new submodule: jsonlab
---
.gitmodules | 5 ++++-
Makefile.am | 2 ++
contrib/jsonlab | 1 +
license.txt | 4 ++++
matlab/dynare_config.m | 1 +
5 files changed, 12 insertions(+), 1 deletion(-)
create mode 160000 contrib/jsonlab
diff --git a/.gitmodules b/.gitmodules
index 37399d3b10..ef21bb2de7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -26,4 +26,7 @@
branch = old-oop-style
[submodule "matlab/modules/reporting"]
path = matlab/modules/reporting
- url = https://github.com/DynareTeam/reporting.git
\ No newline at end of file
+ url = https://github.com/DynareTeam/reporting.git
+[submodule "contrib/jsonlab"]
+ path = contrib/jsonlab
+ url = https://github.com/fangq/jsonlab.git
diff --git a/Makefile.am b/Makefile.am
index 1eb1fc0ec7..5fa0d96ca7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,6 +44,8 @@ dist-hook:
install-exec-local:
$(MKDIR_P) $(DESTDIR)$(pkglibdir)/contrib/ms-sbvar/TZcode
cp -r contrib/ms-sbvar/TZcode/MatlabFiles $(DESTDIR)$(pkglibdir)/contrib/ms-sbvar/TZcode
+ $(MKDIR_P) $(DESTDIR)$(pkglibdir)/contrib/jsonlab
+ cp -r contrib/jsonlab $(DESTDIR)$(pkglibdir)/contrib/jsonlab
cp -r examples $(DESTDIR)$(pkglibdir)
cp -r matlab $(DESTDIR)$(pkglibdir)
rm -rf $(DESTDIR)$(pkglibdir)/matlab/preprocessor*
diff --git a/contrib/jsonlab b/contrib/jsonlab
new file mode 160000
index 0000000000..31b5bdc283
--- /dev/null
+++ b/contrib/jsonlab
@@ -0,0 +1 @@
+Subproject commit 31b5bdc283f54733dca6352c760cd363878886e1
diff --git a/license.txt b/license.txt
index 2decd038dc..215a5638e2 100644
--- a/license.txt
+++ b/license.txt
@@ -263,6 +263,10 @@ Copyright: 2009 John Burkardt
2010-2011 Dynare Team
License: LGPL-3+
+Files: contrib/jsonlab
+Copyright: 2011-2017 Qianqian Fang <q.fang at neu.edu>
+License: BSD or GPL-3+
+
Files: contrib/ms-sbvar/utilities_dw/*
Copyright: 1996-2011 Daniel Waggoner
License: GPL-3+
diff --git a/matlab/dynare_config.m b/matlab/dynare_config.m
index ae65aab15f..8ebe8da502 100644
--- a/matlab/dynare_config.m
+++ b/matlab/dynare_config.m
@@ -54,6 +54,7 @@ p = {'/distributions/' ; ...
'/ms-sbvar/' ; ...
'/ms-sbvar/identification/' ; ...
'/../contrib/ms-sbvar/TZcode/MatlabFiles/' ; ...
+ '/../contrib/jsonlab/' ; ...
'/parallel/' ; ...
'/particles/src' ; ...
'/gsa/' ; ...
--
GitLab