Skip to content

Commit 15f7bec

Browse files
authored
Merge branch 'main' into TM/net-targets
2 parents 482258e + ffad7e6 commit 15f7bec

1 file changed

Lines changed: 34 additions & 34 deletions

File tree

native/wix/main.wxs

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -59,27 +59,26 @@
5959

6060
<Directory Id='TARGETDIR' Name='SourceDir'>
6161
<Directory Id='$(var.PlatformProgramFilesFolder)' Name='PFiles'>
62-
<Directory Id='APPLICATIONFOLDER' Name='okapi'>
63-
64-
<!--
65-
Enabling the license sidecar file in the installer is a four step process:
66-
67-
1. Uncomment the `Component` tag and its contents.
68-
2. Change the value for the `Source` attribute in the `File` tag to a path
69-
to the file that should be included as the license sidecar file. The path
70-
can, and probably should be, relative to this file.
71-
3. Change the value for the `Name` attribute in the `File` tag to the
72-
desired name for the file when it is installed alongside the `bin` folder
73-
in the installation directory. This can be omitted if the desired name is
74-
the same as the file name.
75-
4. Uncomment the `ComponentRef` tag with the Id attribute value of "License"
76-
further down in this file.
77-
-->
78-
<Component Id='License' Guid='*' Win64='$(var.Win64)'>
79-
<File Id='LicenseFile' DiskId='1' Source='../LICENSE' KeyPath='yes'/>
80-
</Component>
81-
82-
<Directory Id='Bin' Name='bin'>
62+
<Directory Id='APPLICATIONFOLDER' Name='trinsic'>
63+
<Directory Id='okapi' Name='okapi'>
64+
65+
<!--
66+
Enabling the license sidecar file in the installer is a four step process:
67+
68+
1. Uncomment the `Component` tag and its contents.
69+
2. Change the value for the `Source` attribute in the `File` tag to a path
70+
to the file that should be included as the license sidecar file. The path
71+
can, and probably should be, relative to this file.
72+
3. Change the value for the `Name` attribute in the `File` tag to the
73+
desired name for the file when it is installed alongside the `bin` folder
74+
in the installation directory. This can be omitted if the desired name is
75+
the same as the file name.
76+
4. Uncomment the `ComponentRef` tag with the Id attribute value of "License"
77+
further down in this file.
78+
-->
79+
<Component Id='License' Guid='*' Win64='$(var.Win64)'>
80+
<File Id='LicenseFile' DiskId='1' Source='../LICENSE' KeyPath='yes'/>
81+
</Component>
8382
<Component Id='Path' Guid='C7D1AD58-416C-4214-A324-4905D10AE576' Win64='$(var.Win64)'
8483
KeyPath='yes'>
8584
<Environment
@@ -91,19 +90,20 @@
9190
Action='set'
9291
System='yes'/>
9392
</Component>
94-
<Component Id='binary0' Guid='507A3B80-B0F3-43BE-BD10-D5649E7DA3DE' Win64='$(var.Win64)' KeyPath='yes'>
95-
<!-- <File-->
96-
<!-- Id='d0'-->
97-
<!-- Name='libokapi.d'-->
98-
<!-- DiskId='1'-->
99-
<!-- Source='target\$(var.Profile)\libokapi.d'-->
100-
<!-- />-->
101-
<!-- <File-->
102-
<!-- Id='rlib0'-->
103-
<!-- Name='libokapi.rlib'-->
104-
<!-- DiskId='1'-->
105-
<!-- Source='target\$(var.Profile)\libokapi.rlib'-->
106-
<!-- />-->
93+
<Component Id='binary0' Guid='507A3B80-B0F3-43BE-BD10-D5649E7DA3DE' Win64='$(var.Win64)'
94+
KeyPath='yes'>
95+
<!-- <File-->
96+
<!-- Id='d0'-->
97+
<!-- Name='libokapi.d'-->
98+
<!-- DiskId='1'-->
99+
<!-- Source='target\$(var.Profile)\libokapi.d'-->
100+
<!-- />-->
101+
<!-- <File-->
102+
<!-- Id='rlib0'-->
103+
<!-- Name='libokapi.rlib'-->
104+
<!-- DiskId='1'-->
105+
<!-- Source='target\$(var.Profile)\libokapi.rlib'-->
106+
<!-- />-->
107107
<File
108108
Id='d1'
109109
Name='okapi.d'

0 commit comments

Comments
 (0)