From 5a85af7048bc2fd95ad6201a53bba1f2dc0ce059 Mon Sep 17 00:00:00 2001 From: Bertrand Coconnier Date: Sat, 24 Jul 2021 17:19:26 +0200 Subject: [PATCH] Distribute Matlab files with the Windows installer --- .github/workflows/cpp-python-build.yml | 1 + JSBSim.iss.in | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/cpp-python-build.yml b/.github/workflows/cpp-python-build.yml index 9533c0d69..bc26903b9 100644 --- a/.github/workflows/cpp-python-build.yml +++ b/.github/workflows/cpp-python-build.yml @@ -312,6 +312,7 @@ jobs: cp ..\jsbsim-logo\wizard_installer\small\*.bmp small\. # Relocate the executables for the installer cp src\RelWithDebInfo\JSBSim.exe src\. + cp src\RelWithDebInfo\JSBSim.lib src\. cp utils\aeromatic++\RelWithDebInfo\aeromatic.exe utils\aeromatic++\. # Get the MSVC C++ DLL $Paths = $Env:PATH+';'+[System.Environment]::SystemDirectory diff --git a/JSBSim.iss.in b/JSBSim.iss.in index 3c45c9213..91e0633e5 100644 --- a/JSBSim.iss.in +++ b/JSBSim.iss.in @@ -14,6 +14,8 @@ WizardSmallImageFile=small\*.bmp [Components] Name: "executables"; Description: "JSBSim and aeromatic executables"; Types: full compact Name: "data"; Description: "JSBSim scripts and aircraft data"; Types: full +Name: "devfiles"; Description: "JSBSim development files (headers and C++ library)"; Types: full +Name: "devfiles\matlab"; Description: "JSBSim files to build an interface to Matlab"; Types: full [Files] Source: "${CMAKE_BINARY_DIR}\src\JSBSim.exe"; DestDir: "{app}"; Components: executables @@ -25,3 +27,8 @@ Source: "${CMAKE_SOURCE_DIR}\engine\*.xml"; DestDir: "{app}\engine"; Components: Source: "${CMAKE_SOURCE_DIR}\scripts\*.xml"; DestDir: "{app}\scripts"; Components: data Source: "${CMAKE_SOURCE_DIR}\systems\*.xml"; DestDir: "{app}\systems"; Components: data Source: "${CMAKE_SOURCE_DIR}\utils\aeromatic++\samples\*.param"; DestDir: "{app}\aeromatic++\samples"; Components: data +Source: "${CMAKE_BINARY_DIR}\src\JSBSim.lib"; DestDir: "{app}\lib"; Components: devfiles +Source: "${CMAKE_SOURCE_DIR}\src\*.h"; DestDir: "{app}\include"; Flags: recursesubdirs; Components: devfiles +Source: "${CMAKE_SOURCE_DIR}\matlab\*.cpp"; DestDir: "{app}\matlab"; Components: devfiles\matlab +Source: "${CMAKE_SOURCE_DIR}\matlab\*.h"; DestDir: "{app}\matlab"; Components: devfiles\matlab +Source: "${CMAKE_SOURCE_DIR}\matlab\*.m"; DestDir: "{app}\matlab"; Components: devfiles\matlab