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

2019-10-02 10:36:48 +02:00 · 2019-10-02 10:36:48 +02:00 · 5d8babb15c
parent 9c9e2b443e 32932ce741
commit 5d8babb15c
10 changed files with 34 additions and 194 deletions
--- a/macOS/build.sh
+++ b/macOS/build.sh
@ -1,5 +1,22 @@
 #!/usr/bin/env bash

+# Copyright © 2019 Dynare Team
+#
+# This file is part of Dynare.
+#
+# Dynare is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Dynare is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
+
 set -ex

 # Set the number of threads
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 1fcd305015c77b93ca2110efc749dbfd72dfe3ba
+Subproject commit 93077bbcdda14849a88d7e60366e93211cb7c533
--- a/tests/example1_macro.mod
+++ b/tests/example1_macro.mod
@ -207,7 +207,10 @@ stoch_simul;
@#error "Cast error"
@#endif

-@#if -3:-1.5:3 != [] || 3:-1:-0.1 != [3, 2, 1, 0]
+@#if -3:-1.5:3 != [] || 3:-1:-0.1 != [3, 2, 1, 0] \\
+     || 1:1 != [1] || 1:0:1 != [] \\
+     || -1:5:-1 != [-1] || -1:-5:-1 != [-1] \\ // Inline comment
+     || 0:0:0 != [] || 0:0 != [0]
@#error "Range error"
@#endif

--- a/windows/deps/Makefile
+++ b/windows/deps/Makefile
@ -52,70 +52,70 @@ sources32/slicot-$(SLICOT_VERSION)-without-underscore: tarballs/slicot-$(SLICOT_
 	rm -rf sources32/slicot-*-without-underscore
 	mkdir -p $@
 	tar xf $< --directory $@ --strip-components=1
-	patch $@/make.inc < patches/slicot-32-without-underscore.patch
+	touch $@

 sources32/slicot-$(SLICOT_VERSION)-with-underscore: tarballs/slicot-$(SLICOT_VERSION).tar.gz
 	rm -rf sources32/slicot-*-with-underscore
 	mkdir -p $@
 	tar xf $< --directory $@ --strip-components=1
-	patch $@/make.inc < patches/slicot-32-with-underscore.patch
+	touch $@

 sources64/slicot-$(SLICOT_VERSION)-with-32bit-integer: tarballs/slicot-$(SLICOT_VERSION).tar.gz
 	rm -rf sources64/slicot-*-with-32bit-integer
 	mkdir -p $@
 	tar xf $< --directory $@ --strip-components=1
-	patch $@/make.inc < patches/slicot-64-with-32bit-integer.patch
+	touch $@

 sources64/slicot-$(SLICOT_VERSION)-with-64bit-integer: tarballs/slicot-$(SLICOT_VERSION).tar.gz
 	rm -rf sources64/slicot-*-with-64bit-integer
 	mkdir -p $@
 	tar xf $< --directory $@ --strip-components=1
-	patch $@/make.inc < patches/slicot-64-with-64bit-integer.patch
+	touch $@

 sources64/slicot-$(SLICOT_VERSION)-with-32bit-integer-and-underscore: tarballs/slicot-$(SLICOT_VERSION).tar.gz
 	rm -rf sources64/slicot-*-with-32bit-integer-and-underscore
 	mkdir -p $@
 	tar xf $< --directory $@ --strip-components=1
-	patch $@/make.inc < patches/slicot-64-with-32bit-integer-and-underscore.patch
+	touch $@

 sources64/slicot-$(SLICOT_VERSION)-with-64bit-integer-and-underscore: tarballs/slicot-$(SLICOT_VERSION).tar.gz
 	rm -rf sources64/slicot-*-with-64bit-integer-and-underscore
 	mkdir -p $@
 	tar xf $< --directory $@ --strip-components=1
-	patch $@/make.inc < patches/slicot-64-with-64bit-integer-and-underscore.patch
+	touch $@

 lib32/Slicot/without-underscore/lib/libslicot_pic.a: sources32/slicot-$(SLICOT_VERSION)-without-underscore
-	make -C $< lib
+	make -C $< lib SLICOTLIB=../libslicot_pic.a OPTS="-O2 -g -fno-underscoring" FORTRAN=i686-w64-mingw32-gfortran LOADER=i686-w64-mingw32-gfortran ARCH=i686-w64-mingw32-ar
 	i686-w64-mingw32-strip --strip-debug $</libslicot_pic.a
 	mkdir -p $(dir $@)
 	cp $</libslicot_pic.a $@

 lib32/Slicot/with-underscore/lib/libslicot_pic.a: sources32/slicot-$(SLICOT_VERSION)-with-underscore
-	make -C $< lib
+	make -C $< lib SLICOTLIB=../libslicot_pic.a OPTS="-O2 -g" FORTRAN=i686-w64-mingw32-gfortran LOADER=i686-w64-mingw32-gfortran ARCH=i686-w64-mingw32-ar
 	i686-w64-mingw32-strip --strip-debug $</libslicot_pic.a
 	mkdir -p $(dir $@)
 	cp $</libslicot_pic.a $@

 lib64/Slicot/without-underscore/lib/libslicot_pic.a: sources64/slicot-$(SLICOT_VERSION)-with-32bit-integer
-	make -C $< lib
+	make -C $< lib SLICOTLIB=../libslicot_pic.a OPTS="-O2 -g -fno-underscoring" FORTRAN=x86_64-w64-mingw32-gfortran LOADER=x86_64-w64-mingw32-gfortran ARCH=x86_64-w64-mingw32-ar
 	x86_64-w64-mingw32-strip --strip-debug $</libslicot_pic.a
 	mkdir -p $(dir $@)
 	cp $</libslicot_pic.a $@

 lib64/Slicot/without-underscore/lib/libslicot64_pic.a: sources64/slicot-$(SLICOT_VERSION)-with-64bit-integer
-	make -C $< lib
+	make -C $< lib SLICOTLIB=../libslicot64_pic.a OPTS="-O2 -g -fno-underscoring -fdefault-integer-8" FORTRAN=x86_64-w64-mingw32-gfortran LOADER=x86_64-w64-mingw32-gfortran ARCH=x86_64-w64-mingw32-ar
 	x86_64-w64-mingw32-strip --strip-debug $</libslicot64_pic.a
 	mkdir -p $(dir $@)
 	cp $</libslicot64_pic.a $@

 lib64/Slicot/with-underscore/lib/libslicot_pic.a: sources64/slicot-$(SLICOT_VERSION)-with-32bit-integer-and-underscore
-	make -C $< lib
+	make -C $< lib SLICOTLIB=../libslicot_pic.a OPTS="-O2 -g" FORTRAN=x86_64-w64-mingw32-gfortran LOADER=x86_64-w64-mingw32-gfortran ARCH=x86_64-w64-mingw32-ar
 	x86_64-w64-mingw32-strip --strip-debug $</libslicot_pic.a
 	mkdir -p $(dir $@)
 	cp $</libslicot_pic.a $@

 lib64/Slicot/with-underscore/lib/libslicot64_pic.a: sources64/slicot-$(SLICOT_VERSION)-with-64bit-integer-and-underscore
-	make -C $< lib
+	make -C $< lib SLICOTLIB=../libslicot64_pic.a OPTS="-O2 -g -fdefault-integer-8" FORTRAN=x86_64-w64-mingw32-gfortran LOADER=x86_64-w64-mingw32-gfortran ARCH=x86_64-w64-mingw32-ar
 	x86_64-w64-mingw32-strip --strip-debug $</libslicot64_pic.a
 	mkdir -p $(dir $@)
 	cp $</libslicot64_pic.a $@
--- a/windows/deps/patches/slicot-32-with-underscore.patch
+++ b/windows/deps/patches/slicot-32-with-underscore.patch
@ -1,30 +0,0 @@
--- make.inc	2012-01-19 20:51:25.000000000 +0100
-+++ slicot-32-with-underscore.inc	2016-09-18 15:39:53.403237169 +0200
-@@ -16,16 +16,16 @@
- #  selected.  Define LOADER and LOADOPTS to refer to the loader and 
- #  desired load options for your machine.
- #
-FORTRAN  = f77
-OPTS     = -O4 -native -u
-+FORTRAN  = i686-w64-mingw32-gfortran
-+OPTS     = -O2 -g
- NOOPT    = -u
-LOADER   = f77
-+LOADER   = i686-w64-mingw32-gfortran
- LOADOPTS = $(SLICOTLIB) $(LPKAUXLIB) $(LAPACKLIB)
- #
- #  The archiver and the flag(s) to use when building archive (library)
- #  If your system has no ranlib, set RANLIB = echo.
- #
-ARCH     = ar
-+ARCH     = i686-w64-mingw32-ar
- ARCHFLAGS= r
- # ARCHFLAGS= cr
- # RANLIB   = ranlib
-@@ -36,5 +36,5 @@
- #
- #BLASLIB     = -L/software/lib
- LAPACKLIB    = -L/software/lib -llapack -lblas
-SLICOTLIB    = ../slicot.a
-+SLICOTLIB    = ../libslicot_pic.a
- LPKAUXLIB    = ../lpkaux.a
--- a/windows/deps/patches/slicot-32-without-underscore.patch
+++ b/windows/deps/patches/slicot-32-without-underscore.patch
@ -1,30 +0,0 @@
--- make.inc	2012-01-19 20:51:25.000000000 +0100
-+++ slicot-32-without-underscore.inc	2016-09-18 15:32:26.784187836 +0200
-@@ -16,16 +16,16 @@
- #  selected.  Define LOADER and LOADOPTS to refer to the loader and 
- #  desired load options for your machine.
- #
-FORTRAN  = f77
-OPTS     = -O4 -native -u
-+FORTRAN  = i686-w64-mingw32-gfortran
-+OPTS     = -O2 -g -fno-underscoring
- NOOPT    = -u
-LOADER   = f77
-+LOADER   = i686-w64-mingw32-gfortran
- LOADOPTS = $(SLICOTLIB) $(LPKAUXLIB) $(LAPACKLIB)
- #
- #  The archiver and the flag(s) to use when building archive (library)
- #  If your system has no ranlib, set RANLIB = echo.
- #
-ARCH     = ar
-+ARCH     = i686-w64-mingw32-ar
- ARCHFLAGS= r
- # ARCHFLAGS= cr
- # RANLIB   = ranlib
-@@ -36,5 +36,5 @@
- #
- #BLASLIB     = -L/software/lib
- LAPACKLIB    = -L/software/lib -llapack -lblas
-SLICOTLIB    = ../slicot.a
-+SLICOTLIB    = ../libslicot_pic.a
- LPKAUXLIB    = ../lpkaux.a
--- a/windows/deps/patches/slicot-64-with-32bit-integer-and-underscore.patch
+++ b/windows/deps/patches/slicot-64-with-32bit-integer-and-underscore.patch
@ -1,30 +0,0 @@
--- make.inc	2012-01-19 20:51:25.000000000 +0100
-+++ slicot-64-with-32bit-integer.inc	2016-09-18 15:39:22.022804314 +0200
-@@ -16,16 +16,16 @@
- #  selected.  Define LOADER and LOADOPTS to refer to the loader and 
- #  desired load options for your machine.
- #
-FORTRAN  = f77
-OPTS     = -O4 -native -u
-+FORTRAN  = x86_64-w64-mingw32-gfortran
-+OPTS     = -O2 -g
- NOOPT    = -u
-LOADER   = f77
-+LOADER   = x86_64-w64-mingw32-gfortran
- LOADOPTS = $(SLICOTLIB) $(LPKAUXLIB) $(LAPACKLIB)
- #
- #  The archiver and the flag(s) to use when building archive (library)
- #  If your system has no ranlib, set RANLIB = echo.
- #
-ARCH     = ar
-+ARCH     = x86_64-w64-mingw32-ar
- ARCHFLAGS= r
- # ARCHFLAGS= cr
- # RANLIB   = ranlib
-@@ -36,5 +36,5 @@
- #
- #BLASLIB     = -L/software/lib
- LAPACKLIB    = -L/software/lib -llapack -lblas
-SLICOTLIB    = ../slicot.a
-+SLICOTLIB    = ../libslicot_pic.a
- LPKAUXLIB    = ../lpkaux.a
--- a/windows/deps/patches/slicot-64-with-32bit-integer.patch
+++ b/windows/deps/patches/slicot-64-with-32bit-integer.patch
@ -1,30 +0,0 @@
--- make.inc	2012-01-19 20:51:25.000000000 +0100
-+++ slicot-64-with-32bit-integer.inc	2016-09-18 15:39:22.022804314 +0200
-@@ -16,16 +16,16 @@
- #  selected.  Define LOADER and LOADOPTS to refer to the loader and 
- #  desired load options for your machine.
- #
-FORTRAN  = f77
-OPTS     = -O4 -native -u
-+FORTRAN  = x86_64-w64-mingw32-gfortran
-+OPTS     = -O2 -g -fno-underscoring
- NOOPT    = -u
-LOADER   = f77
-+LOADER   = x86_64-w64-mingw32-gfortran
- LOADOPTS = $(SLICOTLIB) $(LPKAUXLIB) $(LAPACKLIB)
- #
- #  The archiver and the flag(s) to use when building archive (library)
- #  If your system has no ranlib, set RANLIB = echo.
- #
-ARCH     = ar
-+ARCH     = x86_64-w64-mingw32-ar
- ARCHFLAGS= r
- # ARCHFLAGS= cr
- # RANLIB   = ranlib
-@@ -36,5 +36,5 @@
- #
- #BLASLIB     = -L/software/lib
- LAPACKLIB    = -L/software/lib -llapack -lblas
-SLICOTLIB    = ../slicot.a
-+SLICOTLIB    = ../libslicot_pic.a
- LPKAUXLIB    = ../lpkaux.a
--- a/windows/deps/patches/slicot-64-with-64bit-integer-and-underscore.patch
+++ b/windows/deps/patches/slicot-64-with-64bit-integer-and-underscore.patch
@ -1,30 +0,0 @@
--- make.inc	2012-01-19 20:51:25.000000000 +0100
-+++ slicot-64-with-64bit-integer.inc	2016-09-18 15:39:09.142623934 +0200
-@@ -16,16 +16,16 @@
- #  selected.  Define LOADER and LOADOPTS to refer to the loader and 
- #  desired load options for your machine.
- #
-FORTRAN  = f77
-OPTS     = -O4 -native -u
-+FORTRAN  = x86_64-w64-mingw32-gfortran
-+OPTS     = -O2 -g -fdefault-integer-8
- NOOPT    = -u
-LOADER   = f77
-+LOADER   = x86_64-w64-mingw32-gfortran
- LOADOPTS = $(SLICOTLIB) $(LPKAUXLIB) $(LAPACKLIB)
- #
- #  The archiver and the flag(s) to use when building archive (library)
- #  If your system has no ranlib, set RANLIB = echo.
- #
-ARCH     = ar
-+ARCH     = x86_64-w64-mingw32-ar
- ARCHFLAGS= r
- # ARCHFLAGS= cr
- # RANLIB   = ranlib
-@@ -36,5 +36,5 @@
- #
- #BLASLIB     = -L/software/lib
- LAPACKLIB    = -L/software/lib -llapack -lblas
-SLICOTLIB    = ../slicot.a
-+SLICOTLIB    = ../libslicot64_pic.a
- LPKAUXLIB    = ../lpkaux.a
--- a/windows/deps/patches/slicot-64-with-64bit-integer.patch
+++ b/windows/deps/patches/slicot-64-with-64bit-integer.patch
@ -1,30 +0,0 @@
--- make.inc	2012-01-19 20:51:25.000000000 +0100
-+++ slicot-64-with-64bit-integer.inc	2016-09-18 15:39:09.142623934 +0200
-@@ -16,16 +16,16 @@
- #  selected.  Define LOADER and LOADOPTS to refer to the loader and 
- #  desired load options for your machine.
- #
-FORTRAN  = f77
-OPTS     = -O4 -native -u
-+FORTRAN  = x86_64-w64-mingw32-gfortran
-+OPTS     = -O2 -g -fno-underscoring -fdefault-integer-8
- NOOPT    = -u
-LOADER   = f77
-+LOADER   = x86_64-w64-mingw32-gfortran
- LOADOPTS = $(SLICOTLIB) $(LPKAUXLIB) $(LAPACKLIB)
- #
- #  The archiver and the flag(s) to use when building archive (library)
- #  If your system has no ranlib, set RANLIB = echo.
- #
-ARCH     = ar
-+ARCH     = x86_64-w64-mingw32-ar
- ARCHFLAGS= r
- # ARCHFLAGS= cr
- # RANLIB   = ranlib
-@@ -36,5 +36,5 @@
- #
- #BLASLIB     = -L/software/lib
- LAPACKLIB    = -L/software/lib -llapack -lblas
-SLICOTLIB    = ../slicot.a
-+SLICOTLIB    = ../libslicot64_pic.a
- LPKAUXLIB    = ../lpkaux.a