Skip to content

Commit 839bab6

Browse files
committed
Merge pull request #462 from forki/paketpack
Use Paket to create Nuget packages
2 parents 3291102 + fdea4e1 commit 839bab6

File tree

8 files changed

+39
-48
lines changed

8 files changed

+39
-48
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ sudo: false
55
install:
66

77
script:
8-
- ./build.sh
8+
- ./build.sh NuGet

FSharp.Compiler.Service.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{B6B6
77
build.fsx = build.fsx
88
nuget\FSharp.Compiler.Service.nuspec = nuget\FSharp.Compiler.Service.nuspec
99
paket.dependencies = paket.dependencies
10+
nuget\paket.template = nuget\paket.template
1011
README.md = README.md
1112
RELEASE_NOTES.md = RELEASE_NOTES.md
1213
EndProjectSection

build.fsx

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ open SourceLink
2020

2121
let project = "FSharp.Compiler.Service"
2222
let authors = ["Microsoft Corporation, Dave Thomas, Anh-Dung Phan, Tomas Petricek"]
23-
let summary = "F# compiler services for creating IDE tools, language extensions and for F# embedding"
24-
let description = """
25-
The F# compiler services package contains a custom build of the F# compiler that
26-
exposes additional functionality for implementing F# language bindings, additional
27-
tools based on the compiler or refactoring tools. The package also includes F#
28-
interactive service that can be used for embedding F# scripting into your applications."""
29-
let tags = "F# fsharp interactive compiler editor"
3023

3124
let gitOwner = "fsharp"
3225
let gitHome = "https://github.com/" + gitOwner
@@ -142,19 +135,19 @@ Target "RunTests" (fun _ ->
142135
// Build a NuGet package
143136

144137
Target "NuGet" (fun _ ->
145-
NuGet (fun p ->
138+
Paket.Pack (fun p ->
146139
{ p with
147-
Authors = authors
148-
Project = project
149-
Summary = summary
150-
Description = description
151-
Version = buildVersion
152-
ReleaseNotes = release.Notes |> toLines
153-
Tags = tags
140+
TemplateFile = "nuget/paket.template"
141+
Version = release.NugetVersion
154142
OutputPath = buildDir
155-
AccessKey = getBuildParamOrDefault "nugetkey" ""
156-
Publish = hasBuildParam "nugetkey" })
157-
("nuget/" + project + ".nuspec")
143+
ReleaseNotes = toLines release.Notes })
144+
)
145+
146+
147+
Target "PublishNuGet" (fun _ ->
148+
Paket.Push (fun p ->
149+
{ p with
150+
WorkingDir = buildDir })
158151
)
159152

160153
// --------------------------------------------------------------------------------------
@@ -241,6 +234,7 @@ Target "All" DoNothing
241234
==> "GenerateDocsJa"
242235
==> "GenerateDocs"
243236
==> "ReleaseDocs"
237+
==> "PublishNuGet"
244238
==> "Release"
245239

246240
RunTargetOrDefault "All"

nuget/FSharp.Compiler.Service.nuspec

Lines changed: 0 additions & 26 deletions
This file was deleted.

nuget/paket.template

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
type file
2+
id FSharp.Compiler.Service
3+
description
4+
The F# compiler services package contains a custom build of the F# compiler that
5+
exposes additional functionality for implementing F# language bindings, additional
6+
tools based on the compiler or refactoring tools. The package also includes F#
7+
interactive service that can be used for embedding F# scripting into your applications.
8+
authors
9+
Microsoft Corporation, Dave Thomas, Anh-Dung Phan, Tomas Petricek
10+
summary
11+
F# compiler services for creating IDE tools, language extensions and for F# embedding.
12+
licenseurl https://github.com/fsharp/FSharp.Compiler.Service/blob/master/LICENSE
13+
projecturl https://github.com/fsharp/FSharp.Compiler.Service
14+
iconurl https://raw.github.com/fsharp/FSharp.Compiler.Service/master/misc/logo.png
15+
tags
16+
F#, fsharp, interactive, compiler, editor
17+
files
18+
../bin/v4.0/FSharp.Compiler.Service.dll ==> lib/net40
19+
../bin/v4.0/FSharp.Compiler.Service.XML ==> lib/net40
20+
../bin/v4.0/FSharp.Compiler.Service.?db ==> lib/net40
21+
../bin/v4.0/FSharp.Compiler.Service.dll.?db ==> lib/net40
22+
../bin/v4.5/FSharp.Compiler.Service.dll ==> lib/net45
23+
../bin/v4.5/FSharp.Compiler.Service.XML ==> lib/net45
24+
../bin/v4.5/FSharp.Compiler.Service.?db ==> lib/net45
25+
../bin/v4.5/FSharp.Compiler.Service.dll.?db ==> lib/net45

nuget/publish.cmd

Lines changed: 0 additions & 1 deletion
This file was deleted.

paket.dependencies

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ nuget SQLite.Net-PCL 3.0.5
66
nuget SQLite.Net.Platform.Generic 2.4.1
77

88
# build dependencies
9-
nuget NuGet.CommandLine
109
nuget FAKE
1110
nuget FSharp.Formatting
1211
nuget SourceLink.Fake

paket.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ NUGET
1414
Microsoft.Net.Http (2.2.29)
1515
Microsoft.Bcl (>= 1.1.10)
1616
Microsoft.Bcl.Build (>= 1.0.14)
17-
NuGet.CommandLine (2.8.6)
1817
NUnit (2.6.3)
1918
NUnit.Runners (2.6.3)
2019
Octokit (0.14.0) - framework: wpv8.0

0 commit comments

Comments
 (0)