|
131 | 131 | changing of the script, but I haven't figured that out. --> |
132 | 132 |
|
133 | 133 | <FileUpdate File="$(RootDir)\src\Installer\Installer.wxs" Regex='Property_ProductVersion = ".*"' |
134 | | - ReplacementText ="Property_ProductVersion = "$(Version)"" /> |
| 134 | + ReplacementText ="Property_ProductVersion = "$(Version)"" /> |
135 | 135 |
|
136 | 136 | <Message Text="Making Installer Version: $(Version)" Importance="high" /> |
137 | 137 |
|
|
140 | 140 | <!-- Ensure destination folder exists --> |
141 | 141 | <MakeDir Directories="$(RootDir)\output\installer" /> |
142 | 142 |
|
| 143 | + <PropertyGroup> |
| 144 | + <InstallerSourceMsi>$(RootDir)\output\installer\SayMoreInstaller.msi</InstallerSourceMsi> |
| 145 | + </PropertyGroup> |
| 146 | + |
143 | 147 | <!-- 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" /> |
145 | 149 |
|
146 | 150 | <!-- Guard with an explicit error if it's missing --> |
147 | 151 | <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)')" /> |
150 | 154 |
|
151 | 155 | <!-- Copy + rename with version --> |
152 | 156 | <Copy |
153 | | - SourceFiles="$(RootDir)\src\Installer\bin\$(Configuration)\SayMoreInstaller.msi" |
| 157 | + SourceFiles="$(InstallerSourceMsi)" |
154 | 158 | DestinationFiles="$(RootDir)\output\installer\SayMoreInstaller.$(Version).msi" /> |
155 | | - |
| 159 | + |
156 | 160 | <!-- appcast.xml is used as part of the update notification system --> |
157 | 161 | <Copy SourceFiles ="$(RootDir)\src\Installer\appcast.xml" |
158 | 162 | DestinationFolder ="$(RootDir)\output\installer"/> |
|
173 | 177 | <XliffFiles Include="$(RootDir)/packages/SIL.libpalaso.l10ns/content/**/*.xlf"/> |
174 | 178 | </ItemGroup> |
175 | 179 | <Copy SourceFiles="@(XliffFiles)" |
176 | | - DestinationFiles="@(XliffFiles->'$(RootDir)/DistFiles/%(Filename)%(Extension)')" |
177 | | - SkipUnchangedFiles="true"/> |
| 180 | + DestinationFiles="@(XliffFiles->'$(RootDir)/DistFiles/%(Filename)%(Extension)')" |
| 181 | + SkipUnchangedFiles="true"/> |
178 | 182 | </Target> |
179 | 183 |
|
180 | 184 | <Target Name="MakeWixForDistFiles" DependsOnTargets="copyLibL10ns"> |
181 | 185 | <MakeDir ContinueOnError ="true" Directories ="$(RootDir)\output\Installer\"/> |
182 | 186 |
|
183 | 187 | <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 | + > |
190 | 194 | <!--what does this do?--> |
191 | 195 | <Output TaskParameter="OutputFilePath" ItemName="Compile" /> |
192 | 196 | </MakeWixForDirTree> |
|
0 commit comments