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

Commit54158ae

Browse files
committed
Missing changes from last commit for Makefile build
1 parent01c42be commit54158ae

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

‎src/fsharp/.#targets.make‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tomaspetricek@fsmac.local.54701

‎src/fsharp/FSharp.Build/Microsoft.FSharp.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
2222

2323

2424
<PropertyGroup>
25-
<MSBuildAllProjects>$(MSBuildAllProjects);$(FSharpTargetsFullPath)</MSBuildAllProjects>
2625
<DefaultLanguageSourceExtension>.fs</DefaultLanguageSourceExtension>
2726
<Language>F#</Language>
2827
<TailcallsCondition="'$(Tailcalls)'==''">$(Optimize)</Tailcalls>

‎src/fsharp/targets.make‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
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-
73
.PHONY: install install-bin install-bin-2 install-bin-4 install-lib
84

95
clean-2-0: TARGET :=$(TARGET_2_0)
@@ -57,11 +53,11 @@ do-2-0: $(objdir) $(objdir)$(TARGET_2_0) $(objdir)$(TARGET_4_0) $(objdir)$(TARGE
5753
@iftest -e$(objdir)$(NAME).optdata;then\
5854
cp$(objdir)$(NAME).optdata$(outdir);\
5955
fi
60-
@iftest"x$(SIGN)" ="x1";\
61-
thensn -q -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
56+
@iftest"x$(SIGN)" ="x1";then\
57+
sn -q -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
6258
fi
6359
@iftest -e Microsoft.FSharp.targets;then\
64-
mono subst.exe$(REPLACE_ARGS)Microsoft.FSharp.targets>$(outdir)Microsoft.FSharp.targets;\
60+
cpMicrosoft.FSharp.targets$(outdir)Microsoft.FSharp.targets;\
6561
fi
6662

6763
do-2-1: DEFINES +=$(DEFINES_2_1)
@@ -85,11 +81,11 @@ do-2-1: $(objdir) $(objdir)$(TARGET_2_1) $(objdir)$(TARGET_4_0) $(objdir)$(TARGE
8581
@iftest -e$(objdir)$(NAME).optdata;then\
8682
cp$(objdir)$(NAME).optdata$(outdir);\
8783
fi
88-
@iftest"x$(SIGN)" ="x1";\
89-
thensn -q -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
84+
@iftest"x$(SIGN)" ="x1";then\
85+
sn -q -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
9086
fi
9187
@iftest -e Microsoft.FSharp.targets;then\
92-
mono subst.exe$(REPLACE_ARGS)Microsoft.FSharp.targets>$(outdir)Microsoft.FSharp.targets;\
88+
cpMicrosoft.FSharp.targets$(outdir)Microsoft.FSharp.targets;\
9389
fi
9490

9591
do-4-0: DEFINES +=$(DEFINES_4_0)
@@ -113,11 +109,11 @@ do-4-0: $(objdir) $(objdir)$(TARGET_2_0) $(objdir)$(TARGET_4_0) $(objdir)$(TARGE
113109
@iftest -e$(objdir)$(NAME).optdata;then\
114110
cp$(objdir)$(NAME).optdata$(outdir);\
115111
fi
116-
@iftest"x$(SIGN)" ="x1";\
117-
thensn -q -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
112+
@iftest"x$(SIGN)" ="x1";then\
113+
sn -q -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
118114
fi
119115
@iftest -e Microsoft.FSharp.targets;then\
120-
mono subst.exe$(REPLACE_ARGS)Microsoft.FSharp.targets>$(outdir)Microsoft.FSharp.targets;\
116+
cpMicrosoft.FSharp.targets$(outdir)Microsoft.FSharp.targets;\
121117
fi
122118

123119
install-lib-2: TARGET :=$(TARGET_2_0)

0 commit comments

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