diff options
| author | Alexis Christoforides <alexis@thenull.net> | 2015-07-31 18:36:13 +0300 |
|---|---|---|
| committer | Alexis Christoforides <alexis@thenull.net> | 2015-07-31 18:36:13 +0300 |
| commit | 311d6d3667de58608747f53880e5b910ef19fa04 (patch) | |
| tree | 1e8748c1bd4d746df36b4ad7873123eaeb0ca648 | |
| parent | d17f70fdfa4dac0d31c68f30b7ee35886bef6bfe (diff) | |
Bump F# -> 4.0.0.1
And clean up package files.
| -rw-r--r-- | packages/fsharp-3.0.py | 15 | ||||
| -rw-r--r-- | packages/fsharp-3.1.py | 26 | ||||
| -rw-r--r-- | packages/fsharp.py | 24 | ||||
| -rw-r--r-- | profiles/mono-mac-release/packages.py | 2 |
4 files changed, 18 insertions, 49 deletions
diff --git a/packages/fsharp-3.0.py b/packages/fsharp-3.0.py deleted file mode 100644 index 0501ecf..0000000 --- a/packages/fsharp-3.0.py +++ /dev/null @@ -1,15 +0,0 @@ - -class Fsharp30Package(GitHubTarballPackage): - def __init__(self): - GitHubTarballPackage.__init__(self, - 'fsharp', 'fsharp', - '3.0.34', - 'b0c16bb496fbc4df88b56957efc70c80c8624d2d', - configure = '') - - def build(self): - self.sh ('autoreconf') - self.sh ('./configure --prefix="%{prefix}"') - self.sh ('make') - -Fsharp30Package() diff --git a/packages/fsharp-3.1.py b/packages/fsharp-3.1.py deleted file mode 100644 index f10b207..0000000 --- a/packages/fsharp-3.1.py +++ /dev/null @@ -1,26 +0,0 @@ - -class Fsharp31Package(GitHubTarballPackage): - def __init__(self): - GitHubTarballPackage.__init__(self, - 'fsharp', 'fsharp', - '3.1.1.31', - '1f79c0455fb8b5ec816985f922413894ce19359a', - configure = './configure --prefix="%{package_prefix}"') - self.sources.extend ([ - 'patches/fsharp-fix-net45-profile.patch']) - - self.extra_stage_files = ['lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp/Microsoft.FSharp.Targets'] - - def prep(self): - Package.prep (self) - - for p in range (1, len (self.sources)): - self.sh ('patch -p1 < "%{local_sources[' + str (p) + ']}"') - - - def build(self): - self.sh ('autoreconf') - Package.configure (self) - Package.make (self) - -Fsharp31Package() diff --git a/packages/fsharp.py b/packages/fsharp.py index 34aa161..e381d65 100644 --- a/packages/fsharp.py +++ b/packages/fsharp.py @@ -1,15 +1,25 @@ - class FsharpPackage(GitHubTarballPackage): def __init__(self): GitHubTarballPackage.__init__(self, 'fsharp', 'fsharp', - '2.11', - '6d4f78d60b8ca8158a10e348ffc0a050095a18f6', - configure = '') + '4.0.0.1', + 'c3aaf7d5f1f8905bbb3522b327703a43a0842cdf', + configure = './configure --prefix="%{package_prefix}"') + self.sources.extend ([ + 'patches/fsharp-fix-net45-profile.patch']) + + self.extra_stage_files = ['lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp/Microsoft.FSharp.Targets'] + + def prep(self): + Package.prep (self) + + for p in range (1, len (self.sources)): + self.sh ('patch -p1 < "%{local_sources[' + str (p) + ']}"') + def build(self): self.sh ('autoreconf') - self.sh ('./configure --prefix="%{prefix}"') - self.sh ('make') + Package.configure (self) + Package.make (self) -FsharpPackage() +FsharpPackage()
\ No newline at end of file diff --git a/profiles/mono-mac-release/packages.py b/profiles/mono-mac-release/packages.py index 94169ff..22d0664 100644 --- a/profiles/mono-mac-release/packages.py +++ b/profiles/mono-mac-release/packages.py @@ -69,7 +69,7 @@ class MonoReleasePackages: 'xsp.py', 'gtk-sharp-2.12-release-net4.5.py', 'ironlangs.py', - 'fsharp-3.1.py', + 'fsharp.py', 'mono-basic.py', 'nuget.py' ]) |