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

data: removed directory data/gui/installer and moved EULA files to data/license

Browse Source 
* moved EULA files to data/license
* moved 3rd party license to data/license
* updated paths in installer scripts
This commit is contained in:
Eberhard Graether
2019-04-08 18:25:13 +02:00
parent f7d3275e89
commit edf319cde9
23 changed files with 476 additions and 701 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deployment/windows/wixSetup/installDir.wxs
+10 -10
View File
@@ -289,35 +289,35 @@
<Directory Id='License' Name='license'>
<Component Id='EulaRtf' Guid='*' Win64="$(var.Win64)">
<File Id='EulaRtfId' Name='EULA.rtf' DiskId='1' Source='./../../../bin/app/data/gui/installer/EULA.rtf' KeyPath='yes' />
<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/3rd_party_licenses/license_boost.txt' KeyPath='yes' />
<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/3rd_party_licenses/license_botan.txt' KeyPath='yes' />
<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/3rd_party_licenses/license_clang.txt' KeyPath='yes' />
<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/3rd_party_licenses/license_cpp_sqlite.txt' KeyPath='yes' />
<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/3rd_party_licenses/license_eclipse.txt' KeyPath='yes' />
<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/3rd_party_licenses/license_gradle.txt' KeyPath='yes' />
<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/3rd_party_licenses/license_openssl.txt' KeyPath='yes' />
<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/3rd_party_licenses/license_qt.txt' KeyPath='yes' />
<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/3rd_party_licenses/license_tinyxml.txt' KeyPath='yes' />
<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>
deployment/windows/wixSetup/sourcetrail.wxs
+1 -1
View File
@@ -304,7 +304,7 @@
<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/gui/installer/EULA.rtf" />
<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" />