diff options
| author | João Valverde <j@v6e.pt> | 2023-01-19 18:21:46 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2023-01-19 19:14:32 +0000 |
| commit | 2ab291b3b2e769987c6dd930a801ec65d323ff29 (patch) | |
| tree | e23de35da7676b85aeac6eeec359f224a2645899 /packaging | |
| parent | 0a840b5dd83151134e06df9584aa1ac9fa712b42 (diff) | |
GUI: Ship license + acknowledgements as Qt resource
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/logray.nsi | 2 | ||||
| -rw-r--r-- | packaging/nsis/uninstall-logray.nsi | 2 | ||||
| -rw-r--r-- | packaging/nsis/uninstall-wireshark.nsi | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 2 | ||||
| -rw-r--r-- | packaging/wix/ComponentGroups.wxi | 3 |
5 files changed, 0 insertions, 11 deletions
diff --git a/packaging/nsis/logray.nsi b/packaging/nsis/logray.nsi index 7c1528dfcc..e923fa0269 100644 --- a/packaging/nsis/logray.nsi +++ b/packaging/nsis/logray.nsi @@ -467,8 +467,6 @@ File "${STAGING_DIR}\dumpcap.exe" File "${STAGING_DIR}\dumpcap.html" File "${STAGING_DIR}\extcap.html" File "${STAGING_DIR}\ipmap.html" -File "${STAGING_DIR}\gpl-2.0-standalone.html" -File "${STAGING_DIR}\Acknowledgements.md" ; C-runtime redistributable ; vc_redist.x64.exe or vc_redist.x86.exe - copy and execute the redistributable installer diff --git a/packaging/nsis/uninstall-logray.nsi b/packaging/nsis/uninstall-logray.nsi index a17c546400..6f392bd211 100644 --- a/packaging/nsis/uninstall-logray.nsi +++ b/packaging/nsis/uninstall-logray.nsi @@ -148,8 +148,6 @@ Delete "$INSTDIR\COPYING*" Delete "$INSTDIR\audio\*.*" Delete "$INSTDIR\bearer\*.*" Delete "$INSTDIR\diameter\*.*" -Delete "$INSTDIR\gpl-2.0-standalone.html" -Delete "$INSTDIR\Acknowledgements.md" Delete "$INSTDIR\help\*.*" Delete "$INSTDIR\iconengines\*.*" Delete "$INSTDIR\imageformats\*.*" diff --git a/packaging/nsis/uninstall-wireshark.nsi b/packaging/nsis/uninstall-wireshark.nsi index 3a2ae19b5e..1f0a5252ae 100644 --- a/packaging/nsis/uninstall-wireshark.nsi +++ b/packaging/nsis/uninstall-wireshark.nsi @@ -185,8 +185,6 @@ Delete "$INSTDIR\extcap\randpktdump.*" Delete "$INSTDIR\extcap\sshdump.*" Delete "$INSTDIR\extcap\udpdump.*" Delete "$INSTDIR\extcap\wifidump.*" -Delete "$INSTDIR\gpl-2.0-standalone.html" -Delete "$INSTDIR\Acknowledgements.md" Delete "$INSTDIR\help\*.*" Delete "$INSTDIR\iconengines\*.*" Delete "$INSTDIR\imageformats\*.*" diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 53fbf96e05..7c06c51168 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -521,8 +521,6 @@ File "${STAGING_DIR}\dumpcap.exe" File "${STAGING_DIR}\dumpcap.html" File "${STAGING_DIR}\extcap.html" File "${STAGING_DIR}\ipmap.html" -File "${STAGING_DIR}\gpl-2.0-standalone.html" -File "${STAGING_DIR}\Acknowledgements.md" ; C-runtime redistributable ; vc_redist.x64.exe or vc_redist.x86.exe - copy and execute the redistributable installer diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index 9109cce2c4..fd25ab0d23 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -42,9 +42,6 @@ <Component Id="cmpAUTHORS_SHORT" Guid="*"> <File Id="filAUTHORS_SHORT" KeyPath="yes" Source="$(var.Staging.Dir)\AUTHORS-SHORT" /> </Component> - <Component Id="cmpGpl2_Standalone_html" Guid="*"> - <File Id="filGpl2_Standalone_html" KeyPath="yes" Source="$(var.Staging.Dir)\gpl-2.0-standalone.html" /> - </Component> <Component Id="cmpManuf" Guid="*"> <File Id="filManuf" KeyPath="yes" Source="$(var.Staging.Dir)\manuf" /> </Component> |