From c3e7ef42af571ab370060a9f339b6f4e477c0e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Fri, 8 Jan 2021 09:47:42 +0100
Subject: [PATCH] Windows package: various fixes related to commit
 8e7d0d2c5da6278705e5ca363007ed2d2aa93d68

- strip the new preprocessor binary
- include the new preprocessor binary in the .zip and .7z archives
- include the old (backward-compatible) preprocessor binary in the .exe installer
---
 windows/build.sh   | 3 +++
 windows/dynare.nsi | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/windows/build.sh b/windows/build.sh
index f27f0eec79..4d4c7c8f12 100755
--- a/windows/build.sh
+++ b/windows/build.sh
@@ -76,6 +76,7 @@ if [[ -z $CI ]]; then
     make -j"$NTHREADS" pdf html
 fi
 make -j"$NTHREADS"
+x86_64-w64-mingw32-strip preprocessor/src/dynare-preprocessor.exe
 x86_64-w64-mingw32-strip matlab/preprocessor64/dynare_m.exe
 x86_64-w64-mingw32-strip dynare++/src/dynare++.exe
 
@@ -195,6 +196,8 @@ cp -pr contrib/jsonlab/* "$ZIPDIR"/contrib/jsonlab
 mkdir "$ZIPDIR"/mex
 cp -pr mex/octave/ "$ZIPDIR"/mex
 cp -pr mex/matlab/ "$ZIPDIR"/mex
+mkdir "$ZIPDIR"/preprocessor
+cp -p preprocessor/src/dynare-preprocessor.exe "$ZIPDIR"/preprocessor
 cp -pr matlab "$ZIPDIR"
 mkdir -p "$ZIPDIR"/matlab/modules/dseries/externals/x13/windows/64
 cp -p windows/deps/lib64/x13as/x13as.exe "$ZIPDIR"/matlab/modules/dseries/externals/x13/windows/64
diff --git a/windows/dynare.nsi b/windows/dynare.nsi
index 65ad3cad0e..46198acee6 100644
--- a/windows/dynare.nsi
+++ b/windows/dynare.nsi
@@ -57,6 +57,9 @@ Section "Dynare core (preprocessor and M-files)"
  SetOutPath $INSTDIR\preprocessor
  File ..\preprocessor\src\dynare-preprocessor.exe
 
+ SetOutPath $INSTDIR\matlab\preprocessor64
+ File ..\matlab\preprocessor64\dynare_m.exe
+
  SetOutPath $INSTDIR\matlab\modules\dseries\externals\x13\windows\64
  File deps\lib64\x13as\x13as.exe
 
-- 
GitLab