Skip to content

Commit

Permalink
Merge pull request #180 from dirkrombauts/Get-rid-of-nAnt
Browse files Browse the repository at this point in the history
Get rid of nAnt
  • Loading branch information
dirkrombauts committed Dec 11, 2014
2 parents 4964aff + 7707b9d commit 246f112
Show file tree
Hide file tree
Showing 52 changed files with 4 additions and 34,447 deletions.
15 changes: 3 additions & 12 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,18 @@ open Fake.AssemblyInfoFile
let buildDir = "./build/"
let cmdDir = "./build/exe/"
let msBuildDir = "./build/msbuild/"
let nantDir = "./build/nant/"
let powerShellDir = "./build/powershell/"
let guiDir = "./build/gui/"
let testDir = "./test/"
let deployDir = "./deploy/"

// version info
let version = environVar "version" // or retrieve from CI server


// Targets
Target "Clean" (fun _ ->
CleanDirs [cmdDir; msBuildDir; nantDir; powerShellDir; guiDir; buildDir; testDir; deployDir]
CleanDirs [cmdDir; msBuildDir; powerShellDir; guiDir; buildDir; testDir; deployDir]
)

Target "AssemblyInfo" (fun _ ->
Expand All @@ -46,12 +45,6 @@ Target "BuildMsBuild" (fun _ ->
|> Log "AppBuild-Output: "
)

Target "BuildNAnt" (fun _ ->
!! "src/Pickles/Pickles.NAnt/Pickles.NAnt.csproj"
|> MSBuildRelease nantDir "Build"
|> Log "AppBuild-Output: "
)

Target "BuildPowerShell" (fun _ ->
!! "src/Pickles/Pickles.PowerShell/Pickles.PowerShell.csproj"
|> MSBuildRelease powerShellDir "Build"
Expand All @@ -70,15 +63,14 @@ Target "BuildTest" (fun _ ->
|> Log "AppBuild-Output: "
)

let createZip (packageType : string) =
let createZip (packageType : string) =
!! (buildDir + "/" + packageType + "/*.*") -- "*.zip"
|> Zip (buildDir + packageType) (deployDir + "Pickles-" + packageType + "-" + version + ".zip")

Target "Zip" (fun _ ->
createZip "exe"
createZip "gui"
createZip "msbuild"
createZip "nant"
createZip "powershell"
)

Expand All @@ -92,7 +84,6 @@ Target "Default" (fun _ ->
==> "AssemblyInfo"
==> "BuildCmd"
==> "BuildMsBuild"
==> "BuildNAnt"
==> "BuildPowerShell"
==> "BuildGui"
==> "BuildTest"
Expand Down
1 change: 0 additions & 1 deletion src/Pickles/Pickles.NAnt/NugetPack.cmd

This file was deleted.

80 changes: 0 additions & 80 deletions src/Pickles/Pickles.NAnt/Pickles.NAnt.csproj

This file was deleted.

22 changes: 0 additions & 22 deletions src/Pickles/Pickles.NAnt/Pickles.NAnt.ncrunchproject

This file was deleted.

22 changes: 0 additions & 22 deletions src/Pickles/Pickles.NAnt/Pickles.NAnt.v2.ncrunchproject

This file was deleted.

108 changes: 0 additions & 108 deletions src/Pickles/Pickles.NAnt/Pickles.cs

This file was deleted.

4 changes: 0 additions & 4 deletions src/Pickles/Pickles.NAnt/Properties/AssemblyInfo.cs

This file was deleted.

1 change: 0 additions & 1 deletion src/Pickles/Pickles.NAnt/Settings.StyleCop

This file was deleted.

5 changes: 0 additions & 5 deletions src/Pickles/Pickles.NAnt/packages.config

This file was deleted.

7 changes: 0 additions & 7 deletions src/Pickles/Pickles.sln
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Runners", "Runners", "{4E97
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pickles.MSBuild", "Pickles.MSBuild\Pickles.MSBuild.csproj", "{67DD16BD-E76B-475E-878C-7F54D9358730}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pickles.NAnt", "Pickles.NAnt\Pickles.NAnt.csproj", "{83D5827A-8806-4B9E-9410-73CD2A284E3C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pickles.CommandLine", "Pickles.CommandLine\Pickles.CommandLine.csproj", "{A4EBBB5F-A18D-46D2-9ADE-2B90BD48CEC8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pickles.PowerShell", "Pickles.PowerShell\Pickles.PowerShell.csproj", "{AD9F6DD1-5C76-45C9-9FF9-DAE37DB7B2D4}"
Expand Down Expand Up @@ -78,10 +76,6 @@ Global
{67DD16BD-E76B-475E-878C-7F54D9358730}.Debug|Any CPU.Build.0 = Debug|Any CPU
{67DD16BD-E76B-475E-878C-7F54D9358730}.Release|Any CPU.ActiveCfg = Release|Any CPU
{67DD16BD-E76B-475E-878C-7F54D9358730}.Release|Any CPU.Build.0 = Release|Any CPU
{83D5827A-8806-4B9E-9410-73CD2A284E3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{83D5827A-8806-4B9E-9410-73CD2A284E3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{83D5827A-8806-4B9E-9410-73CD2A284E3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{83D5827A-8806-4B9E-9410-73CD2A284E3C}.Release|Any CPU.Build.0 = Release|Any CPU
{A4EBBB5F-A18D-46D2-9ADE-2B90BD48CEC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A4EBBB5F-A18D-46D2-9ADE-2B90BD48CEC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4EBBB5F-A18D-46D2-9ADE-2B90BD48CEC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -104,7 +98,6 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{67DD16BD-E76B-475E-878C-7F54D9358730} = {4E977674-6919-4F15-A6E3-37BFAC18C7E5}
{83D5827A-8806-4B9E-9410-73CD2A284E3C} = {4E977674-6919-4F15-A6E3-37BFAC18C7E5}
{A4EBBB5F-A18D-46D2-9ADE-2B90BD48CEC8} = {4E977674-6919-4F15-A6E3-37BFAC18C7E5}
{AD9F6DD1-5C76-45C9-9FF9-DAE37DB7B2D4} = {4E977674-6919-4F15-A6E3-37BFAC18C7E5}
{F3768CCA-00C2-4280-9F8D-4585B5E214B1} = {4E977674-6919-4F15-A6E3-37BFAC18C7E5}
Expand Down
Loading

0 comments on commit 246f112

Please sign in to comment.