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
103103 <NuGet>$(LocalFolder)\Build\Scripts\NuGet\NuGet.exe</NuGet>
104104 <NuGetPackagesFolder>$(NuGetPackagesFolder)</NuGetPackagesFolder>
105105 <BuildDeployFolder>$(BuildDeployFolder)</BuildDeployFolder>
106−
107− <SourceArchiveFileName Condition="'$(SourceArchiveFileName)' == ''">$(LocalFolder)\Source.zip</SourceArchiveFileName>
108− <SourceArchiveWorkingDirectory Condition="'$(SourceArchiveWorkingDirectory)' == ''">$(LocalFolder)\Archives\Source</SourceArchiveWorkingDirectory>
109106 </PropertyGroup>
110107 </Target>
111108
@@ -177,7 +174,6 @@ · 65 unmodified lines
177174
178175 <Target Name="AfterDeployBuild">
179176 <CallTarget Targets="DeployBuildScripts"/>
180− <CallTarget Targets="DeploySource"/>
181177 <CallTarget Targets="DeployHelpFiles"/>
182178 <!--<CallTarget Targets="PublishNuGetPackages"/>-->
183179 </Target>
@@ -188,22 +184,6 @@ · 4 unmodified lines
188184 <Copy SourceFiles="@(BuildScripts)" DestinationFolder="$(BuildDeployFolder)\Build Scripts\%(BuildScripts.RecursiveDir)"/>
189185 </Target>
190186
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−
207187 <Target Name="DeployHelpFiles" Condition="'$(SkipHelpFiles)' != 'true' And '$(BuildOutputFolder)' != '' And '$(BuildDeployFolder)' != ''">
208188 <!-- Copy help files to the deploy folder. -->
209189 <Message Text="Deploying help files..."/>
Build/Scripts/MasterBuild.buildproj+27−0
@@ -125,10 +125,14 @@ · 124 unmodified lines
125125 <BinariesArchiveFileName></BinariesArchiveFileName>
126126 <!-- Name of installs archive file. -->
127127 <InstallsArchiveFileName></InstallsArchiveFileName>
128+ <!-- Name of source code archive file. -->
129+ <SourceArchiveFileName></SourceArchiveFileName>
128130 <!-- Working directory for creating binaries archive file. -->
129131 <BinariesArchiveWorkingDirectory></BinariesArchiveWorkingDirectory>
130132 <!-- Working directory for creating installs archive file. -->
131133 <InstallsArchiveWorkingDirectory></InstallsArchiveWorkingDirectory>
134+ <!-- Working directory for creating source code archive file. -->
135+ <SourceArchiveWorkingDirectory></SourceArchiveWorkingDirectory>
132136 </PropertyGroup>
133137
134138 <PropertyGroup>
@@ -242,6 +246,8 @@ · 107 unmodified lines
242246 <BinariesToArchive Include="Nothing" Exclude="Nothing"/>
243247 <!-- List of installs to archive. -->
244248 <InstallsToArchive Include="Nothing" Exclude="Nothing"/>
249+ <!-- List of source code files to archive. -->
250+ <SourcesToArchive Include="Nothing" Exclude="Nothing"/>
245251 <!-- Destinations of archive files (*.zip). -->
246252 <ArchiveDestinations Include="Nothing" Exclude="Nothing"/>
247253 </ItemGroup>
@@ -293,8 +299,10 @@ · 45 unmodified lines
293299 <SkipVersioning Condition="'$(SkipVersioning)' == ''">false</SkipVersioning>
294300 <BinariesArchiveFileName Condition="'$(BinariesArchiveFileName)' == ''">$(LocalFolder)\$(ProjectName).Binaries.zip</BinariesArchiveFileName>
295301 <InstallsArchiveFileName Condition="'$(InstallsArchiveFileName)' == ''">$(LocalFolder)\$(ProjectName).Installs.zip</InstallsArchiveFileName>
302+ <SourceArchiveFileName Condition="'$(SourceArchiveFileName)' == ''">$(LocalFolder)\$(ProjectName).Source.zip</SourceArchiveFileName>
296303 <BinariesArchiveWorkingDirectory Condition="'$(BinariesArchiveWorkingDirectory)' == ''">$(LocalFolder)\Archives\Binaries</BinariesArchiveWorkingDirectory>
297304 <InstallsArchiveWorkingDirectory Condition="'$(InstallsArchiveWorkingDirectory)' == ''">$(LocalFolder)\Archives\Installs</InstallsArchiveWorkingDirectory>
305+ <SourceArchiveWorkingDirectory Condition="'$(SourceArchiveWorkingDirectory)' == ''">$(LocalFolder)\Archives\Source</SourceArchiveWorkingDirectory>
298306 </PropertyGroup>
299307 </Target>
300308
@@ -423,6 +431,8 @@ · 122 unmodified lines
423431 <Folder TaskAction="RemoveContent" Path="$(BuildDeployFolder)"/>
424432 <Copy SourceFiles="@(FilesToDeploy)" DestinationFolder="$(BuildDeployFolder)\%(FilesToDeploy.RecursiveDir)"/>
425433 <CallTarget Targets="ArchiveBuildOutput"/>
434+ <CallTarget Targets="ArchiveSource"/>
435+ <CallTarget Targets="DeployArchives"/>
426436 </Target>
427437
428438 <Target Name="ArchiveBuildOutput" Condition="'@(BinariesToArchive)' != '' Or '@(InstallsToArchive)' != ''">
@@ -441,6 +451,23 @@ · 12 unmodified lines
441451 <ItemGroup>
442452 <Archives Include="$(LocalFolder)\*.zip"/>
443453 </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)' != ''">
444471 <Copy SourceFiles="@(Archives)" DestinationFolder="%(ArchiveDestinations.FullPath)" ContinueOnError="true"/>
445472 </Target>
446473

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