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

Commit9220bab

Browse files
committed
Allow install of 2.1 FSharp.Core assembly with "make install-2-1"
To build and install the FSharp.Core for mono 2.1 use make do-2-1 make install-2-1Suppress some irrelevant warnings in the installation process
1 parent08bc40d commit9220bab

File tree

4 files changed

+47
-18
lines changed

4 files changed

+47
-18
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-
allcleaninstalldo-protodo-finaldo-2-1:
3+
allcleaninstalldo-protodo-finaldo-2-1install-2-1:
44
$(MAKE) -C src/fsharp$@
55

66
dist:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,5 @@ do-final: do-4-0 do-2-0
107107
clean: clean-4-0 clean-2-1 clean-2-0
108108

109109
install: install-lib-2 install-lib-4 install-lib-4-5
110+
install-2-1: install-lib-2-1
110111

‎src/fsharp/Makefile.in‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,18 @@ do-proto:
55
$(MAKE) -C FSharp.Compiler-proto$@
66
$(MAKE) -C Fsc-proto$@
77

8-
do-finalinstall:
8+
do-final:
9+
$(MAKE) -C FSharp.Core$@
10+
$(MAKE) -C FSharp.Build$@
11+
$(MAKE) -C FSharp.Compiler$@
12+
$(MAKE) -C Fsc$@
13+
$(MAKE) -C FSharp.Compiler.Interactive.Settings$@
14+
$(MAKE) -C FSharp.Compiler.Server.Shared$@
15+
$(MAKE) -C fsi$@
16+
$(MAKE) -C policy.2.0.FSharp.Core$@
17+
$(MAKE) -C policy.4.0.FSharp.Core$@
18+
19+
install: do-final
920
$(MAKE) -C FSharp.Core$@
1021
$(MAKE) -C FSharp.Build$@
1122
$(MAKE) -C FSharp.Compiler$@
@@ -33,6 +44,9 @@ clean:
3344
do-2-1:
3445
$(MAKE) -C FSharp.Core$@
3546

47+
install-2-1: do-2-1
48+
$(MAKE) -C FSharp.Core$@
49+
3650

3751

3852

‎src/fsharp/targets.make‎

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,20 @@ do-2-0: monolibdir = $(monolibdir2)
4545
do-2-0:$(objdir)$(objdir)$(TARGET_2_0)$(objdir)$(TARGET_4_0)$(objdir)$(TARGET_2_0)/$(ASSEMBLY)
4646
@mkdir -p$(outdir)
4747
@cp$(objdir)$(ASSEMBLY)$(outdir)
48-
@-cp$(objdir)$(NAME).xml$(outdir)
49-
@-cp$(objdir)$(ASSEMBLY).mdb$(outdir)
48+
@iftest -e$(objdir)$(ASSEMBLY).xml;then\
49+
cp$(objdir)$(NAME).xml$(outdir);\
50+
fi
51+
@iftest -e$(objdir)$(ASSEMBLY).mdb;then\
52+
cp$(objdir)$(ASSEMBLY).mdb$(outdir);\
53+
fi
5054
@iftest -e$(objdir)$(NAME).sigdata;then\
5155
cp$(objdir)$(NAME).sigdata$(outdir);\
5256
fi
5357
@iftest -e$(objdir)$(NAME).optdata;then\
5458
cp$(objdir)$(NAME).optdata$(outdir);\
5559
fi
5660
@iftest"x$(SIGN)" ="x1";\
57-
then sn -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
61+
then sn -q -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
5862
fi
5963
@iftest -e Microsoft.FSharp.targets;then\
6064
mono subst.exe$(REPLACE_ARGS) Microsoft.FSharp.targets>$(outdir)Microsoft.FSharp.targets;\
@@ -69,16 +73,20 @@ do-2-1: monolibdir = $(monolibdir2)
6973
do-2-1:$(objdir)$(objdir)$(TARGET_2_1)$(objdir)$(TARGET_4_0)$(objdir)$(TARGET_2_1)/$(ASSEMBLY)
7074
@mkdir -p$(outdir)
7175
@cp$(objdir)$(ASSEMBLY)$(outdir)
72-
@-cp$(objdir)$(NAME).xml$(outdir)
73-
@-cp$(objdir)$(ASSEMBLY).mdb$(outdir)
76+
@iftest -e$(objdir)$(ASSEMBLY).xml;then\
77+
cp$(objdir)$(NAME).xml$(outdir);\
78+
fi
79+
@iftest -e$(objdir)$(ASSEMBLY).mdb;then\
80+
cp$(objdir)$(ASSEMBLY).mdb$(outdir);\
81+
fi
7482
@iftest -e$(objdir)$(NAME).sigdata;then\
7583
cp$(objdir)$(NAME).sigdata$(outdir);\
7684
fi
7785
@iftest -e$(objdir)$(NAME).optdata;then\
7886
cp$(objdir)$(NAME).optdata$(outdir);\
7987
fi
8088
@iftest"x$(SIGN)" ="x1";\
81-
then sn -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
89+
then sn -q -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
8290
fi
8391
@iftest -e Microsoft.FSharp.targets;then\
8492
mono subst.exe$(REPLACE_ARGS) Microsoft.FSharp.targets>$(outdir)Microsoft.FSharp.targets;\
@@ -93,16 +101,20 @@ do-4-0: monolibdir = $(monolibdir4)
93101
do-4-0:$(objdir)$(objdir)$(TARGET_2_0)$(objdir)$(TARGET_4_0)$(objdir)$(TARGET_4_0)/$(ASSEMBLY)
94102
@mkdir -p$(outdir)
95103
@cp$(objdir)$(ASSEMBLY)$(outdir)
96-
@-cp$(objdir)$(NAME).xml$(outdir)
97-
@-cp$(objdir)$(ASSEMBLY).mdb$(outdir)
104+
@iftest -e$(objdir)$(ASSEMBLY).xml;then\
105+
cp$(objdir)$(NAME).xml$(outdir);\
106+
fi
107+
@iftest -e$(objdir)$(ASSEMBLY).mdb;then\
108+
cp$(objdir)$(ASSEMBLY).mdb$(outdir);\
109+
fi
98110
@iftest -e$(objdir)$(NAME).sigdata;then\
99111
cp$(objdir)$(NAME).sigdata$(outdir);\
100112
fi
101113
@iftest -e$(objdir)$(NAME).optdata;then\
102114
cp$(objdir)$(NAME).optdata$(outdir);\
103115
fi
104116
@iftest"x$(SIGN)" ="x1";\
105-
then sn -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
117+
then sn -q -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
106118
fi
107119
@iftest -e Microsoft.FSharp.targets;then\
108120
mono subst.exe$(REPLACE_ARGS) Microsoft.FSharp.targets>$(outdir)Microsoft.FSharp.targets;\
@@ -138,11 +150,16 @@ install-lib-2 install-lib-2-1 install-lib-4:
138150
@echo"Installing$(ASSEMBLY)"
139151
@mkdir -p$(DESTDIR)/$(libdir)
140152
@mkdir -p$(DESTDIR)/$(libdir)mono/$(TARGET)
141-
@mkdir -p$(DESTDIR)/$(libdir)mono/Microsoft\F#/v$(TARGET)/
142-
@mkdir -p$(DESTDIR)/$(libdir)mono/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/
143153
gacutil -i$(outdir)$(ASSEMBLY) -root$(DESTDIR)/$(libdir) -package$(TARGET)
144-
ln -fs$(DESTDIR)/$(libdir)mono/$(TARGET)/$(ASSEMBLY)$(DESTDIR)/$(libdir)mono/Microsoft\F#/v$(TARGET)/$(ASSEMBLY)
145-
ln -fs$(DESTDIR)/$(libdir)mono/$(TARGET)/$(ASSEMBLY)$(DESTDIR)/$(libdir)mono/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/$(ASSEMBLY)
154+
@iftest -e$(outdir)Microsoft.FSharp.targets;then\
155+
mkdir -p$(DESTDIR)/$(libdir)mono/Microsoft\F#/v$(TARGET)/;\
156+
mkdir -p$(DESTDIR)/$(libdir)mono/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/;\
157+
ln -fs$(DESTDIR)/$(libdir)mono/$(TARGET)/$(ASSEMBLY)$(DESTDIR)/$(libdir)mono/Microsoft\F#/v$(TARGET)/$(ASSEMBLY);\
158+
ln -fs$(DESTDIR)/$(libdir)mono/$(TARGET)/$(ASSEMBLY)$(DESTDIR)/$(libdir)mono/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/$(ASSEMBLY);\
159+
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.targets$(DESTDIR)/$(libdir)mono/$(TARGET)/;\
160+
ln -fs$(DESTDIR)/$(libdir)mono/$(TARGET)/Microsoft.FSharp.targets$(DESTDIR)/$(libdir)mono/Microsoft\F#/v$(TARGET)/Microsoft.FSharp.Targets;\
161+
ln -fs$(DESTDIR)/$(libdir)mono/$(TARGET)/Microsoft.FSharp.targets$(DESTDIR)/$(libdir)mono/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/Microsoft.FSharp.Targets;\
162+
fi
146163
@iftest -e$(outdir)$(NAME).sigdata;then\
147164
$(INSTALL_LIB)$(outdir)$(NAME).sigdata$(DESTDIR)/$(libdir)mono/gac/$(NAME)/$(VERSION)__$(TOKEN);\
148165
ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).sigdata$(DESTDIR)/$(libdir)mono/$(TARGET)/$(NAME).sigdata;\
@@ -151,9 +168,6 @@ install-lib-2 install-lib-2-1 install-lib-4:
151168
$(INSTALL_LIB)$(outdir)$(NAME).optdata$(DESTDIR)/$(libdir)mono/gac/$(NAME)/$(VERSION)__$(TOKEN);\
152169
ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).optdata$(DESTDIR)/$(libdir)mono/$(TARGET)/$(NAME).optdata;\
153170
fi
154-
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.targets$(DESTDIR)/$(libdir)mono/$(TARGET)/;
155-
ln -fs$(DESTDIR)/$(libdir)mono/$(TARGET)/Microsoft.FSharp.targets$(DESTDIR)/$(libdir)mono/Microsoft\F#/v$(TARGET)/Microsoft.FSharp.Targets
156-
ln -fs$(DESTDIR)/$(libdir)mono/$(TARGET)/Microsoft.FSharp.targets$(DESTDIR)/$(libdir)mono/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/Microsoft.FSharp.Targets
157171

158172
install-lib-4-5: install-lib-4
159173
@iftest -e$(DESTDIR)$(libdir)mono/4.5/;then\

0 commit comments

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