Skip to content
This repository was archived by the owner on Feb 19, 2020. It is now read-only.

Commit e797bb8

Browse files
committed
Build and install FSharp.Core 2.1 profile by default
This includes adding dependencies for the Mono profile 2.1 binaries we need to reference
1 parent 7810d71 commit e797bb8

File tree

8 files changed

+30
-30
lines changed

8 files changed

+30
-30
lines changed

Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include $(topsrcdir)config.make
22

3-
all clean install do-proto do-final do-2-1 install-2-1:
3+
all clean install do-proto do-final do-2-1 install-2-1 clean-2-0 clean-2-1 clean-4-0:
44
$(MAKE) -C src/fsharp $@
55

66
dist:

config.make.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ monolibdir2 := $(monodir)2.0/
1010
#This is where to find MonoTouch of MonoAndroid, for "make do-2-1"
1111
#
1212
#For now this is hardwired, it should be optionally detected by configure.ac
13-
monolibdir21 := /Developer/MonoAndroid/usr/lib/mono/2.1/
14-
#monolibdir21 := /Developer/MonoTouch/usr/lib/mono/2.1/
13+
monolibdir21 := @abs_top_srcdir@/dependencies/mono/2.1/
14+
1515

1616
monolibdir35 := $(monodir)3.5/
1717
monolibdir4 := $(monodir)4.0/

dependencies/mono/2.1/System.Core.dll

701 KB
Binary file not shown.

dependencies/mono/2.1/System.dll

1.08 MB
Binary file not shown.

dependencies/mono/2.1/mscorlib.dll

2.61 MB
Binary file not shown.

src/fsharp/FSharp.Core/Makefile.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ $(tmpdir)FSCore.resources: FSCore.resx
102102

103103
include $(topdir)/src/fsharp/targets.make
104104

105-
do-final: do-4-0 do-2-0
105+
do-final: do-4-0 do-2-0 do-2-1
106106

107-
clean: clean-4-0 clean-2-1 clean-2-0
107+
clean: clean-4-0 clean-2-0 clean-2-1
108+
109+
install: install-lib-4 install-lib-4-5 install-lib-2 install-lib-2-1
108110

109-
install: install-lib-2 install-lib-4 install-lib-4-5
110-
install-2-1: install-lib-2-1
111111

src/fsharp/Makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ do-final install:
2525
$(MAKE) -C policy.2.3.FSharp.Core $@
2626
$(MAKE) -C policy.4.3.FSharp.Core $@
2727

28-
clean:
28+
clean clean-2-0 clean-4-0:
2929
$(MAKE) -C FSharp.Build-proto $@
3030
$(MAKE) -C FSharp.Compiler-proto $@
3131
$(MAKE) -C Fsc-proto $@
@@ -41,7 +41,7 @@ clean:
4141
$(MAKE) -C policy.2.3.FSharp.Core $@
4242
$(MAKE) -C policy.4.3.FSharp.Core $@
4343

44-
do-2-1:
44+
clean-2-1 do-2-1:
4545
$(MAKE) -C FSharp.Core $@
4646

4747
install-2-1: do-2-1

src/fsharp/targets.make

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,33 @@ SOURCES := $(patsubst $(srcdir)$(tmpdir)%,$(tmpdir)%,$(patsubst %,$(srcdir)%,$(s
44

55
clean-2-0: TARGET := $(TARGET_2_0)
66
clean-2-0:
7-
@-rm -rf $(tmpdir)
8-
@-rm -rf $(objdir)
9-
@-rm -f $(outdir)$(ASSEMBLY)
10-
@-rm -f $(outdir)$(ASSEMBLY).mdb
11-
@-rm -f $(outdir)$(NAME).xml
12-
@-rm -f $(outdir)$(NAME).sigdata
13-
@-rm -f $(outdir)$(NAME).optdata
7+
-rm -rf $(tmpdir)
8+
-rm -rf $(objdir)
9+
-rm -f $(outdir)$(ASSEMBLY)
10+
-rm -f $(outdir)$(ASSEMBLY).mdb
11+
-rm -f $(outdir)$(NAME).xml
12+
-rm -f $(outdir)$(NAME).sigdata
13+
-rm -f $(outdir)$(NAME).optdata
1414

1515
clean-2-1: TARGET := $(TARGET_2_1)
1616
clean-2-1:
17-
@-rm -rf $(tmpdir)
18-
@-rm -rf $(objdir)
19-
@-rm -f $(outdir)$(ASSEMBLY)
20-
@-rm -f $(outdir)$(ASSEMBLY).mdb
21-
@-rm -f $(outdir)$(NAME).xml
22-
@-rm -f $(outdir)$(NAME).sigdata
23-
@-rm -f $(outdir)$(NAME).optdata
17+
-rm -rf $(tmpdir)
18+
-rm -rf $(objdir)
19+
-rm -f $(outdir)$(ASSEMBLY)
20+
-rm -f $(outdir)$(ASSEMBLY).mdb
21+
-rm -f $(outdir)$(NAME).xml
22+
-rm -f $(outdir)$(NAME).sigdata
23+
-rm -f $(outdir)$(NAME).optdata
2424

2525
clean-4-0: TARGET := $(TARGET_4_0)
2626
clean-4-0:
27-
@-rm -rf $(tmpdir)
28-
@-rm -rf $(objdir)
29-
@-rm -f $(outdir)$(ASSEMBLY)
30-
@-rm -f $(outdir)$(ASSEMBLY).mdb
31-
@-rm -f $(outdir)$(NAME).xml
32-
@-rm -f $(outdir)$(NAME).sigdata
33-
@-rm -f $(outdir)$(NAME).optdata
27+
-rm -rf $(tmpdir)
28+
-rm -rf $(objdir)
29+
-rm -f $(outdir)$(ASSEMBLY)
30+
-rm -f $(outdir)$(ASSEMBLY).mdb
31+
-rm -f $(outdir)$(NAME).xml
32+
-rm -f $(outdir)$(NAME).sigdata
33+
-rm -f $(outdir)$(NAME).optdata
3434

3535
do-2-0: DEFINES += $(DEFINES_2_0)
3636
do-2-0: REFERENCES += $(REFERENCES_2_0)

0 commit comments

Comments
 (0)