ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: Remove EULA from GUI and Windows installer

Browse Source
This commit is contained in:
mlangkabel
2019-11-16 14:57:31 +01:00
parent bb40bcfe45
commit cc17dbe2ea
34 changed files with 14 additions and 890 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deployment/windows/wixSetup/installDir.wxs
-3
View File
@@ -295,9 +295,6 @@
<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' />
deployment/windows/wixSetup/sourcetrail.wxs
+4 -4
View File
@@ -240,7 +240,6 @@
<ComponentRef Id='QWBmpDll'/>
<ComponentRef Id='QWebpDll'/>
<ComponentRef Id='EulaTxt'/>
<ComponentRef Id='LicenseBoostTxt'/>
<ComponentRef Id='LicenseClangTxt'/>
<ComponentRef Id='LicenseCppSqliteTxt'/>
@@ -293,7 +292,10 @@
<UIRef Id="WixUI_InstallDir" />
<DialogRef Id="ShortcutDlg" />
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="3">1</Publish>
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3">1</Publish>
<Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="ShortcutDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ShortcutDlg">1</Publish>
</UI>
@@ -305,8 +307,6 @@
<Icon Id="Sourcetrail.ico" SourceFile="./../../../bin/app/data/gui/icon/sourcetrail.ico" />
<Icon Id="Project.ico" SourceFile="./../../../bin/app/data/gui/icon/project.ico" />
<WixVariable Id="WixUILicenseRtf" Value="./../../../bin/app/data/license/EULA.rtf" />
<WixVariable Id="WixUIBannerBmp" Value="Images/banner.bmp" />
<WixVariable Id="WixUIDialogBmp" Value="Images/w_installer.bmp" />
</Product>