Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbac3a9c

Browse files
authored
Merge pull requestfsharp#771 from dsyme/nogac
Remove FSharp.Core from Mono gac
2 parentsec3396b +fca500a commitbac3a9c

File tree

28 files changed

+10
-414
lines changed

28 files changed

+10
-414
lines changed

‎CHANGELOG-fsharp.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
4.1.28
2+
* Remove FSharp.Core from GAC
3+
14
4.1.27
25
* Integrate visualfsharp master
36

@@ -11,7 +14,7 @@
1114
4.1.24
1215
* Build using Mono 5.0 and msbuild
1316

14-
4.1.27
17+
4.1.23
1518
* Fix nuget package for FSharp.Compiler.Tools System.ValueTuple.dll
1619

1720
4.1.21

‎Makefile‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,6 @@ build:
2828
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsi/Fsi.fsproj
2929
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
3030
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
31-
$(MAKE) -C mono/policy.2.0.FSharp.Core TargetDotnetProfile=net40$@
32-
$(MAKE) -C mono/policy.2.3.FSharp.Core TargetDotnetProfile=net40$@
33-
$(MAKE) -C mono/policy.3.3.FSharp.Core TargetDotnetProfile=net40$@
34-
$(MAKE) -C mono/policy.3.7.FSharp.Core TargetDotnetProfile=net40$@
35-
$(MAKE) -C mono/policy.3.47.FSharp.Core TargetDotnetProfile=net40$@
36-
$(MAKE) -C mono/policy.3.78.FSharp.Core TargetDotnetProfile=net40$@
37-
$(MAKE) -C mono/policy.3.259.FSharp.Core TargetDotnetProfile=net40$@
38-
$(MAKE) -C mono/policy.4.0.FSharp.Core TargetDotnetProfile=net40$@
39-
$(MAKE) -C mono/policy.4.3.FSharp.Core TargetDotnetProfile=net40$@
40-
$(MAKE) -C mono/policy.4.4.FSharp.Core TargetDotnetProfile=net40$@
4131
mkdir -p$(Configuration)/fsharp30/net40/bin
4232
mkdir -p$(Configuration)/fsharp31/net40/bin
4333
mkdir -p$(Configuration)/fsharp40/net40/bin
@@ -63,8 +53,6 @@ install:
6353
-rm -fr$(DESTDIR)$(monodir)/fsharp
6454
-rm -fr$(DESTDIR)$(monodir)/Microsoft\F#
6555
-rm -fr$(DESTDIR)$(monodir)/Microsoft\SDKs/F#
66-
-rm -fr$(DESTDIR)$(monodir)/gac/FSharp.Core
67-
-rm -fr$(DESTDIR)$(monodir)/gac/FSharp.Compiler.Private
6856
-rm -fr$(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v/FSharp
6957
-rm -fr$(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v11.0/FSharp
7058
-rm -fr$(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v12.0/FSharp
@@ -81,24 +69,14 @@ install:
8169
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=3.0 install
8270
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=3.1 install
8371
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=4.0 install
84-
$(MAKE) -C mono/policy.2.0.FSharp.Core TargetDotnetProfile=net40 install
85-
$(MAKE) -C mono/policy.2.3.FSharp.Core TargetDotnetProfile=net40 install
86-
$(MAKE) -C mono/policy.3.3.FSharp.Core TargetDotnetProfile=net40 install
87-
$(MAKE) -C mono/policy.3.7.FSharp.Core TargetDotnetProfile=net40 install
88-
$(MAKE) -C mono/policy.3.47.FSharp.Core TargetDotnetProfile=net40 install
89-
$(MAKE) -C mono/policy.3.78.FSharp.Core TargetDotnetProfile=net40 install
90-
$(MAKE) -C mono/policy.3.259.FSharp.Core TargetDotnetProfile=net40 install
91-
$(MAKE) -C mono/policy.4.0.FSharp.Core TargetDotnetProfile=net40 install
92-
$(MAKE) -C mono/policy.4.3.FSharp.Core TargetDotnetProfile=net40 install
93-
$(MAKE) -C mono/policy.4.4.FSharp.Core TargetDotnetProfile=net40 install
9472
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable47 install
9573
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable7 install
9674
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable78 install
9775
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable259 install
9876
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=monoandroid10+monotouch10+xamarinios10 install
9977
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=xamarinmacmobile install
10078
echo"------------------------------ INSTALLED FILES --------------"
101-
ls -xlR$(DESTDIR)$(monodir)/fsharp$(DESTDIR)$(monodir)/msbuild$(DESTDIR)$(monodir)/gac/FSharp*$(DESTDIR)$(monodir)/Microsoft*||true
79+
ls -xlR$(DESTDIR)$(monodir)/fsharp$(DESTDIR)$(monodir)/msbuild$(DESTDIR)$(monodir)/xbuild$(DESTDIR)$(monodir)/Reference\Assemblies$(DESTDIR)$(monodir)/gac/FSharp*$(DESTDIR)$(monodir)/Microsoft*||true
10280

10381
dist:
10482
-rm -r fsharp-$(DISTVERSION) fsharp-$(DISTVERSION).tar.bz2

‎configure.ac‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,8 @@ elif test "x$MSBUILD" == "xno"; then
5555
fi
5656
AC_MSG_NOTICE(msbuild:$MSBUILD)
5757

58-
MONOGACDIR="$MONOLIBDIR"/mono
59-
if ! test "x$with_gacdir" = "xno"; then
60-
MONOGACDIR=$(cd "$with_gacdir/.." && pwd)
61-
fi
62-
63-
MONOGACDIR40="$MONOGACDIR"/4.0
64-
MONOGACDIR45="$MONOGACDIR"/4.5
65-
66-
if ! test -e $MONOGACDIR45/mscorlib.dll; then
67-
AC_ERROR(Couldn't find the mono gac directory or mscorlib.dll in the usual places. Set --with-gacdir=<path>)
68-
fi
69-
7058
AC_SUBST(MONOBINDIR)
7159
AC_SUBST(MONOLIBDIR)
72-
AC_SUBST(MONOGACDIR)
73-
74-
AC_SUBST(MONOGACDIR20)
75-
AC_SUBST(MONOGACDIR35)
76-
AC_SUBST(MONOGACDIR40)
7760

7861
AC_CONFIG_FILES([
7962
mono/launcher

‎mono/FSharp.Compiler.Interactive.Settings/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ TOKEN=$(SIGN_TOKEN)
44

55
include ../config.make
66

7-
install: install-sdk-lib install-gac-lib
7+
install: install-sdk-lib
88

99

1010

‎mono/FSharp.Compiler.Server.Shared/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ TOKEN=$(SIGN_TOKEN)
44

55
include ../config.make
66

7-
install: install-sdk-lib install-gac-lib
7+
install: install-sdk-lib
88

99

1010

‎mono/FSharp.Core/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ TOKEN=$(FSCORE_DELAY_SIGN_TOKEN)
55

66
include ../config.make
77

8-
install: install-sdk-lib install-gac-lib
8+
install: install-sdk-lib
99

1010

‎mono/appveyor.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
# the version under development, update after a release
3-
$version='4.1.27'
3+
$version='4.1.28'
44

55
functionisVersionTag($tag){
66
$v=New-Object Version

‎mono/config.make.in‎

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
DEFAULT: all
22

3-
.PHONY: install-sdk-lib install-gac-lib
3+
.PHONY: install-sdk-lib
44

55
prefix := @prefix@
66
topdir := @abs_top_srcdir@/
@@ -9,9 +9,6 @@ libdir := ${prefix}/lib/
99
bindir := ${prefix}/bin/
1010
monobindir := @MONOBINDIR@
1111
monolibdir := @MONOLIBDIR@
12-
monogacdir := @MONOGACDIR@
13-
14-
monogacdir40 := @MONOGACDIR40@
1512

1613
monodir := ${libdir}mono
1714

@@ -253,52 +250,6 @@ install-sdk-lib:
253250
$(INSTALL_LIB) $(outdir)$(NAME).dll $(DESTDIR)$(monodir)/fsharp/api/$(PCLPATH)/$(VERSION)/; \
254251
fi
255252

256-
# Install the library binaries in the GAC directory,
257-
install-gac-lib:
258-
$(eval TARGET = "4.5")
259-
@echo "Installing $(ASSEMBLY)"
260-
@if test "x$(DELAY_SIGN)" = "x1"; then \
261-
echo "Signing $(outdir)$(ASSEMBLY) with Mono key"; \
262-
$(monobindir)/sn -q -R $(outdir)$(ASSEMBLY) $(topdir)mono/mono.snk; \
263-
fi
264-
@if test -e $(outdir)$(NAME).dll; then \
265-
if test x-$(NAME) = x-FSharp.Core && test x-$(PKGINSTALL) = x-yes; then \
266-
echo "Using gacutil to install $(outdir)$(ASSEMBLY) into GAC root $(DESTDIR)$(libdir) as package $(TARGET)"; \
267-
$(monobindir)/gacutil -i $(outdir)$(ASSEMBLY) -root $(DESTDIR)$(libdir) -package $(TARGET); \
268-
else \
269-
echo "Installing $(outdir)$(NAME).dll to $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/"; \
270-
mkdir -p $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/; \
271-
$(INSTALL_LIB) $(outdir)$(NAME).dll $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/; \
272-
fi; \
273-
fi
274-
275-
@if test -e $(outdir)$(NAME).xml; then \
276-
echo "Installing $(outdir)$(NAME).xml into $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/"; \
277-
mkdir -p $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/; \
278-
$(INSTALL_LIB) $(outdir)$(NAME).xml $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/; \
279-
if test x-$(PKGINSTALL) = x-yes && test x-$(NAME) = x-FSharp.Core; then \
280-
echo "Using linking to ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).xml to install $(DESTDIR)$(libdir)mono/$(TARGET)/$(NAME).xml"; \
281-
ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).xml $(DESTDIR)$(libdir)mono/$(TARGET)/$(NAME).xml; \
282-
fi; \
283-
fi
284-
@if test -e $(outdir)$(NAME).sigdata; then \
285-
echo "Installing $(outdir)$(NAME).sigdata into $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/"; \
286-
mkdir -p $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/; \
287-
$(INSTALL_LIB) $(outdir)$(NAME).sigdata $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/; \
288-
if test x-$(PKGINSTALL) = x-yes; then \
289-
echo "Using linking to ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).sigdata to install $(DESTDIR)$(libdir)mono/$(TARGET)/$(NAME).sigdata"; \
290-
ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).sigdata $(DESTDIR)$(libdir)mono/$(TARGET)/$(NAME).sigdata; \
291-
fi; \
292-
fi
293-
@if test -e $(outdir)$(NAME).optdata; then \
294-
echo "Installing $(outdir)$(NAME).optdata into $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/"; \
295-
mkdir -p $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/; \
296-
$(INSTALL_LIB) $(outdir)$(NAME).optdata $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/; \
297-
if test x-$(PKGINSTALL) = x-yes; then \
298-
echo "Using linking to ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).optdata to install $(DESTDIR)$(libdir)mono/$(TARGET)/$(NAME).optdata"; \
299-
ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).optdata $(DESTDIR)$(libdir)mono/$(TARGET)/$(NAME).optdata; \
300-
fi; \
301-
fi
302253

303254

304255
# The binaries fsc.exe and fsi.exe only get installed for Mono 4.5 profile

‎mono/policy.2.0.FSharp.Core/Makefile‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎mono/policy.2.0.FSharp.Core/policy.2.0.FSharp.Core.dll.config‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp