[Pkg-cli-apps-commits] [fsharp] 13/71: adjust version numbers and installation

[Christopher Halse Rogers]

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

raof-guest pushed a commit to tag 3.1.0
in repository fsharp.

commit 9a2b0d71de716433648de14be6e0b364074a7d80
Author: Don Syme <donsyme at fastmail.fm>
Date:   Fri Oct 4 19:04:44 2013 +0100

    adjust version numbers and installation
---
 src/fsharp/FSComp.txt         |  2 +-
 src/fsharp/fsi/FSIstrings.txt |  2 +-
 src/fsharp/targets.make       | 22 ++++++++++++++--------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt
index 67a535f..274fba7 100755
--- a/src/fsharp/FSComp.txt
+++ b/src/fsharp/FSComp.txt
@@ -18,7 +18,7 @@ buildUnexpectedTypeArgs,"The non-generic type '%s' does not expect any type argu
 203,buildInvalidWarningNumber,"Invalid warning number '%s'"
 204,buildInvalidVersionString,"Invalid version string '%s'"
 205,buildInvalidVersionFile,"Invalid version file '%s'"
-buildProductName,"F# Compiler for F# 3.0 %s"
+buildProductName,"F# Compiler for F# 3.1 %s"
 206,buildProblemWithFilename,"Problem with filename '%s': %s"
 207,buildNoInputsSpecified,"No inputs specified"
 208,buildMismatchOutputExtension,"The output name extension doesn't match the options used. If '-a' or '--target:library' is used the output file name must end with '.dll', if '--target:module' is used the output extension must be '.netmodule', otherwise '.exe'."
diff --git a/src/fsharp/fsi/FSIstrings.txt b/src/fsharp/fsi/FSIstrings.txt
index 17fa48e..d9a0358 100755
--- a/src/fsharp/fsi/FSIstrings.txt
+++ b/src/fsharp/fsi/FSIstrings.txt
@@ -48,4 +48,4 @@ fsiTurnedTimingOff,"--> Timing now off"
 fsiUnexpectedThreadAbortException,"- Unexpected ThreadAbortException (Ctrl-C) during event handling: Trying to restart..."
 fsiFailedToResolveAssembly,"Failed to resolve assembly '%s'"
 fsiBindingSessionTo,"Binding session to '%s'..."
-fsiProductName,"F# Interactive for F# 3.0 %s"
+fsiProductName,"F# Interactive for F# 3.1 %s"
diff --git a/src/fsharp/targets.make b/src/fsharp/targets.make
index 6c21b2c..ad5d8b4 100644
--- a/src/fsharp/targets.make
+++ b/src/fsharp/targets.make
@@ -57,15 +57,21 @@ install-lib-2 install-lib-2-1 install-lib-4-0:
 	gacutil -i $(outdir)$(ASSEMBLY) -root $(DESTDIR)$(libdir) -package $(TARGET)
 	@if test -e $(outdir)Microsoft.FSharp.Targets; then \
 	    $(INSTALL_LIB) $(outdir)Microsoft.FSharp.Targets $(DESTDIR)$(gacdir)/$(TARGET)/; \
+	    @mkdir -p $(tmpdir)
+	    echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' > $(tmpdir)Microsoft.FSharp.Targets; \
+	    echo '    <Import Project="$(DESTDIR)$(gacdir)/$(TARGET)/Microsoft.FSharp.Targets" />' >> $(tmpdir)Microsoft.FSharp.Targets; \
+	    echo '</Project>' >> $(tmpdir)Microsoft.FSharp.Targets; \
 	    mkdir -p $(DESTDIR)$(gacdir)/Microsoft\ F#/v$(TARGET)/; \
-	    ln -fs ../../$(TARGET)/$(ASSEMBLY) $(DESTDIR)$(gacdir)/Microsoft\ F#/v$(TARGET)/$(ASSEMBLY); \
-	    ln -fs ../../$(TARGET)/Microsoft.FSharp.Targets $(DESTDIR)$(gacdir)/Microsoft\ F#/v$(TARGET)/Microsoft.FSharp.Targets; \
-	    mkdir -p $(DESTDIR)$(gacdir)/Microsoft\ SDKs/F#/3.0/Framework/v$(TARGET); \
-	    ln -fs ../../../../../$(TARGET)/$(ASSEMBLY) $(DESTDIR)$(gacdir)/Microsoft\ SDKs/F#/3.0/Framework/v$(TARGET)/$(ASSEMBLY); \
-	    ln -fs ../../../../../$(TARGET)/Microsoft.FSharp.Targets $(DESTDIR)$(gacdir)/Microsoft\ SDKs/F#/3.0/Framework/v$(TARGET)/Microsoft.FSharp.Targets; \
-	    mkdir -p $(DESTDIR)$(gacdir)/../xbuild/Microsoft/VisualStudio/v12.0/FSharp/; \
-	    ln -fs ../../../../../$(TARGET)/$(ASSEMBLY) $(DESTDIR)$(gacdir)/../xbuild/Microsoft/VisualStudio/v12.0/FSharp/$(ASSEMBLY); \
-	    ln -fs ../../../../../$(TARGET)/Microsoft.FSharp.Targets $(DESTDIR)$(gacdir)/../xbuild/Microsoft/VisualStudio/v12.0/FSharp/Microsoft.FSharp.Targets; \
+	    mkdir -p $(DESTDIR)$(gacdir)/Microsoft\ SDKs/F#/3.0/Framework/v$(TARGET)/; \
+	    mkdir -p $(DESTDIR)$(gacdir)/Microsoft\ SDKs/F#/3.1/Framework/v$(TARGET)/; \
+	    mkdir -p $(DESTDIR)$(gacdir)/xbuild/Microsoft/VisualStudio/v/FSharp/; \
+	    mkdir -p $(DESTDIR)$(gacdir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/; \
+	    mkdir -p $(DESTDIR)$(gacdir)/Microsoft\ F#/v$(TARGET)/; \
+	    $(INSTALL_LIB) $(tmpdir)Microsoft.FSharp.Targets $(DESTDIR)$(gacdir)/Microsoft\ F#/v$(TARGET)/; \
+	    $(INSTALL_LIB) $(tmpdir)Microsoft.FSharp.Targets $(DESTDIR)$(gacdir)/Microsoft\ SDKs/F#/3.0/Framework/v$(TARGET)/; \
+	    $(INSTALL_LIB) $(tmpdir)Microsoft.FSharp.Targets $(DESTDIR)$(gacdir)/Microsoft\ SDKs/F#/3.1/Framework/v$(TARGET)/; \
+	    $(INSTALL_LIB) $(tmpdir)Microsoft.FSharp.Targets $(DESTDIR)$(gacdir)/xbuild/Microsoft/VisualStudio/v/FSharp/; \
+	    $(INSTALL_LIB) $(tmpdir)Microsoft.FSharp.Targets $(DESTDIR)$(gacdir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/; \
 	fi
 	@if test -e $(outdir)$(NAME).xml; then \
 		$(INSTALL_LIB) $(outdir)$(NAME).xml $(DESTDIR)$(gacdir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/; \

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