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

Commit4636e4d

Browse files
committed
Add portable profile redirects
F# 3.0 has portable dlls (not yet built in open source edition).This adds the redirects for those.Also fix redirect for 2.0.0.0 when running on 4.0 (redirect to 4.3.0.0)
1 parent54ce8a2 commit4636e4d

File tree

7 files changed

+101
-1
lines changed

7 files changed

+101
-1
lines changed

‎configure.ac‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ src/fsharp/FSharp.Compiler.Server.Shared/Makefile
8383
src/fsharp/fsi/Makefile
8484
src/fsharp/policy.2.0.FSharp.Core/Makefile
8585
src/fsharp/policy.4.0.FSharp.Core/Makefile
86+
src/fsharp/policy.2.3.FSharp.Core/Makefile
87+
src/fsharp/policy.4.3.FSharp.Core/Makefile
8688
])
8789
AC_OUTPUT
8890

‎src/fsharp/Makefile.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ do-final install:
2222
$(MAKE) -C fsi$@
2323
$(MAKE) -C policy.2.0.FSharp.Core$@
2424
$(MAKE) -C policy.4.0.FSharp.Core$@
25+
$(MAKE) -C policy.2.3.FSharp.Core$@
26+
$(MAKE) -C policy.4.3.FSharp.Core$@
2527

2628
clean:
2729
$(MAKE) -C FSharp.Build-proto$@
@@ -36,6 +38,8 @@ clean:
3638
$(MAKE) -C fsi$@
3739
$(MAKE) -C policy.2.0.FSharp.Core$@
3840
$(MAKE) -C policy.4.0.FSharp.Core$@
41+
$(MAKE) -C policy.2.3.FSharp.Core$@
42+
$(MAKE) -C policy.4.3.FSharp.Core$@
3943

4044
do-2-1:
4145
$(MAKE) -C FSharp.Core$@
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<configuration>
33
<runtime>
4-
<assemblyBindingxmlns="urn:schemas-microsoft-com:asm.v1">
4+
<assemblyBindingxmlns="urn:schemas-microsoft-com:asm.v1"appliesTo="v2.0.50727">
55
<dependentAssembly>
66
<assemblyIdentityname="FSharp.Core"publicKeyToken="b03f5f7f11d50a3a"processorArchitecture="msil"Culture="neutral" />
77
<bindingRedirectoldVersion="2.0.0.0"newVersion="2.3.0.0" />
88
</dependentAssembly>
99
</assemblyBinding>
10+
<assemblyBindingxmlns="urn:schemas-microsoft-com:asm.v1"appliesTo="v4.0.30319">
11+
<dependentAssembly>
12+
<assemblyIdentityname="FSharp.Core"publicKeyToken="b03f5f7f11d50a3a"processorArchitecture="msil"Culture="neutral" />
13+
<bindingRedirectoldVersion="2.0.0.0"newVersion="4.3.0.0" />
14+
</dependentAssembly>
15+
</assemblyBinding>
1016
</runtime>
1117
</configuration>
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
NAME=policy.2.3.FSharp.Core
2+
ASSEMBLY =$(NAME).dll
3+
SIGN=1
4+
5+
srcdir := @abs_srcdir@/
6+
7+
include @abs_top_builddir@/config.make
8+
9+
include$(topdir)/src/fsharp/targets.make
10+
11+
#override the method to build the assembly
12+
13+
$(objdir)$(TARGET_2_0)/policy.2.3.FSharp.Core.dll: policy.2.3.FSharp.Core.dll.config
14+
@mkdir -p$(@D)
15+
cp policy.2.3.FSharp.Core.dll.config$(@D)
16+
al /link:policy.2.3.FSharp.Core.dll.config /out:$@ /delaysign /keyfile:$(topdir)msfinal.pub /version:$(VERSION_2_0)
17+
18+
$(objdir)$(TARGET_4_0)/policy.2.3.FSharp.Core.dll: policy.2.3.FSharp.Core.dll.config
19+
@mkdir -p$(@D)
20+
cp policy.2.3.FSharp.Core.dll.config$(@D)
21+
al /link:policy.2.3.FSharp.Core.dll.config /out:$@ /delaysign /keyfile:$(topdir)msfinal.pub /version:$(VERSION_4_0)
22+
23+
do-final: do-2-0 do-4-0
24+
25+
clean: clean-2-0 clean-4-0
26+
27+
install: install-lib-2 install-lib-4
28+
29+
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBindingxmlns="urn:schemas-microsoft-com:asm.v1"appliesTo="v2.0.50727">
5+
<dependentAssembly>
6+
<assemblyIdentityname="FSharp.Core"publicKeyToken="b03f5f7f11d50a3a"processorArchitecture="msil"Culture="neutral" />
7+
<bindingRedirectoldVersion="2.3.5.0"newVersion="2.3.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
<assemblyBindingxmlns="urn:schemas-microsoft-com:asm.v1"appliesTo="v4.0.30319">
11+
<dependentAssembly>
12+
<assemblyIdentityname="FSharp.Core"publicKeyToken="b03f5f7f11d50a3a"processorArchitecture="msil"Culture="neutral" />
13+
<bindingRedirectoldVersion="2.3.0.0"newVersion="4.3.0.0" />
14+
<bindingRedirectoldVersion="2.3.5.0"newVersion="4.3.0.0" />
15+
</dependentAssembly>
16+
</assemblyBinding>
17+
</runtime>
18+
</configuration>
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
NAME=policy.4.3.FSharp.Core
2+
ASSEMBLY =$(NAME).dll
3+
SIGN=1
4+
5+
srcdir := @abs_srcdir@/
6+
7+
include @abs_top_builddir@/config.make
8+
9+
include$(topdir)/src/fsharp/targets.make
10+
11+
# override the targets to build the assembly
12+
13+
$(objdir)$(TARGET_2_0)/policy.4.3.FSharp.Core.dll: policy.4.3.FSharp.Core.dll.config
14+
@mkdir -p$(@D)
15+
cp policy.4.3.FSharp.Core.dll.config$(@D)
16+
al /link:policy.4.3.FSharp.Core.dll.config /out:$@ /delaysign /keyfile:$(topdir)msfinal.pub /version:$(VERSION_2_0)
17+
18+
$(objdir)$(TARGET_4_0)/policy.4.3.FSharp.Core.dll: policy.4.3.FSharp.Core.dll.config
19+
@mkdir -p$(@D)
20+
cp policy.4.3.FSharp.Core.dll.config$(@D)
21+
al /link:policy.4.3.FSharp.Core.dll.config /out:$@ /delaysign /keyfile:$(topdir)msfinal.pub /version:$(VERSION_4_0)
22+
23+
do-final: do-2-0 do-4-0
24+
25+
clean: clean-2-0 clean-4-0
26+
27+
install: install-lib-2 install-lib-4
28+
29+
30+
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBindingxmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentityname="FSharp.Core"publicKeyToken="b03f5f7f11d50a3a"processorArchitecture="msil"Culture="neutral" />
7+
<bindingRedirectoldVersion="4.3.5.0"newVersion="4.3.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

0 commit comments

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