Skip to content

Commit ceeb9df

Browse files
dsymedsyme
committed
Merge pull request #468 from dsyme/fix-policy-dlls
Fix install of FSharp.Core DLLs
2 parents 1cf3913 + 83ef38a commit ceeb9df

File tree

84 files changed

+2044
-66
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+2044
-66
lines changed

‎config.make.in‎

Lines changed: 54 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,126 +37,157 @@ outsuffix = $(TargetFramework)
3737

3838
# Version number mappings for various versions of FSharp.Core
3939

40-
4140
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-net40-)
4241
VERSION = 4.4.0.0
4342
TARGET = 4.5
43+
PKGINSTALL = yes
44+
REFASSEMPATH = .NETFramework/v4.0
4445
outsuffix = .
4546
endif
4647

48+
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-net20-)
49+
VERSION = 2.3.0.0
50+
TARGET = 2.0
51+
REFASSEMPATH = .NETFramework/v2.0
52+
outsuffix = $(TargetFramework)
53+
endif
54+
4755
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-monodroid-)
4856
VERSION = 3.98.4.0
49-
TARGET = monodroid
57+
TARGET = $(TargetFramework)
58+
outsuffix = $(TargetFramework)
5059
endif
5160

5261

5362
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-monotouch-)
5463
VERSION = 3.98.4.0
55-
TARGET = monotouch
64+
TARGET = $(TargetFramework)
65+
outsuffix = $(TargetFramework)
5666
endif
5767

5868
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-xamarinwatchos-)
5969
VERSION = 3.98.4.0
60-
TARGET = xamarinwatchos
70+
TARGET = $(TargetFramework)
71+
outsuffix = $(TargetFramework)
6172
endif
6273

6374
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-xamarinmacmobile-)
6475
VERSION = 3.99.4.0
65-
TARGET = xamarinmacmobile
76+
TARGET = $(TargetFramework)
77+
outsuffix = $(TargetFramework)
6678
endif
6779

6880
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-xamarinmacfull-)
6981
VERSION = 3.100.4.0
70-
TARGET = xamarinmacfull
82+
TARGET = $(TargetFramework)
83+
outsuffix = $(TargetFramework)
7184
endif
7285

7386
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable47-)
7487
VERSION = 3.47.4.0
75-
TARGET = portable47
88+
TARGET = $(TargetFramework)
7689
PCLPATH = .NETPortable
90+
outsuffix = $(TargetFramework)
7791
endif
7892

7993
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable7-)
8094
VERSION = 3.7.4.0
81-
TARGET = portable7
95+
TARGET = $(TargetFramework)
8296
PCLPATH = .NETCore
97+
outsuffix = $(TargetFramework)
8398
endif
8499

85100
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable78-)
86101
VERSION = 3.78.4.0
87-
TARGET = portable78
102+
TARGET = $(TargetFramework)
88103
PCLPATH = .NETCore
104+
outsuffix = $(TargetFramework)
89105
endif
90106

91107
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable259-)
92108
VERSION = 3.259.4.0
93-
TARGET = portable259
109+
TARGET = $(TargetFramework)
94110
PCLPATH = .NETCore
111+
outsuffix = $(TargetFramework)
95112
endif
96113

97114
# Version number mappings for various back versions of FSharp.Core (F# 3.0 versions of FSharp.Core)
98115

99116
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-net20-3.0)
100117
VERSION = 2.3.0.0
101-
TARGET = 2.0
118+
TARGET = fsharp30/2.0
119+
REFASSEMPATH = .NETFramework/v2.0
102120
outsuffix = fsharp30/$(TargetFramework)
103121
endif
104122

105123
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-net40-3.0)
106124
VERSION = 4.3.0.0
107-
TARGET = 4.5
125+
TARGET = fsharp30/4.5
126+
REFASSEMPATH = .NETFramework/v4.0
108127
outsuffix = fsharp30/$(TargetFramework)
109128
endif
110129

111130
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable47-3.0)
112131
VERSION = 2.3.5.0
113-
TARGET = portable47
132+
TARGET = fsharp30/$(TargetFramework)
114133
PCLPATH = .NETPortable
115134
outsuffix = fsharp30/$(TargetFramework)
116135
endif
117136

118137
# Version number mappings for various back versions of FSharp.Core (F# 3.1 versions of FSharp.Core)
119138

139+
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-net20-3.1)
140+
VERSION = 2.3.1.0
141+
TARGET = fsharp31/2.0
142+
REFASSEMPATH = .NETFramework/v2.0
143+
outsuffix = fsharp31/$(TargetFramework)
144+
endif
145+
120146
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-net40-3.1)
121147
VERSION = 4.3.1.0
122-
TARGET = 4.5
148+
TARGET = fsharp31/4.5
149+
REFASSEMPATH = .NETFramework/v4.0
123150
outsuffix = fsharp31/$(TargetFramework)
124151
endif
125152

126153
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-monodroid-3.1)
127154
VERSION = 2.3.98.1
128-
TARGET = fsharp31/monodroid
155+
TARGET = fsharp31/$(TargetFramework)
156+
outsuffix = fsharp31/$(TargetFramework)
129157
endif
130158

131159

132160
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-monotouch-3.1)
133161
VERSION = 2.3.98.1
134-
TARGET = fsharp31/monotouch
162+
TARGET = fsharp31/$(TargetFramework)
163+
outsuffix = fsharp31/$(TargetFramework)
135164
endif
136165

137166

138167
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-xamarinmacmobile-3.1)
139168
VERSION = 2.3.99.1
140-
TARGET = fsharp31/xamarinmacmobile
169+
TARGET = fsharp31/$(TargetFramework)
170+
outsuffix = fsharp31/$(TargetFramework)
141171
endif
142172

143173
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-xamarinmacfull-3.1)
144174
VERSION = 2.3.100.1
145-
TARGET = fsharp31/xamarinmacfull
175+
TARGET = fsharp31/$(TargetFramework)
176+
outsuffix = fsharp31/$(TargetFramework)
146177
endif
147178

148179

149180
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable7-3.1)
150181
VERSION = 3.3.1.0
151-
TARGET = portable7
182+
TARGET = fsharp31/$(TargetFramework)
152183
PCLPATH = .NETCore
153184
outsuffix = fsharp31/$(TargetFramework)
154185
endif
155186

156187

157188
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable47-3.1)
158189
VERSION = 2.3.5.1
159-
TARGET = portable47
190+
TARGET = fsharp31/$(TargetFramework)
160191
PCLPATH = .NETPortable
161192
outsuffix = fsharp31/$(TargetFramework)
162193
endif
@@ -165,21 +196,21 @@ endif
165196

166197
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable78-3.1)
167198
VERSION = 3.78.3.1
168-
TARGET = portable78
199+
TARGET = fsharp31/$(TargetFramework)
169200
PCLPATH = .NETCore
170201
outsuffix = fsharp31/$(TargetFramework)
171202
endif
172203

173204
ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-portable259-3.1)
174205
VERSION = 3.259.3.1
175-
TARGET = portable259
206+
TARGET = fsharp31/$(TargetFramework)
176207
PCLPATH = .NETCore
177208
outsuffix = fsharp31/$(TargetFramework)
178209
endif
179210

180211

181212

182-
DELAY_SIGN_TOKEN = b03f5f7f11d50a3a
213+
FSCORE_DELAY_SIGN_TOKEN = b03f5f7f11d50a3a
183214
SIGN_TOKEN = f536804aa0eb945b
184215

185216
bootstrapdir = $(bootstrap)/4.0/

‎src/fsharp/FSharp.Build/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ include @abs_top_builddir@/config.make
88

99
include $(topdir)/src/fsharp/targets.make
1010

11-
install: install-lib install-lib-net45
11+
install: install-lib install-lib-net40
1212

‎src/fsharp/FSharp.Compiler.Interactive.Settings/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include @abs_top_builddir@/config.make
88

99
include $(topdir)/src/fsharp/targets.make
1010

11-
install: install-lib install-lib-net45
11+
install: install-lib install-lib-net40
1212

1313

1414

‎src/fsharp/FSharp.Compiler.Server.Shared/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include @abs_top_builddir@/config.make
88

99
include $(topdir)/src/fsharp/targets.make
1010

11-
install: install-lib install-lib-net45
11+
install: install-lib install-lib-net40
1212

1313

1414

‎src/fsharp/FSharp.Compiler/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include @abs_top_builddir@/config.make
88

99
include $(topdir)/src/fsharp/targets.make
1010

11-
install: install-lib install-lib-net45
11+
install: install-lib install-lib-net40
1212

1313

1414

‎src/fsharp/FSharp.Core/Makefile.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
NAME=FSharp.Core
22
ASSEMBLY = $(NAME).dll
33
DELAY_SIGN=1
4-
TOKEN=$(DELAY_SIGN_TOKEN)
4+
TOKEN=$(FSCORE_DELAY_SIGN_TOKEN)
55

66
srcdir := @abs_srcdir@/
77

88
include @abs_top_builddir@/config.make
99

1010
include $(topdir)/src/fsharp/targets.make
1111

12-
install: install-lib install-lib-net45
12+
install: install-lib install-lib-net40
1313

1414

‎src/fsharp/FSharp.Data.TypeProviders/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include @abs_top_builddir@/config.make
88

99
include $(topdir)/src/fsharp/targets.make
1010

11-
install: install-lib install-lib-net45
11+
install: install-lib install-lib-net40
1212

1313

1414

‎src/fsharp/Makefile.in‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,14 @@ build clean install:
3636
$(MAKE) -C fsi $@
3737
$(MAKE) -C fsiAnyCpu $@
3838
$(MAKE) -C policy.2.0.FSharp.Core $@
39-
$(MAKE) -C policy.4.0.FSharp.Core $@
4039
$(MAKE) -C policy.2.3.FSharp.Core $@
4140
$(MAKE) -C policy.3.3.FSharp.Core $@
4241
$(MAKE) -C policy.3.7.FSharp.Core $@
4342
$(MAKE) -C policy.3.47.FSharp.Core $@
4443
$(MAKE) -C policy.3.78.FSharp.Core $@
4544
$(MAKE) -C policy.3.259.FSharp.Core $@
45+
$(MAKE) -C policy.4.0.FSharp.Core $@
4646
$(MAKE) -C policy.4.3.FSharp.Core $@
47-
$(MAKE) -C policy.2.0.FSharp.Core TargetFramework=net20 $@
48-
$(MAKE) -C policy.2.3.FSharp.Core TargetFramework=net20 $@
4947
if test -e $MONOGACDIR20/mscorlib.dll; then $(MAKE) -C FSharp.Core TargetFramework=net20 $@;fi
5048
$(MAKE) only-monotouch only-monodroid only-xamarinmac
5149
$(MAKE) -C FSharp.Core FSharpCoreBackVersion=3.0 TargetFramework=net40 $@

‎src/fsharp/policy.2.0.FSharp.Core/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
NAME=policy.2.0.FSharp.Core
22
ASSEMBLY = $(NAME).dll
33
DELAY_SIGN=1
4+
TOKEN=$(FSCORE_DELAY_SIGN_TOKEN)
45

56
srcdir := @abs_srcdir@/
67

‎src/fsharp/policy.2.3.FSharp.Core/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
NAME=policy.2.3.FSharp.Core
22
ASSEMBLY = $(NAME).dll
33
DELAY_SIGN=1
4+
TOKEN=$(FSCORE_DELAY_SIGN_TOKEN)
45

56
srcdir := @abs_srcdir@/
67

0 commit comments

Comments
 (0)