From 67e342119a565b970dfa7d45941ad3aee5bb6282 Mon Sep 17 00:00:00 2001
From: mlangkabel <malte.langkabel@gmail.com>
Date: Tue, 7 May 2019 18:51:36 +0200
Subject: [PATCH] package: Fixed licenses in wrong directory in Windows package

---
 deployment/windows/wixSetup/installDir.wxs  | 69 ++++++++++-----------
 deployment/windows/wixSetup/sourcetrail.wxs |  2 +-
 script/deploy_windows.sh                    |  6 +-
 3 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/deployment/windows/wixSetup/installDir.wxs b/deployment/windows/wixSetup/installDir.wxs
index ca786f47..a92d2d9f 100644
--- a/deployment/windows/wixSetup/installDir.wxs
+++ b/deployment/windows/wixSetup/installDir.wxs
@@ -287,42 +287,41 @@
 				</Component>
 			</Directory>
 
-			<Directory Id='License' Name='license'>
-				<Component Id='EulaRtf' Guid='*' Win64="$(var.Win64)">
-					<File Id='EulaRtfId' Name='EULA.rtf' DiskId='1' Source='./../../../bin/app/data/license/EULA.rtf' KeyPath='yes' />
-				</Component>
-				<Directory Id='ThirdPartyLicenses' Name='3rd_party_licenses'>
-					<Component Id='LicenseBoostTxt' Guid='*' Win64="$(var.Win64)">
-						<File Id='LicenseBoost' Name='license_boost.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_boost.txt' KeyPath='yes' />
-					</Component>
-					<Component Id='LicenseBotanTxt' Guid='*' Win64="$(var.Win64)">
-						<File Id='LicenseBotan' Name='license_botan.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_botan.txt' KeyPath='yes' />
-					</Component>
-					<Component Id='LicenseClangTxt' Guid='*' Win64="$(var.Win64)">
-						<File Id='LicenseClang' Name='license_clang.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_clang.txt' KeyPath='yes' />
-					</Component>
-					<Component Id='LicenseCppSqliteTxt' Guid='*' Win64="$(var.Win64)">
-						<File Id='LicenseCppSqlite' Name='license_cpp_sqlite.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_cpp_sqlite.txt' KeyPath='yes' />
-					</Component>
-					<Component Id='LicenseEclipseTxt' Guid='*' Win64="$(var.Win64)">
-						<File Id='LicenseEclipse' Name='license_eclipse.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_eclipse.txt' KeyPath='yes' />
-					</Component>
-					<Component Id='LicenseGradleTxt' Guid='*' Win64="$(var.Win64)">
-						<File Id='LicenseGradle' Name='license_gradle.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_gradle.txt' KeyPath='yes' />
-					</Component>
-					<Component Id='LicenseOpensslTxt' Guid='*' Win64="$(var.Win64)">
-						<File Id='LicenseOpenssl' Name='license_openssl.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_openssl.txt' KeyPath='yes' />
-					</Component>
-					<Component Id='LicenseQtTxt' Guid='*' Win64="$(var.Win64)">
-						<File Id='LicenseQt' Name='license_qt.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_qt.txt' KeyPath='yes' />
-					</Component>
-					<Component Id='LicenseTinyxmlTxt' Guid='*' Win64="$(var.Win64)">
-						<File Id='LicenseTinyxml' Name='license_tinyxml.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_tinyxml.txt' KeyPath='yes' />
-					</Component>
-				</Directory>
-			</Directory>
-
 			<Directory Id='LieutenantCommanderData' Name='data'>
+				<Directory Id='License' Name='license'>
+					<Component Id='EulaTxt' Guid='*' Win64="$(var.Win64)">
+						<File Id='EulaTxtId' Name='EULA.txt' DiskId='1' Source='./../../../bin/app/data/license/EULA.txt' KeyPath='yes' />
+					</Component>
+					<Directory Id='ThirdPartyLicenses' Name='3rd_party_licenses'>
+						<Component Id='LicenseBoostTxt' Guid='*' Win64="$(var.Win64)">
+							<File Id='LicenseBoost' Name='license_boost.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_boost.txt' KeyPath='yes' />
+						</Component>
+						<Component Id='LicenseBotanTxt' Guid='*' Win64="$(var.Win64)">
+							<File Id='LicenseBotan' Name='license_botan.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_botan.txt' KeyPath='yes' />
+						</Component>
+						<Component Id='LicenseClangTxt' Guid='*' Win64="$(var.Win64)">
+							<File Id='LicenseClang' Name='license_clang.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_clang.txt' KeyPath='yes' />
+						</Component>
+						<Component Id='LicenseCppSqliteTxt' Guid='*' Win64="$(var.Win64)">
+							<File Id='LicenseCppSqlite' Name='license_cpp_sqlite.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_cpp_sqlite.txt' KeyPath='yes' />
+						</Component>
+						<Component Id='LicenseEclipseTxt' Guid='*' Win64="$(var.Win64)">
+							<File Id='LicenseEclipse' Name='license_eclipse.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_eclipse.txt' KeyPath='yes' />
+						</Component>
+						<Component Id='LicenseGradleTxt' Guid='*' Win64="$(var.Win64)">
+							<File Id='LicenseGradle' Name='license_gradle.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_gradle.txt' KeyPath='yes' />
+						</Component>
+						<Component Id='LicenseOpensslTxt' Guid='*' Win64="$(var.Win64)">
+							<File Id='LicenseOpenssl' Name='license_openssl.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_openssl.txt' KeyPath='yes' />
+						</Component>
+						<Component Id='LicenseQtTxt' Guid='*' Win64="$(var.Win64)">
+							<File Id='LicenseQt' Name='license_qt.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_qt.txt' KeyPath='yes' />
+						</Component>
+						<Component Id='LicenseTinyxmlTxt' Guid='*' Win64="$(var.Win64)">
+							<File Id='LicenseTinyxml' Name='license_tinyxml.txt' DiskId='1' Source='./../../../bin/app/data/license/3rd_party_licenses/license_tinyxml.txt' KeyPath='yes' />
+						</Component>
+					</Directory>
+				</Directory>
 			</Directory>
 
 <?if $(sys.BUILDARCH) = x64 ?>
diff --git a/deployment/windows/wixSetup/sourcetrail.wxs b/deployment/windows/wixSetup/sourcetrail.wxs
index 89b5a9c6..fb086590 100644
--- a/deployment/windows/wixSetup/sourcetrail.wxs
+++ b/deployment/windows/wixSetup/sourcetrail.wxs
@@ -239,7 +239,7 @@
 				<ComponentRef Id='QWBmpDll'/>
 				<ComponentRef Id='QWebpDll'/>
 				
-				<ComponentRef Id='EulaRtf'/>
+				<ComponentRef Id='EulaTxt'/>
 				<ComponentRef Id='LicenseBoostTxt'/>
 				<ComponentRef Id='LicenseBotanTxt'/>
 				<ComponentRef Id='LicenseClangTxt'/>
diff --git a/script/deploy_windows.sh b/script/deploy_windows.sh
index 4de33971..36361bf2 100644
--- a/script/deploy_windows.sh
+++ b/script/deploy_windows.sh
@@ -192,9 +192,9 @@ if [ $CREATE_PORTABLE_ZIP = true ]; then
 
 
 		# COPYING APPLICATION DATA
-		mkdir -p $PORTABLE_PACKAGE_APP_DIR/license/3rd_party_licenses/
-		cp -u -r bin/app/data/license/3rd_party_licenses/* $PORTABLE_PACKAGE_APP_DIR/license/3rd_party_licenses/
-		cp -u -r bin/app/data/license/EULA.rtf $PORTABLE_PACKAGE_APP_DIR/license/
+		mkdir -p $PORTABLE_PACKAGE_APP_DIR/data/license/3rd_party_licenses/
+		cp -u -r bin/app/data/license/3rd_party_licenses/* $PORTABLE_PACKAGE_APP_DIR/data/license/3rd_party_licenses/
+		cp -u -r bin/app/data/license/EULA.txt $PORTABLE_PACKAGE_APP_DIR/data/license/
 		mkdir -p $PORTABLE_PACKAGE_APP_DIR/data/color_schemes/
 		cp -u -r bin/app/data/color_schemes/* $PORTABLE_PACKAGE_APP_DIR/data/color_schemes/
 		mkdir -p $PORTABLE_PACKAGE_APP_DIR/data/cxx/