Permalink
Browse files

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
  • Loading branch information...
1 parent 7810d71 commit e797bb899e7d6d007a86565f096310c100004784 @funnelweb funnelweb committed Nov 12, 2012
View
2 Makefile.in
@@ -1,6 +1,6 @@
include $(topsrcdir)config.make
-all clean install do-proto do-final do-2-1 install-2-1:
+all clean install do-proto do-final do-2-1 install-2-1 clean-2-0 clean-2-1 clean-4-0:
$(MAKE) -C src/fsharp $@
dist:
View
4 config.make.in
@@ -10,8 +10,8 @@ monolibdir2 := $(monodir)2.0/
#This is where to find MonoTouch of MonoAndroid, for "make do-2-1"
#
#For now this is hardwired, it should be optionally detected by configure.ac
-monolibdir21 := /Developer/MonoAndroid/usr/lib/mono/2.1/
-#monolibdir21 := /Developer/MonoTouch/usr/lib/mono/2.1/
+monolibdir21 := @abs_top_srcdir@/dependencies/mono/2.1/
+
monolibdir35 := $(monodir)3.5/
monolibdir4 := $(monodir)4.0/
View
BIN dependencies/mono/2.1/System.Core.dll
Binary file not shown.
View
BIN dependencies/mono/2.1/System.dll
Binary file not shown.
View
BIN dependencies/mono/2.1/mscorlib.dll
Binary file not shown.
View
8 src/fsharp/FSharp.Core/Makefile.in
@@ -102,10 +102,10 @@ $(tmpdir)FSCore.resources: FSCore.resx
include $(topdir)/src/fsharp/targets.make
-do-final: do-4-0 do-2-0
+do-final: do-4-0 do-2-0 do-2-1
-clean: clean-4-0 clean-2-1 clean-2-0
+clean: clean-4-0 clean-2-0 clean-2-1
+
+install: install-lib-4 install-lib-4-5 install-lib-2 install-lib-2-1
-install: install-lib-2 install-lib-4 install-lib-4-5
-install-2-1: install-lib-2-1
View
4 src/fsharp/Makefile.in
@@ -25,7 +25,7 @@ do-final install:
$(MAKE) -C policy.2.3.FSharp.Core $@
$(MAKE) -C policy.4.3.FSharp.Core $@
-clean:
+clean clean-2-0 clean-4-0:
$(MAKE) -C FSharp.Build-proto $@
$(MAKE) -C FSharp.Compiler-proto $@
$(MAKE) -C Fsc-proto $@
@@ -41,7 +41,7 @@ clean:
$(MAKE) -C policy.2.3.FSharp.Core $@
$(MAKE) -C policy.4.3.FSharp.Core $@
-do-2-1:
+clean-2-1 do-2-1:
$(MAKE) -C FSharp.Core $@
install-2-1: do-2-1
View
42 src/fsharp/targets.make
@@ -4,33 +4,33 @@ SOURCES := $(patsubst $(srcdir)$(tmpdir)%,$(tmpdir)%,$(patsubst %,$(srcdir)%,$(s
clean-2-0: TARGET := $(TARGET_2_0)
clean-2-0:
- @-rm -rf $(tmpdir)
- @-rm -rf $(objdir)
- @-rm -f $(outdir)$(ASSEMBLY)
- @-rm -f $(outdir)$(ASSEMBLY).mdb
- @-rm -f $(outdir)$(NAME).xml
- @-rm -f $(outdir)$(NAME).sigdata
- @-rm -f $(outdir)$(NAME).optdata
+ -rm -rf $(tmpdir)
+ -rm -rf $(objdir)
+ -rm -f $(outdir)$(ASSEMBLY)
+ -rm -f $(outdir)$(ASSEMBLY).mdb
+ -rm -f $(outdir)$(NAME).xml
+ -rm -f $(outdir)$(NAME).sigdata
+ -rm -f $(outdir)$(NAME).optdata
clean-2-1: TARGET := $(TARGET_2_1)
clean-2-1:
- @-rm -rf $(tmpdir)
- @-rm -rf $(objdir)
- @-rm -f $(outdir)$(ASSEMBLY)
- @-rm -f $(outdir)$(ASSEMBLY).mdb
- @-rm -f $(outdir)$(NAME).xml
- @-rm -f $(outdir)$(NAME).sigdata
- @-rm -f $(outdir)$(NAME).optdata
+ -rm -rf $(tmpdir)
+ -rm -rf $(objdir)
+ -rm -f $(outdir)$(ASSEMBLY)
+ -rm -f $(outdir)$(ASSEMBLY).mdb
+ -rm -f $(outdir)$(NAME).xml
+ -rm -f $(outdir)$(NAME).sigdata
+ -rm -f $(outdir)$(NAME).optdata
clean-4-0: TARGET := $(TARGET_4_0)
clean-4-0:
- @-rm -rf $(tmpdir)
- @-rm -rf $(objdir)
- @-rm -f $(outdir)$(ASSEMBLY)
- @-rm -f $(outdir)$(ASSEMBLY).mdb
- @-rm -f $(outdir)$(NAME).xml
- @-rm -f $(outdir)$(NAME).sigdata
- @-rm -f $(outdir)$(NAME).optdata
+ -rm -rf $(tmpdir)
+ -rm -rf $(objdir)
+ -rm -f $(outdir)$(ASSEMBLY)
+ -rm -f $(outdir)$(ASSEMBLY).mdb
+ -rm -f $(outdir)$(NAME).xml
+ -rm -f $(outdir)$(NAME).sigdata
+ -rm -f $(outdir)$(NAME).optdata
do-2-0: DEFINES += $(DEFINES_2_0)
do-2-0: REFERENCES += $(REFERENCES_2_0)

0 comments on commit e797bb8

Please sign in to comment.