|
92 | 92 | Name="BuildProductMain" |
93 | 93 | DependsOnTargets="MakeInstallBuildFolders;BuildProduct;Localize;CopyFilesToInstall;ValidateInstallerAddons" |
94 | 94 | /> |
95 | | - <Target Name="BuildProduct" DependsOnTargets="CleanInstaller;ProductCompile" /> |
| 95 | + <Target Name="BuildProduct" DependsOnTargets="CleanInstaller;BuildProcRunner;RescuePatching" /> |
96 | 96 | <Target Name="RequirePlatform"> |
97 | 97 | <!-- x64-only build (x86 is no longer supported) --> |
98 | 98 | <Error |
|
123 | 123 | <!-- ########################################################################################################## --> |
124 | 124 | <!-- ### Compile Targets ### --> |
125 | 125 | <!-- ########################################################################################################## --> |
126 | | - <Target Name="ProductCompile" DependsOnTargets="BuildFieldWorks;RescuePatching"> |
| 126 | + <Target Name="BuildProcRunner"> |
127 | 127 | <MSBuild |
128 | 128 | Projects="$(InstallerDir)/CustomActions/CustomActions.sln" |
129 | 129 | Targets="CustomActions" |
130 | 130 | Properties="Configuration=Release;Platform=x86" |
131 | 131 | /> |
132 | 132 | </Target> |
133 | | - <!-- Modern traversal build for installer (replaces legacy remakefw) --> |
134 | | - <PropertyGroup> |
135 | | - <!-- |
136 | | - Installer builds historically forced a full clean (CleanAll deletes Obj/ and Output/). |
137 | | - That guarantees correctness but destroys incremental rebuild performance for local iteration, |
138 | | - especially for native C++ projects. |
139 | | -
|
140 | | - Set InstallerCleanProductOutputs=true to restore the legacy behavior. |
141 | | - --> |
142 | | - <InstallerCleanProductOutputs Condition="'$(InstallerCleanProductOutputs)'==''">false</InstallerCleanProductOutputs> |
143 | | - <BuildFieldWorksDependsOn>Initialize;CopyDlls;setRegistryValues;GeneratePartsAndLayoutFiles</BuildFieldWorksDependsOn> |
144 | | - <BuildFieldWorksDependsOn Condition="'$(InstallerCleanProductOutputs)'=='true'">CleanAll;$(BuildFieldWorksDependsOn)</BuildFieldWorksDependsOn> |
145 | | - </PropertyGroup> |
146 | | - <Target |
147 | | - Name="BuildFieldWorks" |
148 | | - DependsOnTargets="$(BuildFieldWorksDependsOn)" |
149 | | - > |
150 | | - <Message Text="Building FieldWorks using MSBuild Traversal SDK..." Importance="High" /> |
151 | | - <MSBuild |
152 | | - Projects="$(fwrt)/FieldWorks.proj" |
153 | | - Properties="Configuration=$(Configuration);Platform=$(Platform);action=$(action);desktopNotAvailable=$(desktopNotAvailable)" |
154 | | - /> |
155 | | - <Message Text="FieldWorks build complete." Importance="High" /> |
156 | | - </Target> |
157 | 133 | <!-- Legacy cleanup target (external template repo no longer exists in this repo). --> |
158 | 134 | <Target Name="CleanInstaller"> |
159 | 135 | <ItemGroup> |
|
0 commit comments