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

Commit548f2c8

Browse files
committed
Merge pull requestfsharp#22 from knocte/master
Fix makefiles to symlink and generate things properly to keep xbuild happy
2 parents4040af1 +9c218a0 commit548f2c8

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

‎src/fsharp/Fsc/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ $(tmpdir)FSCstrings.resources: $(srcdir)../FSCstrings.txt
3333

3434
include$(topdir)/src/fsharp/targets.make
3535

36-
install: install-bin-2 install-bin-4
36+
install: install-bin-2 install-bin-4 install-bin-4-5
3737

‎src/fsharp/targets.make‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
SOURCES :=$(patsubst$(srcdir)$(tmpdir)%,$(tmpdir)%,$(patsubst%,$(srcdir)%,$(sources)))
22

3+
# taken from FSharpSource.targets file:
4+
LKG_VERSION := 2.0.50726.900
5+
REPLACE_ARGS := {LkgVersion}$(LKG_VERSION) {BuildSuffix} "" {FSharpTargetsDir} unused
6+
37
.PHONY: install install-bin install-bin-2 install-bin-4 install-lib
48

59
all: do-4-0 do-2-0
@@ -48,7 +52,7 @@ do-2-0: $(objdir) $(objdir)$(TARGET_2_0) $(objdir)$(TARGET_4_0) $(objdir)$(TARGE
4852
then sn -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
4953
fi
5054
@iftest -e Microsoft.FSharp.targets;then\
51-
cpMicrosoft.FSharp.targets$(outdir);\
55+
mono subst.exe$(REPLACE_ARGS)Microsoft.FSharp.targets>$(outdir)Microsoft.FSharp.targets;\
5256
fi
5357

5458
do-4-0: DEFINES +=$(DEFINES_4_0)
@@ -72,7 +76,7 @@ do-4-0: $(objdir) $(objdir)$(TARGET_2_0) $(objdir)$(TARGET_4_0) $(objdir)$(TARGE
7276
then sn -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
7377
fi
7478
@iftest -e Microsoft.FSharp.targets;then\
75-
cpMicrosoft.FSharp.targets$(outdir);\
79+
mono subst.exe$(REPLACE_ARGS)Microsoft.FSharp.targets>$(outdir)Microsoft.FSharp.targets;\
7680
fi
7781

7882
install-lib-2: TARGET :=$(TARGET_2_0)
@@ -98,7 +102,10 @@ install-lib-2 install-lib-4:
98102
$(INSTALL_LIB)$(outdir)$(NAME).optdata$(DESTDIR)/$(libdir)mono/gac/$(NAME)/$(VERSION)__$(TOKEN);\
99103
ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).optdata$(DESTDIR)/$(libdir)mono/$(TARGET)/;\
100104
fi
105+
ln -fs$(DESTDIR)/$(libdir)mono/$(TARGET)/$(ASSEMBLY)$(DESTDIR)/$(libdir)mono/Microsoft\F#/v$(TARGET)/$(ASSEMBLY)
101106
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.targets$(DESTDIR)/$(libdir)mono/$(TARGET)/;
107+
mkdir -p$(DESTDIR)/$(libdir)mono/Microsoft\F#/v$(TARGET)/
108+
ln -fs$(DESTDIR)/$(libdir)mono/$(TARGET)/Microsoft.FSharp.targets$(DESTDIR)/$(libdir)mono/Microsoft\F#/v$(TARGET)/Microsoft.FSharp.Targets
102109

103110
install-bin-2install-bin-4:
104111
sed -e's,[@]DIR[@],$(libdir)mono/$(TARGET),g' -e's,[@]TOOL[@],$(ASSEMBLY),g'<$(topdir)launcher.in>$(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)
@@ -108,6 +115,11 @@ install-bin-2 install-bin-4:
108115
$(INSTALL_LIB)$(outdir)$(ASSEMBLY)$(DESTDIR)$(libdir)mono/$(TARGET)
109116
$(INSTALL_BIN)$(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)$(DESTDIR)/$(bindir)
110117

118+
install-bin-4-5: install-bin-4
119+
@iftest -e$(DESTDIR)$(libdir)mono/4.5/;then\
120+
ln -fs$(DESTDIR)$(libdir)mono/4.0/$(ASSEMBLY)$(DESTDIR)$(libdir)mono/4.5/$(ASSEMBLY);\
121+
fi
122+
111123
$(objdir)$(objdir)$(TARGET_2_0)$(objdir)$(TARGET_4_0):
112124
mkdir -p$@
113125

0 commit comments

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