Skip to content

Commit

Permalink
Use Paket for package creation and push
Browse files Browse the repository at this point in the history
  • Loading branch information
forki committed Mar 12, 2015
1 parent a297342 commit 18fcad5
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 50 deletions.
2 changes: 1 addition & 1 deletion FsReveal.sln
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60BC93-E09B-4E5F-9D85-95A519479D54}"
ProjectSection(SolutionItems) = preProject
build.fsx = build.fsx
nuget\FsReveal.nuspec = nuget\FsReveal.nuspec
LICENSE.txt = LICENSE.txt
nuget\paket.template = nuget\paket.template
README.md = README.md
RELEASE_NOTES.md = RELEASE_NOTES.md
EndProjectSection
Expand Down
28 changes: 12 additions & 16 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -158,22 +158,17 @@ Target "SourceLink" (fun _ ->
// --------------------------------------------------------------------------------------
// Build a NuGet package

Target "NuGet" (fun _ ->
NuGet (fun p ->
{ p with Authors = authors
Project = project
Summary = summary
Description = description
Version = release.NugetVersion
ReleaseNotes = toLines release.Notes
Tags = tags
OutputPath = "bin"
AccessKey = getBuildParamOrDefault "nugetkey" ""
Publish = hasBuildParam "nugetkey"
Dependencies =
["FSharp.Formatting", GetPackageVersion "packages" "FSharp.Formatting"
"FSharpVSPowerTools.Core", GetPackageVersion "packages" "FSharpVSPowerTools.Core"] })
("nuget/" + project + ".nuspec")
Target "NuGet" (fun _ ->
Paket.Pack (fun p ->
{ p with
Version = release.NugetVersion
ReleaseNotes = toLines release.Notes })
)

Target "PublishNuGet" (fun _ ->
Paket.Push (fun p ->
{ p with
ToolPath = "bin/merged/paket.exe" })
)

// --------------------------------------------------------------------------------------
Expand Down Expand Up @@ -301,6 +296,7 @@ Target "All" DoNothing
==> "Release"

"BuildPackage"
==> "PublishNuGet"
==> "Release"

RunTargetOrDefault "All"
29 changes: 0 additions & 29 deletions nuget/FsReveal.nuspec

This file was deleted.

20 changes: 20 additions & 0 deletions nuget/paket.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
type file
id FsReveal
description
FsReveal parses markdown or F# script files and generates reveal.js slides.
authors
Karlkim Suwanmongkol
licenseurl http://fsprojects.github.io/FsReveal/license.html
projecturl https://github.com/fsprojects/FsReveal
iconurl http://fsprojects.github.io/FsReveal/img/logo-2.png
tags
F#, markdown, reveal.js
files
../bin/FsReveal.* ==> lib/net40
../bin/FSharp.Compiler.Interactive.Settings.dll ==> lib/net40
../paket-files/hakimel/reveal.js/**/*.* ==> reveal.js
../src/FsReveal/style.css ==> reveal.js/fsharp.formatting/styles
../src/FsReveal/tips.js ==> reveal.js/fsharp.formatting/styles
../src/FsReveal/deedle.css ==> reveal.js/fsharp.formatting/styles
../src/FsReveal/template.html ==> fsreveal
../src/FsReveal/fsreveal.fsx ==> fsreveal
3 changes: 1 addition & 2 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ nuget FAKE
nuget SourceLink.Fake
nuget FSharp.Formatting
nuget NUnit
nuget NUnit.Runners
nuget Nuget.CommandLine
nuget NUnit.Runners

github hakimel/reveal.js:3.0.0
github forki/FsUnit FsUnit.fs
Expand Down
1 change: 0 additions & 1 deletion paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ NUGET
Microsoft.Net.Http (2.2.29)
Microsoft.Bcl (>= 1.1.10)
Microsoft.Bcl.Build (>= 1.0.14)
NuGet.CommandLine (2.8.3)
NUnit (2.6.4)
NUnit.Runners (2.6.4)
Octokit (0.7.3)
Expand Down
2 changes: 1 addition & 1 deletion src/FsReveal/FsReveal.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<Compile Include="Formatting.fs" />
<Compile Include="FsReveal.fs" />
<None Include="template.html" />
<None Include="FsReveal.fsx" />
<None Include="fsreveal.fsx" />
<None Include="paket.references" />
</ItemGroup>
<PropertyGroup>
Expand Down
File renamed without changes.

0 comments on commit 18fcad5

Please sign in to comment.