Permalink
Browse files

Fixing build to include documentation

  • Loading branch information...
ayende committed Dec 29, 2009
1 parent 2ffb989 commit 0d1d75149d8f78d4433d83590b0d8c4659034241
Showing with 10 additions and 122 deletions.
  1. +2 −1 Rhino.Etl.Core/Rhino.Etl.Core.csproj
  2. +2 −1 Rhino.Etl.Dsl/Rhino.Etl.Dsl.csproj
  3. +6 −120 default.ps1
@@ -40,7 +40,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DocumentationFile>bin\Debug\Rhino.Etl.Core.XML</DocumentationFile>
+ <DocumentationFile>Rhino.Etl.Core.XML</DocumentationFile>
<NoWarn>1607</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -50,6 +50,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <DocumentationFile>Rhino.Etl.Core.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Boo.Lang, Version=2.0.0.0, Culture=neutral, PublicKeyToken=32c39770e9a21a67, processorArchitecture=MSIL">
@@ -40,7 +40,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DocumentationFile>bin\Debug\Rhino.Etl.Dsl.XML</DocumentationFile>
+ <DocumentationFile>Rhino.Etl.Dsl.XML</DocumentationFile>
<NoWarn>1607</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -50,6 +50,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <DocumentationFile>Rhino.Etl.Dsl.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Boo.Lang, Version=2.0.0.0, Culture=neutral, PublicKeyToken=32c39770e9a21a67, processorArchitecture=MSIL">
View
@@ -1,119 +1,3 @@
-<<<<<<< HEAD
-properties {
- $base_dir = resolve-path .
- $lib_dir = "$base_dir\SharedLibs"
- $build_dir = "$base_dir\build"
- $buildartifacts_dir = "$build_dir\"
- $sln_file = "$base_dir\Rhino.Etl.sln"
- $version = "1.0.0.0"
- $humanReadableversion = "1.0"
- $tools_dir = "$base_dir\Tools"
- $release_dir = "$base_dir\Release"
- $uploadCategory = "Rhino-ETL"
- $uploadScript = "C:\Builds\Uploader\PublishBuild.build"
-}
-
-task default -depends Release
-
-task Clean {
- remove-item -force -recurse $buildartifacts_dir -ErrorAction SilentlyContinue
- remove-item -force -recurse $release_dir -ErrorAction SilentlyContinue
-}
-
-task Init -depends Clean {
- . .\psake_ext.ps1
- Generate-Assembly-Info `
- -file "$base_dir\Rhino.Etl.Core\Properties\AssemblyInfo.cs" `
- -title "Rhino ETL $version" `
- -description "Developer freindly ETL Library for .NET" `
- -company "Hibernating Rhinos" `
- -product "Developer freindly ETL Library for .NET $version" `
- -version $version `
- -clsCompliant "false" `
- -copyright "Hibernating Rhinos & Ayende Rahien 2007 - 2009"
-
- Generate-Assembly-Info `
- -file "$base_dir\Rhino.Etl.Dsl\Properties\AssemblyInfo.cs" `
- -title "Rhino ETL DSL $version" `
- -description "Developer freindly ETL Library for .NET" `
- -company "Hibernating Rhinos" `
- -product "Developer freindly ETL Library for .NET $version" `
- -version $version `
- -clsCompliant "false" `
- -copyright "Hibernating Rhinos & Ayende Rahien 2007 - 2009"
-
- Generate-Assembly-Info `
- -file "$base_dir\Rhino.Etl.Tests\Properties\AssemblyInfo.cs" `
- -title "Rhino ETL Tests $version" `
- -description "Developer freindly ETL Library for .NET" `
- -company "Hibernating Rhinos" `
- -product "Developer freindly ETL Library for .NET $version" `
- -version $version `
- -clsCompliant "false" `
- -copyright "Hibernating Rhinos & Ayende Rahien 2007 - 2009"
-
- Generate-Assembly-Info `
- -file "$base_dir\Rhino.Etl.Cmd\Properties\AssemblyInfo.cs" `
- -title "Rhino ETL Command Line $version" `
- -description "Developer freindly ETL Library for .NET" `
- -company "Hibernating Rhinos" `
- -product "Developer freindly ETL Library for .NET $version" `
- -version $version `
- -clsCompliant "false" `
- -copyright "Hibernating Rhinos & Ayende Rahien 2007 - 2009"
-
-
- new-item $release_dir -itemType directory
- new-item $buildartifacts_dir -itemType directory
- cp $tools_dir\MbUnit\*.* $build_dir
-}
-
-task Compile -depends Init {
- & msbuild "$sln_file" "/p:OutDir=$build_dir\\" /p:Configuration=Release
- if ($lastExitCode -ne 0) {
- throw "Error: Failed to execute msbuild"
- }
-}
-
-task Test -depends Compile {
- $old = pwd
- cd $build_dir
- &.\MbUnit.Cons.exe /rf:$build_dir /rnf:TestResults /rt:Html "$build_dir\Rhino.Etl.Tests.dll"
- if ($lastExitCode -ne 0) {
- throw "Error: Failed to execute tests"
- }
- cd $old
-}
-
-task Release -depends Test {
- & $tools_dir\zip.exe -9 -A -j $release_dir\Rhino.Etl-$humanReadableversion-Build-$env:ccnetnumericlabel.zip `
- $build_dir\Rhino.Etl.Core.dll `
- $build_dir\Rhino.Etl.Dsl.dll `
- $build_dir\Rhino.Etl.Cmd.exe `
- Rhino.Etl.Core\bin\debug\Rhino.Etl.Core.xml `
- Rhino.Etl.Dsl\bin\debug\Rhino.Etl.Dsl.xml `
- $build_dir\Boo.* `
- $build_dir\FileHelpers.dll `
- license.txt `
- acknowledgements.txt
- if ($lastExitCode -ne 0) {
- throw "Error: Failed to execute ZIP command"
- }
-}
-
-task Upload -depend Release {
- if (Test-Path $uploadScript ) {
- $log = git log -n 1 --oneline
- msbuild $uploadScript /p:Category=$uploadCategory "/p:Comment=$log" "/p:File=$release_dir\Rhino.ETL-$humanReadableversion-Build-$env:ccnetnumericlabel.zip"
-
- if ($lastExitCode -ne 0) {
- throw "Error: Failed to publish build"
- }
- }
- else {
- Write-Host "could not find upload script $uploadScript, skipping upload"
- }
-=======
properties {
$base_dir = resolve-path .
$lib_dir = "$base_dir\SharedLibs"
@@ -184,7 +68,10 @@ task Init -depends Clean {
}
task Compile -depends Init {
- exec msbuild "/p:OutDir=""$buildartifacts_dir "" $sln_file"
+ & msbuild "$sln_file" "/p:OutDir=$build_dir\\" /p:Configuration=Release
+ if ($lastExitCode -ne 0) {
+ throw "Error: Failed to execute msbuild"
+ }
}
task Test -depends Compile {
@@ -202,8 +89,8 @@ task Release -depends Test {
$build_dir\Rhino.Etl.Core.dll `
$build_dir\Rhino.Etl.Dsl.dll `
$build_dir\Rhino.Etl.Cmd.exe `
- $build_dir\Rhino.Etl.Core.xml `
- $build_dir\Rhino.Etl.Dsl.xml `
+ Rhino.Etl.Core\Rhino.Etl.Core.xml `
+ Rhino.Etl.Dsl\Rhino.Etl.Dsl.xml `
$build_dir\Boo.* `
$build_dir\FileHelpers.dll `
license.txt `
@@ -225,5 +112,4 @@ task Upload -depend Release {
else {
Write-Host "could not find upload script $uploadScript, skipping upload"
}
->>>>>>> 6c857e7cdefaa875e3345e89eefc4ee79afbbdc4
}

0 comments on commit 0d1d751

Please sign in to comment.