license file tweaks

dinhngtu · Aug 15, 2022 · 46510db · 46510db
1 parent 83306f7
commit 46510db
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 2 deletions.
diff --git a/VietType.sln b/VietType.sln
@@ -21,7 +21,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.clang-format = .clang-format
 		build64.bat = build64.bat
 		LICENSE = LICENSE
-		LICENSE.rtf = LICENSE.rtf
 		UpdateVersion.ps1 = UpdateVersion.ps1
 		UpdateVersionCs.ps1 = UpdateVersionCs.ps1
 		UpdateVersionWix.ps1 = UpdateVersionWix.ps1

diff --git a/VietTypeConfig/NativeMethods.cs b/VietTypeConfig/NativeMethods.cs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
 using System;
 using System.Runtime.InteropServices;
 

diff --git a/VietTypeConfig/Program.cs b/VietTypeConfig/Program.cs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/VietTypeConfig/Properties/AssemblyInfo.cs b/VietTypeConfig/Properties/AssemblyInfo.cs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

diff --git a/VietTypeConfig/Settings.cs b/VietTypeConfig/Settings.cs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
 using Microsoft.Win32;
 using System;
 using System.ComponentModel;

diff --git a/VietTypeSetup/Product.wxs b/VietTypeSetup/Product.wxs
@@ -30,7 +30,7 @@ SPDX-License-Identifier: GPL-3.0-only
     </Feature>
 
     <UIRef Id="WixUI_Minimal" />
-    <WixVariable Id="WixUILicenseRtf" Value="$(var.SolutionDir)\LICENSE.rtf" />
+    <WixVariable Id="WixUILicenseRtf" Value="licembed.rtf" />
 
     <Condition Message="VietType is only compatible with Windows 8 and newer.">Installed OR (VersionNT >= 602)</Condition>
 

diff --git a/VietTypeSetup/VietTypeSetup.wixproj b/VietTypeSetup/VietTypeSetup.wixproj
@@ -50,6 +50,9 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="licembed.rtf" />
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">

diff --git a/LICENSE.rtf → VietTypeSetup/licembed.rtf b/LICENSE.rtf → VietTypeSetup/licembed.rtf