diff --git a/devscripts/build-win32.xml b/devscripts/build-win32.xml index 0b7b0a78..c30d9e93 100644 --- a/devscripts/build-win32.xml +++ b/devscripts/build-win32.xml @@ -52,171 +52,22 @@ ../src/COPYING - - ../src/release/D3Dcompiler_47.dll - ../src/gpl-3.0-standalone.html - - ../src/release/klog.exe - ../images/klog.ico - - ../src/release/libcrypto-3.dll - - - ../src/release/libeay32.dll - - - ../src/release/libEGL.dll - - - ../src/release/libgcc_s_dw2-1.dll - - - ../src/release/libgcc_s_sjlj-1.dll - - - ../src/release/libGLESv2.dll - - - ../src/release/libhamlib-4.dll - - - ../src/release/libssl-3.dll - - - ../src/release/libstdc++-6.dll - - - ../src/release/libusb-1.0.dll - - - ../src/release/libwinpthread-1.dll - ../src/NEWS - - ../src/release/opengl32sw.dll - - - ../src/release/Qt5Charts.dll - - - ../src/release/Qt5Core.dll - - - ../src/release/Qt5Gui.dll - - - ../src/release/Qt5Location.dll - - - ../src/release/Qt5Network.dll - - - ../src/release/Qt5Positioning.dll - - - ../src/release/Qt5PositioningQuick.dll - - - ../src/release/Qt5PrintSupport.dll - - - ../src/release/Qt5Qml.dll - - - ../src/release/Qt5QmlModels.dll - - - ../src/release/Qt5QmlWorkerScript.dll - - - ../src/release/Qt5Quick.dll - - - ../src/release/Qt5RemoteObjects.dll - - - ../src/release/Qt5SerialPort.dll - - - ../src/release/Qt5Sql.dll - - - ../src/release/Qt5Svg.dll - - - ../src/release/Qt5Widgets.dll - ../src/README - - ../src/release/ssleay32.dll - - - ../src/release/bearer - - - ../src/release/geoservices - - - ../src/release/iconengines - - - ../src/release/imageformats - - - ../src/release/platforms - - - ../src/release/position - - - ../src/release/printsupport - - - ../src/release/qmltooling - - - ../src/release/QtLocation - - - ../src/release/QtPositioning - - - ../src/release/QtQml - - - ../src/release/QtQuick - - - ../src/release/QtQuick.2 - - - ../src/release/sqldrivers - - - ../src/release/styles - - - ../src/release/translations - - - ../src/release/QtGraphicalEffects - - - ../src/release/Qt5QuickControls2.dll - - - ../src/release/Qt5QuickTemplates2.dll - + + 1 + ../src/release/* + diff --git a/devscripts/win32-create-package.bat b/devscripts/win32-create-package.bat index 096b8566..eede8f46 100644 --- a/devscripts/win32-create-package.bat +++ b/devscripts/win32-create-package.bat @@ -3,7 +3,7 @@ rem Script to deploy the windows package file rem Must be executed in the build directory of KLog rem *************************************************************************** rem -rem klogwincreatepacksage2.bat +rem win32-create-package.bat rem ------------------- rem begin : jan 2021 rem copyright : (C) 2021 by Jaime Robles @@ -30,6 +30,7 @@ echo Setting up environment for Qt usage... set KLOGDEVELVERSION=1 set PATH=%PATH%;C:\Qt\5.15.2\mingw81_32\bin;C:\Qt\Tools\mingw810_32\bin; set PATH=%PATH%;C:\Program Files\InstallBuilder Enterprise 23.10.1\bin; +set PATH=%PATH%;C:\Program Files (x86)\BitRock InstallBuilder Enterprise 15.10.1\bin; echo Line 10 cd ../src/ rmdir /S /Q build @@ -59,9 +60,9 @@ echo Line 43 xcopy /Y /S /F build\target\* release echo localdir=%cd% echo %localdir% -rem COPY OpenSSL-1 DLL -copy ..\..\libs\win32\openssl\*.dll release -copy ..\..\libs\win32\hamlib\*.dll release +rem COPY OpenSSL DLL +copy ..\..\..\libs\win32\openssl\bin\*.dll release +copy ..\..\..\libs\win32\hamlib\bin\*.dll release windeployqt --qmldir release release\klog.exe :: The SSL DLLs must be included and must match the version that were used to build Qt. :: Check in main.cpp and uncomment the SSL line to see what is the version that was used. diff --git a/devscripts/win64-create-package.bat b/devscripts/win64-create-package.bat index cf4b13d8..a1fe4a23 100644 --- a/devscripts/win64-create-package.bat +++ b/devscripts/win64-create-package.bat @@ -29,7 +29,7 @@ rem **************************************************************************** echo Setting up environment for Qt usage... set KLOGDEVELVERSION=1 set PATH=%PATH%;C:\Qt\5.15.2\mingw81_64\bin;C:\Qt\Tools\mingw810_64\bin; -set PATH=%PATH%;C:\Program Files\InstallBuilder Enterprise 23.10.1\bin; +set PATH=%PATH%;C:\Program Files\InstallBuilder Enterprise 23.11.1\bin; del ..\devscripts\klog-*win64*.exe echo Line 10 cd ../src/