Skip to content

Commit d478bc6

Browse files
committed
Fix installer copy path
1 parent 64ebf9c commit d478bc6

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

build/SayMore.proj

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
changing of the script, but I haven't figured that out. -->
132132

133133
<FileUpdate File="$(RootDir)\src\Installer\Installer.wxs" Regex='Property_ProductVersion = ".*"'
134-
ReplacementText ="Property_ProductVersion = &quot;$(Version)&quot;" />
134+
ReplacementText ="Property_ProductVersion = &quot;$(Version)&quot;" />
135135

136136
<Message Text="Making Installer Version: $(Version)" Importance="high" />
137137

@@ -140,19 +140,23 @@
140140
<!-- Ensure destination folder exists -->
141141
<MakeDir Directories="$(RootDir)\output\installer" />
142142

143+
<PropertyGroup>
144+
<InstallerSourceMsi>$(RootDir)\output\installer\SayMoreInstaller.msi</InstallerSourceMsi>
145+
</PropertyGroup>
146+
143147
<!-- Helpful debug -->
144-
<Message Text="Looking for MSI at: $(RootDir)\src\Installer\bin\$(Configuration)\SayMoreInstaller.msi" Importance="high" />
148+
<Message Text="Looking for MSI at: $(InstallerSourceMsi)" Importance="high" />
145149

146150
<!-- Guard with an explicit error if it's missing -->
147151
<Error
148-
Text="Expected MSI not found at %(Identity)."
149-
Condition="!Exists('$(RootDir)\src\Installer\bin\$(Configuration)\SayMoreInstaller.msi')" />
152+
Text="Expected MSI not found at $(InstallerSourceMsi)."
153+
Condition="!Exists('$(InstallerSourceMsi)')" />
150154

151155
<!-- Copy + rename with version -->
152156
<Copy
153-
SourceFiles="$(RootDir)\src\Installer\bin\$(Configuration)\SayMoreInstaller.msi"
157+
SourceFiles="$(InstallerSourceMsi)"
154158
DestinationFiles="$(RootDir)\output\installer\SayMoreInstaller.$(Version).msi" />
155-
159+
156160
<!-- appcast.xml is used as part of the update notification system -->
157161
<Copy SourceFiles ="$(RootDir)\src\Installer\appcast.xml"
158162
DestinationFolder ="$(RootDir)\output\installer"/>
@@ -173,20 +177,20 @@
173177
<XliffFiles Include="$(RootDir)/packages/SIL.libpalaso.l10ns/content/**/*.xlf"/>
174178
</ItemGroup>
175179
<Copy SourceFiles="@(XliffFiles)"
176-
DestinationFiles="@(XliffFiles->'$(RootDir)/DistFiles/%(Filename)%(Extension)')"
177-
SkipUnchangedFiles="true"/>
180+
DestinationFiles="@(XliffFiles->'$(RootDir)/DistFiles/%(Filename)%(Extension)')"
181+
SkipUnchangedFiles="true"/>
178182
</Target>
179183

180184
<Target Name="MakeWixForDistFiles" DependsOnTargets="copyLibL10ns">
181185
<MakeDir ContinueOnError ="true" Directories ="$(RootDir)\output\Installer\"/>
182186

183187
<MakeWixForDirTree
184-
DirectoryReferenceId="ProgramDir"
185-
ComponentGroupId="DistFiles"
186-
RootDirectory="$(RootDir)\DistFiles"
187-
OutputFilePath="$(RootDir)\output\Installer\GeneratedDistFiles.wxs"
188-
MatchRegExPattern=".*"
189-
>
188+
DirectoryReferenceId="ProgramDir"
189+
ComponentGroupId="DistFiles"
190+
RootDirectory="$(RootDir)\DistFiles"
191+
OutputFilePath="$(RootDir)\output\Installer\GeneratedDistFiles.wxs"
192+
MatchRegExPattern=".*"
193+
>
190194
<!--what does this do?-->
191195
<Output TaskParameter="OutputFilePath" ItemName="Compile" />
192196
</MakeWixForDirTree>

0 commit comments

Comments
 (0)