Showing the changes to Build/Scripts (3 of 3 files). Show all
Unified · Split
| @@ -22,19 +22,20 @@ · 21 unmodified lines | ||
| 22 | 22 | :: Change Framework path from v3.5 to v4.0 |
| 23 | 23 | :: 10/03/2010 - Pinal C. Patel |
| 24 | 24 | :: Updated to use MSBuild 4.0. |
| 25 | −:: 08/25 - Gavin E. Holden | |
| 26 | −:: Modified to call CommonBuild.bat | |
| 25 | +:: 08/25/2014 - Gavin E. Holden | |
| 26 | +:: Modified to call CommonBuild.bat. | |
| 27 | +:: 01/13/2015 - Stephen C. Wills | |
| 28 | +:: Modified to match BuildBetaNoHelp.bat. | |
| 27 | 29 | :: |
| 28 | 30 | ::******************************************************************************************************* |
| 29 | 31 | |
| 30 | −echo off | |
| 32 | +@ECHO OFF | |
| 31 | 33 | |
| 32 | −setlocal enabledelayedexpansion | |
| 33 | −set parameter_list= | |
| 34 | −for %%y in (%*) do ( | |
| 35 | − set parameter_list=!parameter_list! %%y | |
| 36 | −) | |
| 37 | −echo %parameter_list% | |
| 38 | −call CommonBuild.bat %parameter_list% | |
| 34 | +SetLocal EnableDelayedExpansion | |
| 35 | + | |
| 36 | +ECHO BuildNightly: CALL CommonBuild.bat %* | |
| 37 | +CALL CommonBuild.bat %* | |
| 38 | + | |
| 39 | +ECHO 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% | |
| 39 | 40 | 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% |
| 40 | 41 | endlocal |
| @@ -21,9 +21,8 @@ · 20 unmodified lines | ||
| 21 | 21 | :: |
| 22 | 22 | ::******************************************************************************************************* |
| 23 | 23 | |
| 24 | −echo off | |
| 24 | +@echo off | |
| 25 | 25 | |
| 26 | −EnableDelayedExpansion | |
| 27 | 26 | set show_help=0 |
| 28 | 27 | if [%1]==[] set show_help=1 |
| 29 | 28 | if "%1"=="/?" set show_help=1 |
| @@ -34,10 +33,10 @@ echo Explain Parameters · 4 unmodified lines | ||
| 34 | 33 | echo. |
| 35 | 34 | echo /u = TFS User Name |
| 36 | 35 | echo /p = TFS Password |
| 37 | −echo /d = Build Deploy Location (required) | |
| 38 | −echo /o = Nuget Package Location (required) | |
| 36 | +echo /d = Build Deploy Location (required^) | |
| 37 | +echo /o = Nuget Package Location (required^) | |
| 39 | 38 | echo /l = Logger |
| 40 | −echo /f = Force Build (booleen) | |
| 39 | +echo /f = Force Build (booleen^) | |
| 41 | 40 | echo /k = nuget.org API Key |
| 42 | 41 | ) |
| 43 | 42 | set tfs_user_name="" |
| @@ -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> |