History

Moved source code deployment task from GridSolutionsFramework.buildproj to MasterBuild.buildproj.

StephenCWills committed 11 years ago

Commit 6b19bee1 parent ca453832 files · +27 −20Browse files

Showing the changes to Build/Scripts (2 of 2 files). Show all

Unified · Split

2 files
  1. Build/Scripts/GridSolutionsFramework.buildproj +0 −20
  2. Build/Scripts/MasterBuild.buildproj +27 −0
Build/Scripts/GridSolutionsFramework.buildproj+0−20
@@ -103,9 +103,6 @@ · 102 unmodified lines
103 <NuGet>$(LocalFolder)\Build\Scripts\NuGet\NuGet.exe</NuGet>103 <NuGet>$(LocalFolder)\Build\Scripts\NuGet\NuGet.exe</NuGet>
104 <NuGetPackagesFolder>$(NuGetPackagesFolder)</NuGetPackagesFolder>104 <NuGetPackagesFolder>$(NuGetPackagesFolder)</NuGetPackagesFolder>
105 <BuildDeployFolder>$(BuildDeployFolder)</BuildDeployFolder>105 <BuildDeployFolder>$(BuildDeployFolder)</BuildDeployFolder>
106
107 <SourceArchiveFileName Condition="'$(SourceArchiveFileName)' == ''">$(LocalFolder)\Source.zip</SourceArchiveFileName>
108 <SourceArchiveWorkingDirectory Condition="'$(SourceArchiveWorkingDirectory)' == ''">$(LocalFolder)\Archives\Source</SourceArchiveWorkingDirectory>
109 </PropertyGroup>106 </PropertyGroup>
110 </Target>107 </Target>
111 108
@@ -177,7 +174,6 @@ · 65 unmodified lines
177 174
178 <Target Name="AfterDeployBuild">175 <Target Name="AfterDeployBuild">
179 <CallTarget Targets="DeployBuildScripts"/>176 <CallTarget Targets="DeployBuildScripts"/>
180 <CallTarget Targets="DeploySource"/>
181 <CallTarget Targets="DeployHelpFiles"/>177 <CallTarget Targets="DeployHelpFiles"/>
182 <!--<CallTarget Targets="PublishNuGetPackages"/>-->178 <!--<CallTarget Targets="PublishNuGetPackages"/>-->
183 </Target>179 </Target>
@@ -188,22 +184,6 @@ · 4 unmodified lines
188 <Copy SourceFiles="@(BuildScripts)" DestinationFolder="$(BuildDeployFolder)\Build Scripts\%(BuildScripts.RecursiveDir)"/>184 <Copy SourceFiles="@(BuildScripts)" DestinationFolder="$(BuildDeployFolder)\Build Scripts\%(BuildScripts.RecursiveDir)"/>
189 </Target>185 </Target>
190 186
191 <Target Name="DeploySource" Condition="'$(ForceBuild)' == 'true' And '$(BuildDeployFolder)' != ''">
192 <!-- Create archive of source tree. -->
193 <Message Text="Archiving source code..."/>
194 <Copy SourceFiles="@(SourcesToArchive)" DestinationFolder="$(SourceArchiveWorkingDirectory)\%(SourcesToArchive.RecursiveDir)"/>
195 <ItemGroup>
196 <SourcesToArchive Remove="@(SourcesToArchive)"/>
197 <SourcesToArchive Include="$(SourceArchiveWorkingDirectory)\**\*.*"/>
198 </ItemGroup>
199 <MSBuild.Community.Tasks.Zip Files="@(SourcesToArchive)" ZipFileName="$(SourceArchiveFileName)" WorkingDirectory="$(SourceArchiveWorkingDirectory)" Condition="'@(SourcesToArchive)' != ''"/>
200 <ItemGroup>
201 <SourceArchive Include="$(SourceArchiveFileName)"/>
202 <SourceArchiveDestination Include="$(BuildDeployFolder)\..\"/>
203 </ItemGroup>
204 <Copy SourceFiles="@(SourceArchive)" DestinationFolder="%(SourceArchiveDestination.FullPath)" ContinueOnError="true"/>
205 </Target>
206
207 <Target Name="DeployHelpFiles" Condition="'$(SkipHelpFiles)' != 'true' And '$(BuildOutputFolder)' != '' And '$(BuildDeployFolder)' != ''">187 <Target Name="DeployHelpFiles" Condition="'$(SkipHelpFiles)' != 'true' And '$(BuildOutputFolder)' != '' And '$(BuildDeployFolder)' != ''">
208 <!-- Copy help files to the deploy folder. -->188 <!-- Copy help files to the deploy folder. -->
209 <Message Text="Deploying help files..."/>189 <Message Text="Deploying help files..."/>
Build/Scripts/MasterBuild.buildproj+27−0
@@ -125,10 +125,14 @@ · 124 unmodified lines
125 <BinariesArchiveFileName></BinariesArchiveFileName>125 <BinariesArchiveFileName></BinariesArchiveFileName>
126 <!-- Name of installs archive file. -->126 <!-- Name of installs archive file. -->
127 <InstallsArchiveFileName></InstallsArchiveFileName>127 <InstallsArchiveFileName></InstallsArchiveFileName>
128 <!-- Name of source code archive file. -->
129 <SourceArchiveFileName></SourceArchiveFileName>
128 <!-- Working directory for creating binaries archive file. -->130 <!-- Working directory for creating binaries archive file. -->
129 <BinariesArchiveWorkingDirectory></BinariesArchiveWorkingDirectory>131 <BinariesArchiveWorkingDirectory></BinariesArchiveWorkingDirectory>
130 <!-- Working directory for creating installs archive file. -->132 <!-- Working directory for creating installs archive file. -->
131 <InstallsArchiveWorkingDirectory></InstallsArchiveWorkingDirectory>133 <InstallsArchiveWorkingDirectory></InstallsArchiveWorkingDirectory>
134 <!-- Working directory for creating source code archive file. -->
135 <SourceArchiveWorkingDirectory></SourceArchiveWorkingDirectory>
132 </PropertyGroup>136 </PropertyGroup>
133 137
134 <PropertyGroup>138 <PropertyGroup>
@@ -242,6 +246,8 @@ · 107 unmodified lines
242 <BinariesToArchive Include="Nothing" Exclude="Nothing"/>246 <BinariesToArchive Include="Nothing" Exclude="Nothing"/>
243 <!-- List of installs to archive. -->247 <!-- List of installs to archive. -->
244 <InstallsToArchive Include="Nothing" Exclude="Nothing"/>248 <InstallsToArchive Include="Nothing" Exclude="Nothing"/>
249 <!-- List of source code files to archive. -->
250 <SourcesToArchive Include="Nothing" Exclude="Nothing"/>
245 <!-- Destinations of archive files (*.zip). -->251 <!-- Destinations of archive files (*.zip). -->
246 <ArchiveDestinations Include="Nothing" Exclude="Nothing"/>252 <ArchiveDestinations Include="Nothing" Exclude="Nothing"/>
247 </ItemGroup>253 </ItemGroup>
@@ -293,8 +299,10 @@ · 45 unmodified lines
293 <SkipVersioning Condition="'$(SkipVersioning)' == ''">false</SkipVersioning>299 <SkipVersioning Condition="'$(SkipVersioning)' == ''">false</SkipVersioning>
294 <BinariesArchiveFileName Condition="'$(BinariesArchiveFileName)' == ''">$(LocalFolder)\$(ProjectName).Binaries.zip</BinariesArchiveFileName>300 <BinariesArchiveFileName Condition="'$(BinariesArchiveFileName)' == ''">$(LocalFolder)\$(ProjectName).Binaries.zip</BinariesArchiveFileName>
295 <InstallsArchiveFileName Condition="'$(InstallsArchiveFileName)' == ''">$(LocalFolder)\$(ProjectName).Installs.zip</InstallsArchiveFileName>301 <InstallsArchiveFileName Condition="'$(InstallsArchiveFileName)' == ''">$(LocalFolder)\$(ProjectName).Installs.zip</InstallsArchiveFileName>
302 <SourceArchiveFileName Condition="'$(SourceArchiveFileName)' == ''">$(LocalFolder)\$(ProjectName).Source.zip</SourceArchiveFileName>
296 <BinariesArchiveWorkingDirectory Condition="'$(BinariesArchiveWorkingDirectory)' == ''">$(LocalFolder)\Archives\Binaries</BinariesArchiveWorkingDirectory>303 <BinariesArchiveWorkingDirectory Condition="'$(BinariesArchiveWorkingDirectory)' == ''">$(LocalFolder)\Archives\Binaries</BinariesArchiveWorkingDirectory>
297 <InstallsArchiveWorkingDirectory Condition="'$(InstallsArchiveWorkingDirectory)' == ''">$(LocalFolder)\Archives\Installs</InstallsArchiveWorkingDirectory>304 <InstallsArchiveWorkingDirectory Condition="'$(InstallsArchiveWorkingDirectory)' == ''">$(LocalFolder)\Archives\Installs</InstallsArchiveWorkingDirectory>
305 <SourceArchiveWorkingDirectory Condition="'$(SourceArchiveWorkingDirectory)' == ''">$(LocalFolder)\Archives\Source</SourceArchiveWorkingDirectory>
298 </PropertyGroup>306 </PropertyGroup>
299 </Target>307 </Target>
300 308
@@ -423,6 +431,8 @@ · 122 unmodified lines
423 <Folder TaskAction="RemoveContent" Path="$(BuildDeployFolder)"/>431 <Folder TaskAction="RemoveContent" Path="$(BuildDeployFolder)"/>
424 <Copy SourceFiles="@(FilesToDeploy)" DestinationFolder="$(BuildDeployFolder)\%(FilesToDeploy.RecursiveDir)"/>432 <Copy SourceFiles="@(FilesToDeploy)" DestinationFolder="$(BuildDeployFolder)\%(FilesToDeploy.RecursiveDir)"/>
425 <CallTarget Targets="ArchiveBuildOutput"/>433 <CallTarget Targets="ArchiveBuildOutput"/>
434 <CallTarget Targets="ArchiveSource"/>
435 <CallTarget Targets="DeployArchives"/>
426 </Target>436 </Target>
427 437
428 <Target Name="ArchiveBuildOutput" Condition="'@(BinariesToArchive)' != '' Or '@(InstallsToArchive)' != ''">438 <Target Name="ArchiveBuildOutput" Condition="'@(BinariesToArchive)' != '' Or '@(InstallsToArchive)' != ''">
@@ -441,6 +451,23 @@ · 12 unmodified lines
441 <ItemGroup>451 <ItemGroup>
442 <Archives Include="$(LocalFolder)\*.zip"/>452 <Archives Include="$(LocalFolder)\*.zip"/>
443 </ItemGroup>453 </ItemGroup>
454 </Target>
455
456 <Target Name="ArchiveSource" Condition="'@(SourcesToArchive)' != ''">
457 <!-- Create archive of source tree. -->
458 <Message Text="Archiving source code..."/>
459 <Copy SourceFiles="@(SourcesToArchive)" DestinationFolder="$(SourceArchiveWorkingDirectory)\%(SourcesToArchive.RecursiveDir)"/>
460 <ItemGroup>
461 <SourcesToArchive Remove="@(SourcesToArchive)"/>
462 <SourcesToArchive Include="$(SourceArchiveWorkingDirectory)\**\*.*"/>
463 </ItemGroup>
464 <MSBuild.Community.Tasks.Zip Files="@(SourcesToArchive)" ZipFileName="$(SourceArchiveFileName)" WorkingDirectory="$(SourceArchiveWorkingDirectory)" Condition="'@(SourcesToArchive)' != ''"/>
465 <ItemGroup>
466 <Archives Include="$(SourceArchiveFileName)"/>
467 </ItemGroup>
468 </Target>
469
470 <Target Name="DeployArchives" Condition="'@(Archives)' != ''">
444 <Copy SourceFiles="@(Archives)" DestinationFolder="%(ArchiveDestinations.FullPath)" ContinueOnError="true"/>471 <Copy SourceFiles="@(Archives)" DestinationFolder="%(ArchiveDestinations.FullPath)" ContinueOnError="true"/>
445 </Target>472 </Target>
446 473

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