History

1) Updated BuildNightly.bat script to match the BuildBetaNoHelp.bat script. 2) In MasterBuild.buildproj, restored the call to the CheckForChanges target in CorePopulateWorkspace.

gsfbuildbot committed 11 years ago

Commit 7feebcb1 parent 37fdf743 files · +25 −19Browse files

Unified · Split

3 files
  1. Build/Scripts/BuildNightly.bat +11 −10
  2. Build/Scripts/CommonBuild.bat +4 −5
  3. Build/Scripts/MasterBuild.buildproj +10 −4
Build/Scripts/BuildNightly.bat+11−10
@@ -22,19 +22,20 @@ · 21 unmodified lines
22:: Change Framework path from v3.5 to v4.022:: Change Framework path from v3.5 to v4.0
23:: 10/03/2010 - Pinal C. Patel23:: 10/03/2010 - Pinal C. Patel
24:: Updated to use MSBuild 4.0.24:: Updated to use MSBuild 4.0.
25:: 08/25 - Gavin E. Holden25:: 08/25/2014 - Gavin E. Holden
26:: Modified to call CommonBuild.bat26:: Modified to call CommonBuild.bat.
27:: 01/13/2015 - Stephen C. Wills
28:: Modified to match BuildBetaNoHelp.bat.
27::29::
28::*******************************************************************************************************30::*******************************************************************************************************
29 31
30echo off32@ECHO OFF
31 33
32setlocal enabledelayedexpansion34SetLocal EnableDelayedExpansion
33set parameter_list=35
34for %%y in (%*) do (36ECHO BuildNightly: CALL CommonBuild.bat %*
35 set parameter_list=!parameter_list! %%y37CALL CommonBuild.bat %*
36)38
37echo %parameter_list%39ECHO BuildNightly: C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\msbuild.exe GridSolutionsFramework.buildproj /p:BuildDeployFolder=%deploy%;NugetApiKey=%api_key%;NugetPackagesFolder=%package%;TfsUserName=%tfs_user_name%;TfsPassword=%tfs_password%;ForceBuild=false /l:FileLogger,Microsoft.Build.Engine;logfile=%logger%
38call CommonBuild.bat %parameter_list%
39C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\msbuild.exe GridSolutionsFramework.buildproj /p:BuildDeployFolder=%deploy%;NugetApiKey=%api_key%;NugetPackagesFolder=%package%;TfsUserName=%tfs_user_name%;TfsPassword=%tfs_password%;ForceBuild=false /l:FileLogger,Microsoft.Build.Engine;logfile=%logger% 40C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\msbuild.exe GridSolutionsFramework.buildproj /p:BuildDeployFolder=%deploy%;NugetApiKey=%api_key%;NugetPackagesFolder=%package%;TfsUserName=%tfs_user_name%;TfsPassword=%tfs_password%;ForceBuild=false /l:FileLogger,Microsoft.Build.Engine;logfile=%logger%
40endlocal41endlocal
Build/Scripts/CommonBuild.bat+4−5
@@ -21,9 +21,8 @@ · 20 unmodified lines
21::21::
22::*******************************************************************************************************22::*******************************************************************************************************
23 23
24echo off24@echo off
25 25
26EnableDelayedExpansion
27set show_help=026set show_help=0
28if [%1]==[] set show_help=127if [%1]==[] set show_help=1
29if "%1"=="/?" set show_help=128if "%1"=="/?" set show_help=1
@@ -34,10 +33,10 @@ echo Explain Parameters · 4 unmodified lines
34echo.33echo.
35echo /u = TFS User Name34echo /u = TFS User Name
36echo /p = TFS Password35echo /p = TFS Password
37echo /d = Build Deploy Location (required)36echo /d = Build Deploy Location (required^)
38echo /o = Nuget Package Location (required)37echo /o = Nuget Package Location (required^)
39echo /l = Logger38echo /l = Logger
40echo /f = Force Build (booleen)39echo /f = Force Build (booleen^)
41echo /k = nuget.org API Key 40echo /k = nuget.org API Key
42)41)
43set tfs_user_name=""42set tfs_user_name=""
Build/Scripts/MasterBuild.buildproj+10−4
@@ -336,7 +336,6 @@ · 335 unmodified lines
336 <!-- Create a temporary workspace for the build. -->336 <!-- Create a temporary workspace for the build. -->
337 <Message Text="Creating temporary workspace..."/>337 <Message Text="Creating temporary workspace..."/>
338 338
339
340 <PropertyGroup>339 <PropertyGroup>
341 <Workspace Condition="'$(Workspace)' == ''">$(COMPUTERNAME)_$(ProjectName)</Workspace>340 <Workspace Condition="'$(Workspace)' == ''">$(COMPUTERNAME)_$(ProjectName)</Workspace>
342 </PropertyGroup>341 </PropertyGroup>
@@ -355,10 +354,16 @@ · 12 unmodified lines
355 <Target Name="BeforePopulateWorkspace"/>354 <Target Name="BeforePopulateWorkspace"/>
356 355
357 <Target Name="CorePopulateWorkspace">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 <!-- Get source code for the specified version. -->363 <!-- Get source code for the specified version. -->
359 <Message Text="Getting source code..."/>364 <Message Condition="'$(ForceBuild)' == 'true'" Text="Getting source code..."/>
360 <Exec Condition="'$(TfsUserName)' == ''" Command="%22$(TfsClient)%22 get %22$(LocalFolder)%22 /version:$(SourceVersion) /force /recursive /noprompt"/>365 <Exec Condition="'$(ForceBuild)' == 'true' And '$(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)"/>366 <Exec Condition="'$(ForceBuild)' == 'true' And '$(TfsUserName)' != ''" Command="%22$(TfsClient)%22 get %22$(LocalFolder)%22 /version:$(SourceVersion) /force /recursive /noprompt /login:$(TfsUserName),$(TfsPassword)"/>
362 </Target>367 </Target>
363 368
364 <Target Name="CheckForChanges" Condition="'$(ForceBuild)' != 'true'">369 <Target Name="CheckForChanges" Condition="'$(ForceBuild)' != 'true'">
@@ -372,6 +377,7 @@ · 7 unmodified lines
372 </TfsHistory>377 </TfsHistory>
373 <PropertyGroup>378 <PropertyGroup>
374 <ForceBuild Condition="'$(TotalChanges)' == '-1' Or '$(TotalChanges)' &gt; '1'">true</ForceBuild>379 <ForceBuild Condition="'$(TotalChanges)' == '-1' Or '$(TotalChanges)' &gt; '1'">true</ForceBuild>
380 <SkipVersioning Condition="'$(ForceBuild)' != 'true'">true</SkipVersioning>
375 </PropertyGroup>381 </PropertyGroup>
376 <Message Text="Build is skipped - No new changes." Condition="'$(ForceBuild)' != 'true'"/>382 <Message Text="Build is skipped - No new changes." Condition="'$(ForceBuild)' != 'true'"/>
377 </Target>383 </Target>

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