diff options
| author | ArnoldZokas <arnold.zokas@coderoom.net> | 2010-12-08 20:27:01 +0000 |
|---|---|---|
| committer | ArnoldZokas <arnold.zokas@coderoom.net> | 2010-12-08 20:27:01 +0000 |
| commit | 649eb54a99166127d1f4ff2df4953ae204f7da13 (patch) | |
| tree | 964aed48823d6c405771759f814bb9d2c04503d8 /build | |
| parent | 865de6a2907f50bd3c0674ef125c92d6f04e877b (diff) | |
| download | protobuf-649eb54a99166127d1f4ff2df4953ae204f7da13.tar.gz protobuf-649eb54a99166127d1f4ff2df4953ae204f7da13.tar.bz2 protobuf-649eb54a99166127d1f4ff2df4953ae204f7da13.zip | |
Fixed a bug in the build process that caused ReleaseBinaries package to be populated with redundant empty directories
Diffstat (limited to 'build')
| -rw-r--r-- | build/Common.targets | 11 | ||||
| -rw-r--r-- | build/GenerateCompletePackage.bat | 3 | ||||
| -rw-r--r-- | build/GenerateReleasePackage.bat | 3 | ||||
| -rw-r--r-- | build/build.csproj | 1 |
4 files changed, 15 insertions, 3 deletions
diff --git a/build/Common.targets b/build/Common.targets index e26bc07a..8b423873 100644 --- a/build/Common.targets +++ b/build/Common.targets @@ -34,14 +34,19 @@ </Target> <!--## Package Generation ##--> + <Target Name="_CleanOutputDirectory"> + <ItemGroup><DirectoriesToDelete Include="$([System.IO.Directory]::GetDirectories('$(BuildOutputDirectory)'))" /></ItemGroup> + <RemoveDir Directories="@(DirectoriesToDelete)" ContinueOnError="true" /> + + <ItemGroup><FilesToDelete Include="$(BuildOutputDirectory)\**\*.*" /></ItemGroup> + <Delete Files="@(FilesToDelete)" /> + </Target> + <Target Name="_PreparePackageComponent"> <Copy SourceFiles="@(DynamicPackageItem)" DestinationFolder="$(BuildOutputDirectory)\%(DynamicPackageItem.TargetDirectory)\%(DynamicPackageItem.RecursiveDir)" /> </Target> <Target Name="_GeneratePackage"> - <ItemGroup><ExistingArchives Include="$(BuildOutputDirectory)\*.zip" /></ItemGroup> - <Delete Files="@(ExistingArchives)" /> - <Copy SourceFiles="@(StaticPackageItem)" DestinationFolder="$(BuildOutputDirectory)\%(StaticPackageItem.TargetDirectory)\%(StaticPackageItem.RecursiveDir)" /> <Exec Command=""$(ZipExePath)" a -tzip $(PackageName) * -r" WorkingDirectory="$(BuildOutputDirectory)" /> diff --git a/build/GenerateCompletePackage.bat b/build/GenerateCompletePackage.bat index 63a0d29e..959dc788 100644 --- a/build/GenerateCompletePackage.bat +++ b/build/GenerateCompletePackage.bat @@ -1,4 +1,7 @@ @ECHO OFF +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:PrepareOutputDirectory +IF ERRORLEVEL 1 GOTO END + %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build;PreparePackageComponent /p:BuildConfiguration=Debug /p:Platform="Any CPU" IF ERRORLEVEL 1 GOTO END diff --git a/build/GenerateReleasePackage.bat b/build/GenerateReleasePackage.bat index 30e05bad..70111b74 100644 --- a/build/GenerateReleasePackage.bat +++ b/build/GenerateReleasePackage.bat @@ -1,4 +1,7 @@ @ECHO OFF +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:PrepareOutputDirectory +IF ERRORLEVEL 1 GOTO END + %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build;PreparePackageComponent /p:BuildConfiguration=Release /p:Platform="Any CPU" IF ERRORLEVEL 1 GOTO END diff --git a/build/build.csproj b/build/build.csproj index 50e2207a..7bc65894 100644 --- a/build/build.csproj +++ b/build/build.csproj @@ -95,6 +95,7 @@ <!-- targets --> <Target Name="Build" DependsOnTargets="_Compile;_Test" /> + <Target Name="PrepareOutputDirectory" DependsOnTargets="_CleanOutputDirectory" /> <Target Name="PreparePackageComponent" DependsOnTargets="_PreparePackageComponent" /> <Target Name="GeneratePackage" DependsOnTargets="_GeneratePackage" /> <Target Name="RunBenchmarks" DependsOnTargets="_RunBenchmarks" /> |