diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-04-20 02:05:07 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-04-20 02:05:07 +0300 |
| commit | d0db2e0ab0adaa84df84b3a987cdc3b9b444e7ae (patch) | |
| tree | 75fef636b4676e1c4f8de02cfbabb039cfab033a /packaging | |
| parent | a5fc6c9f0ff518586e50c5bdd1bb33279f8314a6 (diff) | |
[packaging] Apply F# patch that fixes #8310
Upstream patch is at https://github.com/fsharp/fsharp/pull/844
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/MacSDK/fsharp.py | 2 | ||||
| -rw-r--r-- | packaging/MacSDK/patches/fsharp-path-overloads.patch | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/packaging/MacSDK/fsharp.py b/packaging/MacSDK/fsharp.py index e7dfaf25f30..e30ac0f9dd0 100644 --- a/packaging/MacSDK/fsharp.py +++ b/packaging/MacSDK/fsharp.py @@ -8,7 +8,7 @@ class FsharpPackage(GitHubTarballPackage): override_properties={ 'make': 'make' }) self.extra_stage_files = ['lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp/Microsoft.FSharp.Targets'] - self.sources.extend(['patches/fsharp-portable-pdb.patch', 'patches/fsharp-string-switchName.patch']) + self.sources.extend(['patches/fsharp-portable-pdb.patch', 'patches/fsharp-string-switchName.patch', 'patches/fsharp-path-overloads.patch']) def prep(self): Package.prep(self) diff --git a/packaging/MacSDK/patches/fsharp-path-overloads.patch b/packaging/MacSDK/patches/fsharp-path-overloads.patch new file mode 100644 index 00000000000..87b11450edb --- /dev/null +++ b/packaging/MacSDK/patches/fsharp-path-overloads.patch @@ -0,0 +1,22 @@ +diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx +index cc797e305..ae8a6d3cc 100644 +--- a/src/scripts/scriptlib.fsx ++++ b/src/scripts/scriptlib.fsx +@@ -59,12 +59,12 @@ module Scripting = + + let (++) a b = Path.Combine(a,b) + +- let getBasename a = Path.GetFileNameWithoutExtension a +- let getFullPath a = Path.GetFullPath a +- let getFilename a = Path.GetFileName a +- let getDirectoryName a = Path.GetDirectoryName a ++ let getBasename (path: string) = Path.GetFileNameWithoutExtension path ++ let getFullPath (path: string) = Path.GetFullPath path ++ let getFilename (path: string) = Path.GetFileName path ++ let getDirectoryName (path: string) = Path.GetDirectoryName path + +- let copyFile source dir = ++ let copyFile (source: string) dir = + let dest = + if not (Directory.Exists dir) then Directory.CreateDirectory dir |>ignore + let result = Path.Combine(dir, Path.GetFileName source) |