Browse Source

deploy: windows: Moving files into common distribution directory (#9179)

The general goal is to tidy up the project folder and give better focus on other contents of the project.
As a first iteration, I would like to tidy up files, which are Windows related. Technically seen I'm pretty sure that we won't notice any differences, since some libraries and images have been moved and some config files cleaned up.

Signed-off-by: Thomas Karl Pietrowski <thopiekar@gmail.com>
QGC4.4
Thomas Karl Pietrowski 4 years ago committed by GitHub
parent
commit
d6069cab5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      QGCPostLinkCommon.pri
  2. 4
      QGCPostLinkInstaller.pri
  3. 0
      deploy/windows/QGroundControl.rc
  4. 0
      deploy/windows/WindowsQGC.ico
  5. 0
      deploy/windows/driver.msi
  6. 0
      deploy/windows/installheader.bmp
  7. 0
      deploy/windows/nullsoft_installer.nsi
  8. 0
      deploy/windows/resource.h
  9. 0
      libs/Microsoft/windows/msvcp140.dll
  10. 0
      libs/Microsoft/windows/vcruntime140.dll
  11. 0
      libs/OpenSSL/windows/libcrypto-1_1-x64.dll
  12. 0
      libs/OpenSSL/windows/libssl-1_1-x64.dll
  13. 6
      qgroundcontrol.pro

8
QGCPostLinkCommon.pri

@ -53,8 +53,8 @@ WindowsBuild { @@ -53,8 +53,8 @@ WindowsBuild {
ReleaseBuild: DLL_QT_DEBUGCHAR = ""
COPY_FILE_LIST = \
$$SOURCE_DIR\\libs\\sdl2\\msvc\\lib\\x64\\SDL2.dll \
$$SOURCE_DIR\\deploy\\libcrypto-1_1-x64.dll \
$$SOURCE_DIR\\deploy\\libssl-1_1-x64.dll
$$SOURCE_DIR\\libs\\OpenSSL\\windows\\libcrypto-1_1-x64.dll \
$$SOURCE_DIR\\libs\\OpenSSL\\windows\\libssl-1_1-x64.dll
for(COPY_FILE, COPY_FILE_LIST) {
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$COPY_FILE\" \"$$DESTDIR\"
@ -63,8 +63,8 @@ WindowsBuild { @@ -63,8 +63,8 @@ WindowsBuild {
ReleaseBuild {
# Copy Visual Studio DLLs
# Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed.
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$SOURCE_DIR\\deploy\\msvcp140.dll\" \"$$DESTDIR\"
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$SOURCE_DIR\\deploy\\vcruntime140.dll\" \"$$DESTDIR\"
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$SOURCE_DIR\\libs\\Microsoft\\windows\\msvcp140.dll\" \"$$DESTDIR\"
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$SOURCE_DIR\\libs\\Microsoft\\windows\\vcruntime140.dll\" \"$$DESTDIR\"
}
DEPLOY_TARGET = $$shell_quote($$shell_path($$DESTDIR\\$${TARGET}.exe))

4
QGCPostLinkInstaller.pri

@ -47,8 +47,8 @@ installer { @@ -47,8 +47,8 @@ installer {
QMAKE_POST_LINK += && rm /tmp/tmp.dmg
}
WindowsBuild {
QMAKE_POST_LINK += $$escape_expand(\\n) $$quote("\"C:\\Program Files \(x86\)\\NSIS\\makensis.exe\"" $$(QGC_NSIS_INSTALLER_PARAMETERS) /DDRIVER_MSI="$$SOURCE_DIR\\deploy\\driver.msi" /DINSTALLER_ICON="\"$${QGC_INSTALLER_ICON}\"" /DHEADER_BITMAP="\"$${QGC_INSTALLER_HEADER_BITMAP}\"" /DAPPNAME="\"$${QGC_APP_NAME}\"" /DEXENAME="\"$${TARGET}\"" /DORGNAME="\"$${QGC_ORG_NAME}\"" /DDESTDIR=$${DESTDIR} /NOCD "\"/XOutFile $${DESTDIR}\\$${TARGET}-installer.exe\"" "$$SOURCE_DIR\\deploy\\qgroundcontrol_installer.nsi")
OTHER_FILES += deploy/qgroundcontrol_installer.nsi
QMAKE_POST_LINK += $$escape_expand(\\n) $$quote("\"C:\\Program Files \(x86\)\\NSIS\\makensis.exe\"" $$(QGC_NSIS_INSTALLER_PARAMETERS) /DDRIVER_MSI="\"$${QGC_INSTALLER_DRIVER_MSI}\"" /DINSTALLER_ICON="\"$${QGC_INSTALLER_ICON}\"" /DHEADER_BITMAP="\"$${QGC_INSTALLER_HEADER_BITMAP}\"" /DAPPNAME="\"$${QGC_APP_NAME}\"" /DEXENAME="\"$${TARGET}\"" /DORGNAME="\"$${QGC_ORG_NAME}\"" /DDESTDIR=$${DESTDIR} /NOCD "\"/XOutFile $${DESTDIR}\\$${TARGET}-installer.exe\"" "\"$${QGC_INSTALLER_SCRIPT}\"")
OTHER_FILES += $${QGC_INSTALLER_SCRIPT}
}
LinuxBuild {
#-- TODO: This uses hardcoded paths. It should use $${DESTDIR}

0
windows/QGroundControl.rc → deploy/windows/QGroundControl.rc

0
windows/WindowsQGC.ico → deploy/windows/WindowsQGC.ico

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

0
deploy/driver.msi → deploy/windows/driver.msi

0
windows/installheader.bmp → deploy/windows/installheader.bmp

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

0
deploy/qgroundcontrol_installer.nsi → deploy/windows/nullsoft_installer.nsi

0
windows/resource.h → deploy/windows/resource.h

0
deploy/msvcp140.dll → libs/Microsoft/windows/msvcp140.dll

0
deploy/vcruntime140.dll → libs/Microsoft/windows/vcruntime140.dll

0
deploy/libcrypto-1_1-x64.dll → libs/OpenSSL/windows/libcrypto-1_1-x64.dll

0
deploy/libssl-1_1-x64.dll → libs/OpenSSL/windows/libssl-1_1-x64.dll

6
qgroundcontrol.pro

@ -62,8 +62,10 @@ QGC_APP_DESCRIPTION = "Open source ground control app provided by QGroundControl @@ -62,8 +62,10 @@ QGC_APP_DESCRIPTION = "Open source ground control app provided by QGroundControl
QGC_APP_COPYRIGHT = "Copyright (C) 2019 QGroundControl Development Team. All rights reserved."
WindowsBuild {
QGC_INSTALLER_ICON = "$$SOURCE_DIR\\windows\\WindowsQGC.ico"
QGC_INSTALLER_HEADER_BITMAP = "$$SOURCE_DIR\\windows\\installheader.bmp"
QGC_INSTALLER_SCRIPT = "$$SOURCE_DIR\\deploy\\windows\\nullsoft_installer.nsi"
QGC_INSTALLER_ICON = "$$SOURCE_DIR\\deploy\\windows\\WindowsQGC.ico"
QGC_INSTALLER_HEADER_BITMAP = "$$SOURCE_DIR\\deploy\\windows\\installheader.bmp"
QGC_INSTALLER_DRIVER_MSI = "$$SOURCE_DIR\\deploy\\windows\\driver.msi"
}
# Load additional config flags from user_config.pri

Loading…
Cancel
Save