History

Fixed MasterBuild.buildproj script so that tf get can be executed when ForceBuild is false if the script detects that there have been changes.

gsfbuildbot committed 11 years ago

Commit fe7d72d1 parent 7feebcb1 file · +10 −13Browse files

Unified · Split

Build/Scripts/MasterBuild.buildproj+10−13
@@ -351,24 +351,14 @@ · 350 unmodified lines
351351 </Target>
352352
353353 <Target Name="AfterCreateWorkspace"/>
354− <Target Name="BeforePopulateWorkspace"/>
355−
356− <Target Name="CorePopulateWorkspace">
354+
355+ <Target Name="BeforePopulateWorkspace" Condition="'$(ForceBuild)' != 'true'">
357356 <!-- Get version file for the most recent version. -->
358357 <Message Condition="'$(ForceBuild)' != 'true'" Text="Checking for changes to project since last build..."/>
359358 <Exec Condition="'$(ForceBuild)' != 'true' And '$(TfsUserName)' == ''" Command="%22$(TfsClient)%22 get %22$(VersionFile)%22 /force /recursive /noprompt"/>
360359 <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−
363− <!-- Get source code for the specified version. -->
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)"/>
367− </Target>
368−
369− <Target Name="CheckForChanges" Condition="'$(ForceBuild)' != 'true'">
360+
370361 <!-- Check for new changes since the last build. -->
371− <Message Text="Checking for changes..."/>
372362 <ReadLinesFromFile File="$(VersionFile)">
373363 <Output TaskParameter="Lines" ItemName="VersionNumber"/>
374364 </ReadLinesFromFile>
@@ -382,6 +372,13 @@ · 7 unmodified lines
382372 <Message Text="Build is skipped - No new changes." Condition="'$(ForceBuild)' != 'true'"/>
383373 </Target>
384374
375+ <Target Name="CorePopulateWorkspace" Condition="'$(ForceBuild)' == 'true'">
376+ <!-- Get source code for the specified version. -->
377+ <Message Text="Getting source code..."/>
378+ <Exec Condition="'$(TfsUserName)' == ''" Command="%22$(TfsClient)%22 get %22$(LocalFolder)%22 /version:$(SourceVersion) /force /recursive /noprompt"/>
379+ <Exec Condition="'$(TfsUserName)' != ''" Command="%22$(TfsClient)%22 get %22$(LocalFolder)%22 /version:$(SourceVersion) /force /recursive /noprompt /login:$(TfsUserName),$(TfsPassword)"/>
380+ </Target>
381+
385382 <Target Name="AfterPopulateWorkspace"/>
386383 <Target Name="BeforeVersionSource"/>
387384

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t