[Pkg-cli-apps-commits] [fsharp] 05/05: CLI policy fixes for fsharpc and fsharpi

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to branch master
in repository fsharp.

commit 5f1e23d8ed14aa6585ec5bda196b584df8dbd461
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date:   Sun Oct 27 21:19:11 2013 +1100

    CLI policy fixes for fsharpc and fsharpi
---
 debian/changelog                       |    4 +++-
 debian/patches/debian-cli-policy.patch |   26 ++++++++++++++++++++++++++
 debian/patches/series                  |    1 +
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c406a64..61e9817 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,10 @@ fsharp (3.0.30+dfsg-1) UNRELEASED; urgency=low
   * Make watch file more robust
   * Use new cli-common infrastructure to install core libraries in framework paths
     (Closes: 705906, 706683)
+  * Debian CLI policy fixes for fsharpc and fsharpi - now supports parallel
+    mono installations!
 
- -- Christopher James Halse Rogers <raof at ubuntu.com>  Sun, 27 Oct 2013 20:47:14 +1100
+ -- Christopher James Halse Rogers <raof at ubuntu.com>  Sun, 27 Oct 2013 21:16:52 +1100
 
 fsharp (3.0.26-1) unstable; urgency=low
 
diff --git a/debian/patches/debian-cli-policy.patch b/debian/patches/debian-cli-policy.patch
new file mode 100644
index 0000000..7cf3d51
--- /dev/null
+++ b/debian/patches/debian-cli-policy.patch
@@ -0,0 +1,26 @@
+--- a/launcher.in
++++ b/launcher.in
+@@ -27,4 +27,4 @@
+ # location of the default FSharp install in order to find the FSharp compiler binaries (see 
+ # fsharpbinding/MonoDevelop.FSharpBinding/Services/CompilerLocationUtils.fs). That's a pretty unfortunate
+ # way of finding those binaries. And really should be changed.
+-$EXEC mono $DEBUG $MONO_OPTIONS $MONO_GC_OPTIONS @DIR@/@TOOL@ "$@"
++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,8 +221,14 @@
+ 
+ # The binaries fsc.exe and fsi.exe only get installed for Mono 4.0 profile
+ # This also installs 'fsharpc' and 'fsharpi'
++#
++# Debian patch - Point fsharpc and fsharpi at our install paths, not the GAC.
+ install-bin-4:
+-	sed -e 's,[@]DIR[@],$(gacdir)/$(TARGET),g' -e 's,[@]TOOL[@],$(ASSEMBLY),g' < $(topdir)launcher > $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)
++	@echo NAME is: $(NAME)
++	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)
+ 	chmod +x $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)
+ 	@mkdir -p $(DESTDIR)$(gacdir)/$(TARGET)
+ 	@mkdir -p $(DESTDIR)$(bindir)
diff --git a/debian/patches/series b/debian/patches/series
index 65773af..e97b933 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 build-only-4.0-libs.patch
+debian-cli-policy.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git