Skip to content

Commit

Permalink
Minor fixes to build.proj for GitHub repository
Browse files Browse the repository at this point in the history
  • Loading branch information
justinstenning committed Aug 9, 2015
1 parent 1d9a80d commit 45e07d5
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -19,6 +19,8 @@ Thumbs.db
*.ilk
*.log
*.sdf
[Bb]uild*/
[Dd]eploy*/
[Bb]in
[Dd]ebug*/
*.lib
Expand Down
2 changes: 1 addition & 1 deletion build-package.bat
Expand Up @@ -2,5 +2,5 @@
call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86_amd64
msbuild build.proj /t:Clean;BeforeBuild
msbuild build.proj /t:Build
msbuild build.proj /t:ExportSource;PreparePackage;Package
msbuild build.proj /t:PreparePackage;Package
pause
2 changes: 1 addition & 1 deletion build.bat
@@ -1,5 +1,5 @@
echo off
call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86_amd64
call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86_amd64

msbuild build.proj /t:Build
pause
20 changes: 10 additions & 10 deletions build.proj
Expand Up @@ -85,10 +85,8 @@
<Target Name = "PreparePackage">
<!--DependsOnTargets="Build">-->
<ItemGroup>
<CommonFiles Include=".\KNOWN ISSUES.txt" />
<CommonFiles Include=".\LICENSE.txt" />
<CommonFiles Include=".\README.txt" />
<CommonFiles Include=".\KNOWN ISSUES.txt" />
<CommonFiles Include=".\LICENSE" />
<CommonFiles Include=".\README.md" />
<CommonFiles Include=".\EasyHookTestCert.cer" />
<CommonFiles Include=".\Public\easyhook.h" />
</ItemGroup>
Expand Down Expand Up @@ -128,24 +126,24 @@
<Copy SourceFiles="@(NetFX4Files)"
DestinationFolder="$(PackageDir)\NetFX4.0" />
</Target>

<!-- No need to export source
<Target Name="ExportSource">
<RemoveDir Directories="$(PackageDir)\Source" />
<SvnExport RepositoryPath="$(MSBuildProjectDirectory)"
LocalPath="$(PackageDir)\Source"></SvnExport>
</Target>
-->

<!-- Package: Create deployment ZIP file -->
<Target Name = "Package" DependsOnTargets="PreparePackage">
<ItemGroup>
<PackageFiles Include="$(PackageDir)\**\*.*" Exclude="$(PackageDir)\*.zip;$(PackageDir)\Source\**\*.*" />
</ItemGroup>
<ItemGroup>
<!-- No longer packaging source files
<ItemGroup>
<SourceFiles Include="$(PackageDir)\Source\**\*.*" />
</ItemGroup>
<!--<ItemGroup>
<SourceFiles Include="" Exclude="" />
</ItemGroup>-->
-->
<Version VersionFile="Version.txt" BuildType="None" RevisionType="None">
<Output TaskParameter="Major" PropertyName="Major" />
<Output TaskParameter="Minor" PropertyName="Minor" />
Expand All @@ -157,10 +155,12 @@
WorkingDirectory="$(PackageDir)"
ZipFileName="$(PackageDir)\EasyHook-$(Major).$(Minor).$(Build).$(Revision)-Binaries.zip"
ZipLevel="9" />
<Zip Files="@(SourceFiles)"
<!-- no longer archiving source files here
<Zip Files="@(SourceFiles)"
WorkingDirectory="$(PackageDir)\Source"
ZipFileName="$(PackageDir)\EasyHook-$(Major).$(Minor).$(Build).$(Revision)-Source.zip"
ZipLevel="9" />
-->
</Target>
<Target Name = "Clean">
<RemoveDir Directories=".\Build;$(PackageDir)\NetFX4.0;$(PackageDir)\NetFX3.5;$(PackageDir)\Source" />
Expand Down

0 comments on commit 45e07d5

Please sign in to comment.