From b100a03a0f9a2c45828cbafa21d3f724c3114ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org> Date: Tue, 25 Feb 2020 16:33:32 +0100 Subject: [PATCH] =?UTF-8?q?Build=20system=20+=20Windows/macOS=20package:?= =?UTF-8?q?=20provisions=20for=20Dynare++=E2=80=99s=20dynare=5Fsimul.m?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 2ae88722fb52ad84fc344a7b6ae98124813ab4c0) --- dynare++/Makefile.am | 10 ++++++++++ macOS/build.sh | 3 ++- windows/build.sh | 4 ++-- windows/dynare.nsi | 3 +++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dynare++/Makefile.am b/dynare++/Makefile.am index 36d74d5ce2..806c55dbeb 100644 --- a/dynare++/Makefile.am +++ b/dynare++/Makefile.am @@ -1 +1,11 @@ SUBDIRS = utils/cc sylv parser/cc tl doc integ kord src tests + +EXTRA_DIST = dynare_simul + +install-exec-local: + $(MKDIR_P) $(DESTDIR)$(pkglibdir)/dynare++ + cp -r dynare_simul/* $(DESTDIR)$(pkglibdir)/dynare++ + +uninstall-local: + rm -rf $(DESTDIR)$(pkglibdir)/dynare++ + diff --git a/macOS/build.sh b/macOS/build.sh index b43ae236ef..910a3515ec 100755 --- a/macOS/build.sh +++ b/macOS/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright © 2019 Dynare Team +# Copyright © 2019-2020 Dynare Team # # This file is part of Dynare. # @@ -125,6 +125,7 @@ cp -r "$ROOTDIR"/doc/manual/build/html "$PKGFILES" cp "$ROOTDIR"/dynare++/doc/*.pdf "$PKGFILES"/doc/dynare++ cp "$ROOTDIR"/dynare++/src/dynare++ "$PKGFILES"/dynare++ +cp "$ROOTDIR"/dynare++/dynare_simul/dynare_simul.m "$PKGFILES"/dynare++ mkdir -p "$PKGFILES"/matlab/modules/dseries/externals/x13/macOS/64 cp -p "$ROOTDIR"/macOS/deps/lib64/x13as/x13as "$PKGFILES"/matlab/modules/dseries/externals/x13/macOS/64 diff --git a/windows/build.sh b/windows/build.sh index 9ab553ac6c..d7b3bb3f29 100755 --- a/windows/build.sh +++ b/windows/build.sh @@ -5,7 +5,7 @@ # The binaries are cross compiled for Windows (32/64bits), Octave and MATLAB # (all supported versions). -# Copyright © 2017-2019 Dynare Team +# Copyright © 2017-2020 Dynare Team # # This file is part of Dynare. # @@ -270,7 +270,7 @@ cp -pr examples "$ZIPDIR" mkdir -p "$ZIPDIR"/scripts cp -p scripts/dynare.el "$ZIPDIR"/scripts mkdir "$ZIPDIR"/dynare++ -cp -pr dynare++/32-bit/ dynare++/64-bit/ "$ZIPDIR"/dynare++ +cp -pr dynare++/32-bit/ dynare++/64-bit/ dynare++/dynare_simul/dynare_simul.m "$ZIPDIR"/dynare++ mkdir -p "$ZIPDIR"/doc/dynare++ mkdir -p "$ZIPDIR"/doc/dynare-manual.html cp -pr doc/manual/build/html/* "$ZIPDIR"/doc/dynare-manual.html diff --git a/windows/dynare.nsi b/windows/dynare.nsi index edbf446647..e0d61964cb 100644 --- a/windows/dynare.nsi +++ b/windows/dynare.nsi @@ -158,6 +158,9 @@ Section /o "Dynare++ (standalone executable)" SetOutPath $INSTDIR\dynare++\64-bit File ..\dynare++\64-bit\dynare++.exe + SetOutPath $INSTDIR\dynare++\ + File ..\dynare++\dynare_simul\dynare_simul.m + SetOutPath $INSTDIR\doc\dynare++ File ..\dynare++\doc\*.pdf -- GitLab