Skip to content
Snippets Groups Projects
Verified Commit a7d816cf authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Windows and macOS packages: fix installation path of x13as

The binary location had not been updated following the move of the dseries
submodule (commit e962cb4d).

(cherry picked from commit 60e3b6a1)
parent 3a3d1db7
No related branches found
No related tags found
No related merge requests found
#!/usr/bin/env bash #!/usr/bin/env bash
# Copyright © 2019-2023 Dynare Team # Copyright © 2019-2024 Dynare Team
# #
# This file is part of Dynare. # This file is part of Dynare.
# #
...@@ -150,8 +150,8 @@ cp "$ROOTDIR"/build-doc/*.pdf "$PKGFILES" ...@@ -150,8 +150,8 @@ cp "$ROOTDIR"/build-doc/*.pdf "$PKGFILES"
cp "$ROOTDIR"/build-doc/preprocessor/doc/*.pdf "$PKGFILES"/doc cp "$ROOTDIR"/build-doc/preprocessor/doc/*.pdf "$PKGFILES"/doc
cp -r "$ROOTDIR"/build-doc/dynare-manual.html "$PKGFILES"/doc cp -r "$ROOTDIR"/build-doc/dynare-manual.html "$PKGFILES"/doc
mkdir -p "$PKGFILES"/matlab/modules/dseries/externals/x13/macOS/64 mkdir -p "$PKGFILES"/matlab/dseries/externals/x13/macOS/64
cp -p "$ROOTDIR"/macOS/deps/"$PKG_ARCH"/lib64/x13as/x13as "$PKGFILES"/matlab/modules/dseries/externals/x13/macOS/64 cp -p "$ROOTDIR"/macOS/deps/"$PKG_ARCH"/lib64/x13as/x13as "$PKGFILES"/matlab/dseries/externals/x13/macOS/64
cd "$ROOTDIR"/macOS/pkg cd "$ROOTDIR"/macOS/pkg
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# The binaries are cross compiled for Windows (64-bit), Octave and MATLAB # The binaries are cross compiled for Windows (64-bit), Octave and MATLAB
# (all supported versions). # (all supported versions).
# Copyright © 2017-2023 Dynare Team # Copyright © 2017-2024 Dynare Team
# #
# This file is part of Dynare. # This file is part of Dynare.
# #
...@@ -127,8 +127,8 @@ mkdir "$ZIPDIR"/preprocessor ...@@ -127,8 +127,8 @@ mkdir "$ZIPDIR"/preprocessor
cp -p build-win-matlab/preprocessor/src/dynare-preprocessor.exe "$ZIPDIR"/preprocessor cp -p build-win-matlab/preprocessor/src/dynare-preprocessor.exe "$ZIPDIR"/preprocessor
cp -pr matlab "$ZIPDIR" cp -pr matlab "$ZIPDIR"
cp -p build-win-matlab/dynare_version.m "$ZIPDIR"/matlab cp -p build-win-matlab/dynare_version.m "$ZIPDIR"/matlab
mkdir -p "$ZIPDIR"/matlab/modules/dseries/externals/x13/windows/64 mkdir -p "$ZIPDIR"/matlab/dseries/externals/x13/windows/64
cp -p windows/deps/lib64/x13as/x13as.exe "$ZIPDIR"/matlab/modules/dseries/externals/x13/windows/64 cp -p windows/deps/lib64/x13as/x13as.exe "$ZIPDIR"/matlab/dseries/externals/x13/windows/64
cp -pr examples "$ZIPDIR" cp -pr examples "$ZIPDIR"
mkdir -p "$ZIPDIR"/scripts mkdir -p "$ZIPDIR"/scripts
cp -p scripts/dynare.el "$ZIPDIR"/scripts cp -p scripts/dynare.el "$ZIPDIR"/scripts
......
...@@ -60,7 +60,7 @@ Section "Dynare core (preprocessor and M-files)" ...@@ -60,7 +60,7 @@ Section "Dynare core (preprocessor and M-files)"
SetOutPath $INSTDIR\matlab\preprocessor64 SetOutPath $INSTDIR\matlab\preprocessor64
File ..\matlab\preprocessor64\dynare_m.exe File ..\matlab\preprocessor64\dynare_m.exe
SetOutPath $INSTDIR\matlab\modules\dseries\externals\x13\windows\64 SetOutPath $INSTDIR\matlab\dseries\externals\x13\windows\64
File deps\lib64\x13as\x13as.exe File deps\lib64\x13as\x13as.exe
SetOutPath $INSTDIR\contrib SetOutPath $INSTDIR\contrib
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment