Showing the changes to Build/Scripts/MasterBuild.buildproj (1 of 3 files). Show all
Unified · Split
| @@ -336,7 +336,6 @@ · 335 unmodified lines | ||
| 336 | 336 | <!-- Create a temporary workspace for the build. --> |
| 337 | 337 | <Message Text="Creating temporary workspace..."/> |
| 338 | 338 | |
| 339 | − | |
| 340 | 339 | <PropertyGroup> |
| 341 | 340 | <Workspace Condition="'$(Workspace)' == ''">$(COMPUTERNAME)_$(ProjectName)</Workspace> |
| 342 | 341 | </PropertyGroup> |
| @@ -355,10 +354,16 @@ · 12 unmodified lines | ||
| 355 | 354 | <Target Name="BeforePopulateWorkspace"/> |
| 356 | 355 | |
| 357 | 356 | <Target Name="CorePopulateWorkspace"> |
| 357 | + <!-- Get version file for the most recent version. --> | |
| 358 | + <Message Condition="'$(ForceBuild)' != 'true'" Text="Checking for changes to project since last build..."/> | |
| 359 | + <Exec Condition="'$(ForceBuild)' != 'true' And '$(TfsUserName)' == ''" Command="%22$(TfsClient)%22 get %22$(VersionFile)%22 /force /recursive /noprompt"/> | |
| 360 | + <Exec Condition="'$(ForceBuild)' != 'true' And '$(TfsUserName)' != ''" Command="%22$(TfsClient)%22 get %22$(VersionFile)%22 /force /recursive /noprompt /login:$(TfsUserName),$(TfsPassword)"/> | |
| 361 | + <CallTarget Targets="CheckForChanges"/> | |
| 362 | + | |
| 358 | 363 | <!-- Get source code for the specified version. --> |
| 359 | − <Message Text="Getting source code..."/> | |
| 360 | − <Exec Condition="'$(TfsUserName)' == ''" Command="%22$(TfsClient)%22 get %22$(LocalFolder)%22 /version:$(SourceVersion) /force /recursive /noprompt"/> | |
| 361 | − <Exec Condition="'$(TfsUserName)' != ''" Command="%22$(TfsClient)%22 get %22$(LocalFolder)%22 /version:$(SourceVersion) /force /recursive /noprompt /login:$(TfsUserName),$(TfsPassword)"/> | |
| 364 | + <Message Condition="'$(ForceBuild)' == 'true'" Text="Getting source code..."/> | |
| 365 | + <Exec Condition="'$(ForceBuild)' == 'true' And '$(TfsUserName)' == ''" Command="%22$(TfsClient)%22 get %22$(LocalFolder)%22 /version:$(SourceVersion) /force /recursive /noprompt"/> | |
| 366 | + <Exec Condition="'$(ForceBuild)' == 'true' And '$(TfsUserName)' != ''" Command="%22$(TfsClient)%22 get %22$(LocalFolder)%22 /version:$(SourceVersion) /force /recursive /noprompt /login:$(TfsUserName),$(TfsPassword)"/> | |
| 362 | 367 | </Target> |
| 363 | 368 | |
| 364 | 369 | <Target Name="CheckForChanges" Condition="'$(ForceBuild)' != 'true'"> |
| @@ -372,6 +377,7 @@ · 7 unmodified lines | ||
| 372 | 377 | </TfsHistory> |
| 373 | 378 | <PropertyGroup> |
| 374 | 379 | <ForceBuild Condition="'$(TotalChanges)' == '-1' Or '$(TotalChanges)' > '1'">true</ForceBuild> |
| 380 | + <SkipVersioning Condition="'$(ForceBuild)' != 'true'">true</SkipVersioning> | |
| 375 | 381 | </PropertyGroup> |
| 376 | 382 | <Message Text="Build is skipped - No new changes." Condition="'$(ForceBuild)' != 'true'"/> |
| 377 | 383 | </Target> |