Commit cdbdf499 authored by Leander Schulten's avatar Leander Schulten

Update deployWindows.sh

 -Create settings.ini file with relative paths to the new files and libs
 -Fix --qmldir path
 -move deploy dir one dir up and change name to "deploy-<qt_version>-<debug|release>"
parent 9fde4116
#deploy dirs
deploy-*
# Qt-es
object_script.*.Release
......
......@@ -24,20 +24,20 @@ version_with_underscore=$( echo "$1" | cut -d'_' -f3,4,5 )
qt_version="${version_with_underscore//_/.}"
#copy Lichtsteuerung to new folder
target_folder="$1/deploy-$build_type"
target_folder="$1/../deploy-$qt_version-$build_type"
rm -f -r "$target_folder"
mkdir -p "$target_folder"
settings_file="$target_folder/settings.ini"
rm -f "$settings_file"
cp "$1/$build_type/Lichtsteuerung.exe" "$target_folder/Lichtsteuerung.exe"
#run windeployqt.exe
qt_base_dir="C:/Qt/"
exec_base_dir="$qt_base_dir/$qt_version/$mingw_folder"
echo "Running windeployqt"
result=$(eval "'$exec_base_dir/bin/windeployqt.exe' --qmldir '$exec_base_dir/qml' '$1/deploy-$build_type/Lichtsteuerung.exe'")
result=$(eval "'$exec_base_dir/bin/windeployqt.exe' --qmldir 'src' '$target_folder/Lichtsteuerung.exe'")
echo "Finish running windeployqt"
#copy qml shapes
cp -r "$exec_base_dir/qml/QtQuick/Shapes" "$target_folder/QtQuick/"
#copy boost libs
if [[ $bit == "32" ]]; then
......@@ -67,19 +67,23 @@ cp "src/lib/AudioFFT/dll/win${bit}/libfftw3-3.dll" "$target_folder"
cp "src/lib/AudioFFT/dll/win${bit}/libfftw3f-3.dll" "$target_folder"
cp "src/lib/AudioFFT/dll/win${bit}/libfftw3l-3.dll" "$target_folder"
#copy Windows Capture Audio Output
#copy Windows Capture Audio Output and add path to settings.ini
if [[ $biuld_type == "debug" ]]; then
cp "src/lib/WindowsSound/dll/Capture_Windows_SoundOutputd-x$bit.dll" "$target_folder"
echo "audioCaptureFilePath=Capture_Windows_SoundOutputd-x$bit.dll" >> "$settings_file"
else
cp "src/lib/WindowsSound/dll/Capture_Windows_SoundOutput-x$bit.dll" "$target_folder"
echo "audioCaptureFilePath=Capture_Windows_SoundOutput-x$bit.dll" >> "$settings_file"
fi
#copy QTJSONFile
cp "$1/QTJSONFile.json" "$target_folder"
#copy header files for modules
#copy header files for modules and update settings.ini
mkdir -p "$target_folder/modules"
cp -r "src/programms" "$target_folder/modules"
cp -r "src/programms" "$target_folder/modules/include"
echo "includePath=modules/include" >> "$settings_file"
echo "moduleDirPath=modules" >> "$settings_file"
#copy some files that are only needed by the minge53 32 Bit version, because windeployqt make a bad job
if [[ $mingw_folder == "mingw53_32" ]]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment