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

Commit2fe7068

Browse files
author
Andreia Gaita
committed
Install the libraries on mono/X.0 instead of mono/fsharp-X.0 to make it easier
to integrate with xbuild. Also, install the .targets file and adjust the paths
1 parent0984e93 commit2fe7068

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,12 @@ Copyright (C) Microsoft Corporation. All rights reserved.
1717

1818
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1919

20-
<UsingTaskTaskName="Fsc"AssemblyFile="FSharp.Build{BuildSuffix}.dll"/>
21-
<UsingTaskTaskName="CreateFSharpManifestResourceName"AssemblyFile="FSharp.Build{BuildSuffix}.dll"/>
20+
<UsingTaskTaskName="Fsc"AssemblyFile="FSharp.Build.dll"/>
21+
<UsingTaskTaskName="CreateFSharpManifestResourceName"AssemblyFile="FSharp.Build.dll"/>
2222

2323

2424
<PropertyGroup>
25-
<!-- FSharpTargetsDir is the directory where the targets file lives-->
26-
<FSharpTargetsDirCondition="'$(FSharpTargetsDir)'==''">$(MSBuildExtensionsPath32)\FSharp\1.0\</FSharpTargetsDir>
27-
<!-- FSharpTargetsFullPath is the full path (dir + filename) of the targets file-->
28-
<FSharpTargetsFullPathCondition="'$(FSharpTargetsDir)'!=''">$(FSharpTargetsDir)\Microsoft.FSharp{BuildSuffix}.targets</FSharpTargetsFullPath>
29-
<MSBuildAllProjects>$(MSBuildAllProjects);$(FSharpTargetsFullPath)</MSBuildAllProjects>
25+
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildToolsPath)\Microsoft.FSharp.targets</MSBuildAllProjects>
3026
<DefaultLanguageSourceExtension>.fs</DefaultLanguageSourceExtension>
3127
<Language>F#</Language>
3228
<TailcallsCondition="'$(Tailcalls)'==''">$(Optimize)</Tailcalls>
@@ -188,6 +184,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
188184

189185
</Target>
190186

191-
<ImportProject="$(MSBuildBinPath)\Microsoft.Common.targets"/>
187+
<ImportProject="Microsoft.Common.targets"/>
192188

193189
</Project>

‎src/fsharp/targets.make‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ do-2-0: $(objdir) $(objdir)$(TARGET_2_0) $(objdir)$(TARGET_4_0) $(objdir)$(TARGE
4747
@iftest"x$(SIGN)" ="x1";\
4848
then sn -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
4949
fi
50+
@iftest -e Microsoft.FSharp.targets;then\
51+
cp Microsoft.FSharp.targets$(outdir);\
52+
fi
5053

5154
do-4-0: DEFINES +=$(DEFINES_4_0)
5255
do-4-0: REFERENCES +=$(REFERENCES_4_0)
@@ -68,6 +71,9 @@ do-4-0: $(objdir) $(objdir)$(TARGET_2_0) $(objdir)$(TARGET_4_0) $(objdir)$(TARGE
6871
@iftest"x$(SIGN)" ="x1";\
6972
then sn -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
7073
fi
74+
@iftest -e Microsoft.FSharp.targets;then\
75+
cp Microsoft.FSharp.targets$(outdir);\
76+
fi
7177

7278
install-lib-2: TARGET :=$(TARGET_2_0)
7379
install-lib-2: VERSION :=$(VERSION_2_0)
@@ -82,22 +88,24 @@ install-bin-4: TARGET := $(TARGET_4_0)
8288
install-lib-2install-lib-4:
8389
@echo"Installing$(ASSEMBLY)"
8490
@mkdir -p$(DESTDIR)/$(libdir)
85-
@gacutil -i$(outdir)$(ASSEMBLY) -root$(DESTDIR)/$(libdir) -package fsharp-$(TARGET)
91+
@mkdir -p$(DESTDIR)/$(libdir)mono/$(TARGET)
92+
@gacutil -i$(outdir)$(ASSEMBLY) -root$(DESTDIR)/$(libdir) -package$(TARGET)
8693
@iftest -e$(outdir)$(NAME).sigdata;then\
8794
$(INSTALL_LIB)$(outdir)$(NAME).sigdata$(DESTDIR)/$(libdir)mono/gac/$(NAME)/$(VERSION)__$(TOKEN);\
88-
ln -s$(DESTDIR)/$(libdir)mono/gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).sigdata$(DESTDIR)/$(libdir)mono/fsharp-$(TARGET)/$(NAME).sigdata;\
95+
ln -fs$(DESTDIR)/$(libdir)mono/gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).sigdata$(DESTDIR)/$(libdir)mono/$(TARGET)/$(NAME).sigdata;\
8996
fi
9097
@iftest -e$(outdir)$(NAME).optdata;then\
9198
$(INSTALL_LIB)$(outdir)$(NAME).optdata$(DESTDIR)/$(libdir)mono/gac/$(NAME)/$(VERSION)__$(TOKEN);\
92-
ln -s$(DESTDIR)/$(libdir)mono/gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).optdata$(DESTDIR)/$(libdir)mono/fsharp-$(TARGET)/$(NAME).optdata;\
99+
ln -fs$(DESTDIR)/$(libdir)mono/gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).optdata$(DESTDIR)/$(libdir)mono/$(TARGET)/$(NAME).optdata;\
93100
fi
101+
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.targets$(DESTDIR)/$(libdir)mono/$(TARGET)/;
94102

95103
install-bin-2install-bin-4:
96-
sed -e's,[@]DIR[@],$(libdir)mono/fsharp-$(TARGET),g' -e's,[@]TOOL[@],fsc.exe,g'<$(topdir)launcher.in>$(outdir)$(NAME)$(VERSION)
104+
sed -e's,[@]DIR[@],$(libdir)mono/$(TARGET),g' -e's,[@]TOOL[@],fsc.exe,g'<$(topdir)launcher.in>$(outdir)$(NAME)$(VERSION)
97105
chmod +x$(outdir)$(NAME)$(VERSION)
98106
@mkdir -p$(DESTDIR)/$(libdir)
99107
@mkdir -p$(DESTDIR)/$(bindir)
100-
$(INSTALL_LIB)$(outdir)$(ASSEMBLY)$(DESTDIR)$(libdir)mono/fsharp-$(TARGET)
108+
$(INSTALL_LIB)$(outdir)$(ASSEMBLY)$(DESTDIR)$(libdir)mono/$(TARGET)
101109
$(INSTALL_BIN)$(outdir)$(NAME)$(VERSION)$(DESTDIR)/$(bindir)
102110

103111
$(objdir)$(objdir)$(TARGET_2_0)$(objdir)$(TARGET_4_0):

0 commit comments

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