[Pkg-cli-apps-commits] [fsharp] 03/04: Drop FSharp.Build.dll & FSharp.Compiler.* from the GAC and bundle them into the fsharp package.
Christopher Halse Rogers
raof-guest at moszumanska.debian.org
Sun Feb 9 05:27:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
raof-guest pushed a commit to branch master
in repository fsharp.
commit ad0c8e894775986c69ccce4f03660226c9afb272
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date: Sun Feb 9 13:54:42 2014 +1100
Drop FSharp.Build.dll & FSharp.Compiler.* from the GAC and bundle them into the fsharp package.
They're not GACed on Windows, and the tools want to all live in the same directory
---
debian/control | 69 +---------------------
debian/fsharp-console.install | 2 -
debian/fsharp-console.installcliframework | 6 --
debian/fsharp-console.links | 1 -
debian/fsharp.install | 10 +++-
debian/fsharp.installcliframework | 16 ++++-
debian/fsharp.links | 4 --
debian/libfsharp-build4.3-cil.install | 1 -
debian/libfsharp-build4.3-cil.installcligac | 1 -
...rp-compiler-interactive-settings4.3-cil.install | 1 -
...piler-interactive-settings4.3-cil.installcligac | 1 -
...libfsharp-compiler-server-shared4.3-cil.install | 1 -
...arp-compiler-server-shared4.3-cil.installcligac | 1 -
debian/libfsharp-compiler4.3-cil.install | 1 -
debian/libfsharp-compiler4.3-cil.installcligac | 1 -
debian/patches/debian-cli-policy.patch | 7 +--
16 files changed, 26 insertions(+), 97 deletions(-)
diff --git a/debian/control b/debian/control
index 42d1060..f001270 100644
--- a/debian/control
+++ b/debian/control
@@ -18,79 +18,14 @@ Depends:
${cli:Depends},
${shlibs:Depends},
${misc:Depends},
- fsharp-console
+Breaks: fsharp-console (<< 3.0.34+dfsg-3)
+Replaces: fsharp-console (<< 3.0.34+dfsg-3)
Description: functional-first programming language - compiler for the CLI
F# is a multi-paradigm programming language, supporting functional,
imperative, and object-oriented structures.
.
This package contains an F# compiler targeting the CLI runtime.
-Package: fsharp-console
-Architecture: all
-Depends:
- fsharp,
- libfsharp-compiler-interactive-settings4.3-cil (= ${binary:Version}),
- libmono-compilerservices-symbolwriter4.0-cil,
- ${cli:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-Description: functional-first programming language - interactive compiler
- F# is a multi-paradigm programming language, supporting functional,
- imperative, and object-oriented structures.
- .
- This package contains an interactive F# console targeting the CLI runtime.
-
-Package: libfsharp-build4.3-cil
-Architecture: all
-Depends:
- ${cli:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-Description: functional-first programming language - build configuration
- F# is a multi-paradigm programming language, supporting functional,
- imperative, and object-oriented structures.
- .
- This package contains a runtime library with build configuration information.
-
-Package: libfsharp-compiler4.3-cil
-Architecture: all
-Depends:
- ${cli:Depends},
- ${shlibs:Depends},
- ${misc:Depends},
-Description: functional-first programming language - compiler library
- F# is a multi-paradigm programming language, supporting functional,
- imperative, and object-oriented structures.
- .
- This package contains a runtime library with helper routines for an
- F# compiler
-
-Package: libfsharp-compiler-interactive-settings4.3-cil
-Architecture: all
-Depends:
- ${cli:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-Description: functional-first programming language - interactive configuration
- F# is a multi-paradigm programming language, supporting functional,
- imperative, and object-oriented structures.
- .
- This package contains a runtime library with configuration routines for an
- interactive F# session
-
-Package: libfsharp-compiler-server-shared4.3-cil
-Architecture: all
-Depends:
- ${cli:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-Description: functional-first programming language - server interaction library
- F# is a multi-paradigm programming language, supporting functional,
- imperative, and object-oriented structures.
- .
- This package contains a runtime library with routines for interacting with
- a shared interactive F# compiler service
-
Package: libfsharp-core4.3-cil
Architecture: all
Depends:
diff --git a/debian/fsharp-console.install b/debian/fsharp-console.install
deleted file mode 100644
index 13c27a7..0000000
--- a/debian/fsharp-console.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/fsharpi
-usr/lib/mono/gac/fsi/4.3*/* /usr/lib/cli/fsharp-console
diff --git a/debian/fsharp-console.installcliframework b/debian/fsharp-console.installcliframework
deleted file mode 100644
index f44b9a5..0000000
--- a/debian/fsharp-console.installcliframework
+++ /dev/null
@@ -1,6 +0,0 @@
-40 /usr/lib/cli/FSharp.Compiler.Interactive.Settings-4.3/FSharp.Compiler.Interactive.Settings.dll
-45 /usr/lib/cli/FSharp.Compiler.Interactive.Settings-4.3/FSharp.Compiler.Interactive.Settings.dll
-
-# Add the interpreter binary, as tools may look for it here.
-40 /usr/lib/cli/fsharp-console/fsi.exe
-45 /usr/lib/cli/fsharp-console/fsi.exe
diff --git a/debian/fsharp-console.links b/debian/fsharp-console.links
deleted file mode 100644
index 45e746c..0000000
--- a/debian/fsharp-console.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/cli/FSharp.Compiler.Interactive.Settings-4.3/FSharp.Compiler.Interactive.Settings.dll usr/lib/cli/fsharp-console/FSharp.Compiler.Interactive.Settings.dll
diff --git a/debian/fsharp.install b/debian/fsharp.install
index 06b00fb..0177e61 100644
--- a/debian/fsharp.install
+++ b/debian/fsharp.install
@@ -1,6 +1,12 @@
usr/bin/fsharpc
-usr/lib/mono/gac/fsc/4.3*/* /usr/lib/cli/fsharp
+usr/bin/fsharpi
+usr/lib/mono/gac/fsc/4.3*/* /usr/lib/cli/fsharp
+usr/lib/mono/gac/fsi/4.3*/* /usr/lib/cli/fsharp
usr/lib/mono/Microsoft?F#
usr/lib/mono/Microsoft?SDKs
usr/lib/mono/xbuild
-usr/lib/mono/4.0/Microsoft.*.Targets
+usr/lib/mono/4.0/Microsoft.*.Targets /usr/lib/cli/fsharp
+usr/lib/mono/gac/FSharp.Build/4.3*/* /usr/lib/cli/fsharp
+usr/lib/mono/gac/FSharp.Compiler.Interactive.Settings/4.3*/* /usr/lib/cli/fsharp
+usr/lib/mono/gac/FSharp.Compiler.Server.Shared/4.3*/* /usr/lib/cli/fsharp
+usr/lib/mono/gac/FSharp.Compiler/4.3*/* /usr/lib/cli/fsharp
diff --git a/debian/fsharp.installcliframework b/debian/fsharp.installcliframework
index 8a5d4e9..bc567d7 100644
--- a/debian/fsharp.installcliframework
+++ b/debian/fsharp.installcliframework
@@ -8,8 +8,20 @@
45 /usr/lib/cli/FSharp.Core-4.3/FSharp.Core.optdata
# Build targets for xbuild support
-40 /usr/lib/cli/FSharp.Build-4.3/FSharp.Build.dll
+40 /usr/lib/cli/fsharp/FSharp.Build.dll
+40 /usr/lib/cli/fsharp/Microsoft.FSharp.Targets
+40 /usr/lib/cli/fsharp/Microsoft.Portable.FSharp.Targets
+
+## The lines above are mandatory for correct functionality
+## The lines below are optional - these replicate the upstream
+## layout, but aren't used by any tools I'm aware of.
# Add the compiler binary, as tools may look for it here
40 /usr/lib/cli/fsharp/fsc.exe
-45 /usr/lib/cli/fsharp/fsc.exe
+40 /usr/lib/cli/fsharp/fsi.exe
+
+# Compiler infrastructure
+40 /usr/lib/cli/fsharp/FSharp.Compiler.dll
+40 /usr/lib/cli/fsharp/FSharp.Compiler.Interactive.Settings.dll
+40 /usr/lib/cli/fsharp/FSharp.Compiler.Server.Shared.dll
+
diff --git a/debian/fsharp.links b/debian/fsharp.links
deleted file mode 100644
index a53e63a..0000000
--- a/debian/fsharp.links
+++ /dev/null
@@ -1,4 +0,0 @@
-# F#'s compiler resolution logic is twine and duct tape. Until it's fixed
-# ensure it can resolve fsc.exe in the same place as fsi.exe
-
-usr/lib/cli/fsharp/fsc.exe usr/lib/cli/fsharp-console/fsc.exe
diff --git a/debian/libfsharp-build4.3-cil.install b/debian/libfsharp-build4.3-cil.install
deleted file mode 100644
index 097a4ce..0000000
--- a/debian/libfsharp-build4.3-cil.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/mono/gac/FSharp.Build/4.3*/* /usr/lib/cli/FSharp.Build-4.3
diff --git a/debian/libfsharp-build4.3-cil.installcligac b/debian/libfsharp-build4.3-cil.installcligac
deleted file mode 100644
index e2cb2ce..0000000
--- a/debian/libfsharp-build4.3-cil.installcligac
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/cli/FSharp.Build-4.3/FSharp.Build.dll
diff --git a/debian/libfsharp-compiler-interactive-settings4.3-cil.install b/debian/libfsharp-compiler-interactive-settings4.3-cil.install
deleted file mode 100644
index 819601d..0000000
--- a/debian/libfsharp-compiler-interactive-settings4.3-cil.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/mono/gac/FSharp.Compiler.Interactive.Settings/4.3*/* /usr/lib/cli/FSharp.Compiler.Interactive.Settings-4.3
diff --git a/debian/libfsharp-compiler-interactive-settings4.3-cil.installcligac b/debian/libfsharp-compiler-interactive-settings4.3-cil.installcligac
deleted file mode 100644
index f7ab5fc..0000000
--- a/debian/libfsharp-compiler-interactive-settings4.3-cil.installcligac
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/cli/FSharp.Compiler.Interactive.Settings-4.3/FSharp.Compiler.Interactive.Settings.dll
diff --git a/debian/libfsharp-compiler-server-shared4.3-cil.install b/debian/libfsharp-compiler-server-shared4.3-cil.install
deleted file mode 100644
index 8f16565..0000000
--- a/debian/libfsharp-compiler-server-shared4.3-cil.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/mono/gac/FSharp.Compiler.Server.Shared/4.3*/* /usr/lib/cli/FSharp.Compiler.Server.Shared-4.3
diff --git a/debian/libfsharp-compiler-server-shared4.3-cil.installcligac b/debian/libfsharp-compiler-server-shared4.3-cil.installcligac
deleted file mode 100644
index 3d9728d..0000000
--- a/debian/libfsharp-compiler-server-shared4.3-cil.installcligac
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/cli/FSharp.Compiler.Server.Shared-4.3/FSharp.Compiler.Server.Shared.dll
diff --git a/debian/libfsharp-compiler4.3-cil.install b/debian/libfsharp-compiler4.3-cil.install
deleted file mode 100644
index 2acf364..0000000
--- a/debian/libfsharp-compiler4.3-cil.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/mono/gac/FSharp.Compiler/4.3*/* /usr/lib/cli/FSharp.Compiler-4.3
diff --git a/debian/libfsharp-compiler4.3-cil.installcligac b/debian/libfsharp-compiler4.3-cil.installcligac
deleted file mode 100644
index fe75c32..0000000
--- a/debian/libfsharp-compiler4.3-cil.installcligac
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/cli/FSharp.Compiler-4.3/FSharp.Compiler.dll
diff --git a/debian/patches/debian-cli-policy.patch b/debian/patches/debian-cli-policy.patch
index d6815c9..db90eca 100644
--- a/debian/patches/debian-cli-policy.patch
+++ b/debian/patches/debian-cli-policy.patch
@@ -8,7 +8,7 @@
+SILLY_ENV_HACK_FOR_REGEX=mono $EXEC cli $DEBUG $MONO_OPTIONS $MONO_GC_OPTIONS @DIR@/@TOOL@ "$@"
--- a/src/fsharp/targets.make
+++ b/src/fsharp/targets.make
-@@ -221,9 +221,14 @@
+@@ -221,9 +221,11 @@
# The binaries fsc.exe and fsi.exe only get installed for Mono 4.0 profile
# This also installs 'fsharpc' and 'fsharpi'
@@ -17,10 +17,7 @@
install-bin-4:
chmod +x $(outdir)$(ASSEMBLY)
- sed -e 's,[@]DIR[@],$(gacdir)/$(TARGET),g' -e 's,[@]TOOL[@],$(ASSEMBLY),g' < $(topdir)launcher > $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)
-+ if [ "$(NAME)" = "fsc" ] ; then INSTALL_DIR="/usr/lib/cli/fsharp" ; \
-+ elif [ "$(NAME)" = "fsi" ] ; then INSTALL_DIR="/usr/lib/cli/fsharp-console" ; \
-+ fi ;\
-+ sed -e "s,[@]DIR[@],$$INSTALL_DIR,g" -e 's,[@]TOOL[@],$(ASSEMBLY),g' < $(topdir)launcher > $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)
++ sed -e "s,[@]DIR[@],/usr/lib/cli/fsharp,g" -e 's,[@]TOOL[@],$(ASSEMBLY),g' < $(topdir)launcher > $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)
chmod +x $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)
@mkdir -p $(DESTDIR)$(gacdir)/$(TARGET)
@mkdir -p $(DESTDIR)$(bindir)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git
More information about the Pkg-cli-apps-commits
mailing list