Roger Kratz avatar Roger Kratz committed 0cb09b8

continue to clean up release script

Comments (0)

Files changed (3)

Src/Build/build.bat

-@echo off
-SET sn="%programfiles%\Microsoft SDKs\Windows\V6.0A\Bin\sn.exe"
-set gacutil="%programfiles%\Microsoft SDKs\Windows\V6.0A\Bin\gacutil.exe"
-set msbuild="%windir%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe"
-set configuration=Debug
-%msbuild% default.msbuild /v:n /t:Build
-echo -------------------------------
-pause

Src/Build/buildRelease.bat

 set gacutil="%programfiles%\Microsoft SDKs\Windows\V6.0A\Bin\gacutil.exe"
 set msbuild="%windir%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe"
 set configuration=Release
-%msbuild% default.msbuild /v:n /t:Build;nuget
+%msbuild% default.msbuild /v:n /t:BuildRelease
 echo -------------------------------
 pause

Src/Build/default.msbuild

 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<SourceDir>$(MSBuildProjectDirectory)\..</SourceDir>
-		<BuildFolder>$(MSBuildProjectDirectory)\Output</BuildFolder>
 		<NugetFolder>$([System.IO.Path]::Combine($(SourceDir), ".nuget"))</NugetFolder>
-		<DeployFolder>$(BuildFolder)\Deploy</DeployFolder>
+		<DeployFolder>$(MSBuildProjectDirectory)\Deploy</DeployFolder>
 		<DocReferencePath>$(SourceDir)\doc\reference</DocReferencePath>
 		<ClassPath>"$(DocReferencePath)\support\lib\*"</ClassPath>
-		<TempDirectory>$(BuildFolder)\temp</TempDirectory>
+		<TempDirectory>$(DeployFolder)\temp</TempDirectory>
 		<TempDoc>$(TempDirectory)\doc.tmp</TempDoc>
 		<OutputDoc>$(DeployFolder)\EnversUserDoc.pdf</OutputDoc>
 		<DeployHtmlFolder>$(DeployFolder)\html</DeployHtmlFolder>
 	</PropertyGroup>
 
-	<ItemGroup Label="Extra files to deploy">
-		<ExtraFiles Include="$(SourceDir)\LGPL_3.0.txt" />
-		<ExtraFiles Include="$(SourceDir)\NHibernate.Envers\bin\Doc\NHibernate.Envers.XML" />
-		<ExtraFiles Include="$(SourceDir)\NHibernate.Envers\bin\$(configuration)\NHibernate.Envers.pdb" />
-		<ExtraFiles Include="$(SourceDir)\ReleaseNotes.txt"/>
-	</ItemGroup>
-
-	<ItemGroup Label="NHibernate dependencies">
-		<NHibernateFiles Include="$(SourceDir)\nhibernate.envers\bin\$(configuration)\NHibernate.dll" />
-		<NHibernateFiles Include="$(SourceDir)\nhibernate.envers\bin\$(configuration)\Iesi.Collections.dll" />
-	</ItemGroup>
-
-	<Target Name="Build" DependsOnTargets="RunHtmlBuild;RunBuild">
+	<Target Name="BuildRelease" DependsOnTargets="RunHtmlBuild;RunBuild;nuget">
 		<RemoveDir Directories="$(TempDirectory)"/>
 	</Target>
 	
-	<Target Name="nuget" DependsOnTargets="Build">
+	<Target Name="nuget" DependsOnTargets="MakeBuildDirectory;RunBuild">
 		<Exec Command="$(NugetFolder)\NuGet pack NHibernate.Envers.nuspec -o $(DeployFolder) -symbols -Prop Configuration=Release"
 				  WorkingDirectory="$(MSBuildProjectDirectory)"/>
 	</Target>
 		<MSBuild Projects="$(SourceDir)\NHibernate.Envers\NHibernate.Envers.csproj" Targets="Clean;Build" />
 	</Target>
 
-	<Target Name="CopyAllFilesToBuild" DependsOnTargets="MakeBuildDirectory;CopyOutputsToBin;CopyExtraFiles"/>
-
 	<Target Name="MakeBuildDirectory">
 		<RemoveDir Directories="$(DeployHtmlFolder)"/>
-		<RemoveDir Directories="$(BuildFolder)" />
-		<MakeDir Directories="$(BuildFolder)" />
+		<RemoveDir Directories="$(DeployFolder)" />
 		<MakeDir Directories="$(DeployFolder)" />
 		<MakeDir Directories="$(TempDirectory)"/>
 		<MakeDir Directories="$(DeployHtmlFolder)"/>
 	</Target>
 
-	<Target Name="CopyOutputsToBin">
-		<Copy SourceFiles="@(OutputFiles)"
-			  DestinationFiles="@(OutputFiles->'$(TempDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
-	</Target>
-
-	<Target Name="CopyExtraFiles">
-		<Copy SourceFiles="@(ExtraFiles)" DestinationFolder="$(DeployFolder)" />
-	</Target>
-
 	<Target Name="BuildDocs" DependsOnTargets="RunPdfBuild;RunHtmlBuild" Condition="'$(configuration)' == 'Release'">
 		<Copy SourceFiles="$(OutputDoc)" DestinationFolder="$(DeployFolder)" />
 		<RemoveDir Directories="$(TempDirectory)" />
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.