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

Commit707badd

Browse files
committed
Enable xbuild support by intalling fsc.exe in mono/lib/4.5
1 parentcdf8abb commit707badd

File tree

24 files changed

+527
-8
lines changed

24 files changed

+527
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ do-final: do-4-0
3737

3838
clean: clean-4-0
3939

40-
install: install-lib-4
40+
install: install-lib-4 install-lib-4-5
4141

‎src/fsharp/FSharp.Compiler.Interactive.Settings/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ do-final: do-4-0
2828

2929
clean: clean-4-0
3030

31-
install: install-lib-4
31+
install: install-lib-4 install-lib-4-5
3232

3333

3434

‎src/fsharp/FSharp.Compiler.Server.Shared/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ do-final: do-4-0
2727

2828
clean: clean-4-0
2929

30-
install: install-lib-4
30+
install: install-lib-4 install-lib-4-5
3131

3232

3333

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ do-final: do-4-0
202202

203203
clean: clean-4-0
204204

205-
install: install-lib-4
205+
install: install-lib-4 install-lib-4-5
206206

207207

208208

‎src/fsharp/Fsc/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ do-final: do-4-0
2828

2929
clean: clean-4-0
3030

31-
install: install-bin-4
31+
install: install-bin-4 install-lib-4-5
3232

3333

3434

‎src/fsharp/fsi/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ do-final: do-4-0
4242

4343
clean: clean-4-0
4444

45-
install: install-bin-4
45+
install: install-bin-4 install-lib-4-5
4646

4747

4848

‎src/fsharp/targets.make‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,15 @@ install-lib-2 install-lib-2-1 install-lib-4:
172172
install-lib-4-5: install-lib-4
173173
@iftest -e$(DESTDIR)$(libdir)mono/4.5/;then\
174174
ln -fs$(DESTDIR)$(libdir)mono/4.0/$(ASSEMBLY)$(DESTDIR)$(libdir)mono/4.5/$(ASSEMBLY);\
175-
ln -fs$(DESTDIR)$(libdir)mono/4.0/$(NAME).sigdata$(DESTDIR)$(libdir)mono/4.5/$(NAME).sigdata;\
176-
ln -fs$(DESTDIR)$(libdir)mono/4.0/$(NAME).optdata$(DESTDIR)$(libdir)mono/4.5/$(NAME).optdata;\
175+
iftest -e$(DESTDIR)$(libdir)mono/4.0/$(ASSEMBLY).config;then \
176+
ln -fs$(DESTDIR)$(libdir)mono/4.0/$(ASSEMBLY).config$(DESTDIR)$(libdir)mono/4.5/$(ASSEMBLY).config;\
177+
fi;\
178+
iftest -e$(DESTDIR)$(libdir)mono/4.0/$(NAME).sigdata;then \
179+
ln -fs$(DESTDIR)$(libdir)mono/4.0/$(NAME).sigdata$(DESTDIR)$(libdir)mono/4.5/$(NAME).sigdata;\
180+
fi;\
181+
iftest -e$(DESTDIR)$(libdir)mono/4.0/$(NAME).optdata;then \
182+
ln -fs$(DESTDIR)$(libdir)mono/4.0/$(NAME).optdata$(DESTDIR)$(libdir)mono/4.5/$(NAME).optdata;\
183+
fi;\
177184
fi
178185

179186
# The binaries fsc.exe and fsi.exe only get installed for Mono 4.0 profile
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 11.00
3+
# Visual Studio 2010
4+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="SampleVisualStudio2010FSharpConsoleApp","SampleVisualStudio2010FSharpConsoleApp\SampleVisualStudio2010FSharpConsoleApp.fsproj","{116CC2F9-F987-4B3D-915A-34CAC04A73DA}"
5+
EndProject
6+
Global
7+
GlobalSection(SolutionConfigurationPlatforms) =preSolution
8+
Debug|x86=Debug|x86
9+
Release|x86=Release|x86
10+
EndGlobalSection
11+
GlobalSection(ProjectConfigurationPlatforms) =postSolution
12+
{116CC2F9-F987-4B3D-915A-34CAC04A73DA}.Debug|x86.ActiveCfg=Debug|x86
13+
{116CC2F9-F987-4B3D-915A-34CAC04A73DA}.Debug|x86.Build.0=Debug|x86
14+
{116CC2F9-F987-4B3D-915A-34CAC04A73DA}.Release|x86.ActiveCfg=Release|x86
15+
{116CC2F9-F987-4B3D-915A-34CAC04A73DA}.Release|x86.Build.0=Release|x86
16+
EndGlobalSection
17+
GlobalSection(SolutionProperties) =preSolution
18+
HideSolutionNode =FALSE
19+
EndGlobalSection
20+
EndGlobal
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// This is a sample F# app created in Visual Studio 2010, targeting .NET 3.5
2+
3+
// On Windows, the build should target
4+
// -r:"C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll"
5+
// -r:"C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.dll"
6+
// and should reference one of these depending on the language version of F# being used
7+
// Program Files\Reference Assemblies\Microsoft\FSharp\2.0\Runtime\v2.0\FSharp.Core.dll
8+
// Program Files\Reference Assemblies\Microsoft\FSharp\3.0\Runtime\v2.0\FSharp.Core.dll
9+
//
10+
// On Mac, you'll get
11+
//
12+
// -r:"/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/2.0/FSharp.Core.dll"
13+
// -r:"/Library/Frameworks/Mono.framework/Versions/2.10.9/lib/mono/2.0/mscorlib.dll"
14+
// -r:"/Library/Frameworks/Mono.framework/Versions/2.10.9/lib/mono/2.0/System.dll"
15+
// -r:"/Library/Frameworks/Mono.framework/Versions/2.10.9/lib/mono/2.0/System.Core.dll"
16+
17+
moduleM
18+
19+
[<EntryPoint>]
20+
letmain args=
21+
System.Console.WriteLine"Hello world"
22+
0
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
5+
<PlatformCondition=" '$(Platform)' == ''">x86</Platform>
6+
<ProductVersion>8.0.30703</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{116cc2f9-f987-4b3d-915a-34cac04a73da}</ProjectGuid>
9+
<OutputType>Exe</OutputType>
10+
<RootNamespace>SampleVisualStudio2010FSharpConsoleApp</RootNamespace>
11+
<AssemblyName>SampleVisualStudio2010FSharpConsoleApp</AssemblyName>
12+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<Name>SampleVisualStudio2010FSharpConsoleApp</Name>
14+
<UsePartialTypes>false</UsePartialTypes>
15+
</PropertyGroup>
16+
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|x86'">
17+
<DebugSymbols>true</DebugSymbols>
18+
<DebugType>full</DebugType>
19+
<Optimize>false</Optimize>
20+
<Tailcalls>false</Tailcalls>
21+
<OutputPath>bin\Debug\</OutputPath>
22+
<DefineConstants>DEBUG;TRACE</DefineConstants>
23+
<WarningLevel>3</WarningLevel>
24+
<PlatformTarget>x86</PlatformTarget>
25+
<DocumentationFile>bin\Debug\SampleVisualStudio2010FSharpConsoleApp.XML</DocumentationFile>
26+
</PropertyGroup>
27+
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Release|x86'">
28+
<DebugType>pdbonly</DebugType>
29+
<Optimize>true</Optimize>
30+
<Tailcalls>true</Tailcalls>
31+
<OutputPath>bin\Release\</OutputPath>
32+
<DefineConstants>TRACE</DefineConstants>
33+
<WarningLevel>3</WarningLevel>
34+
<PlatformTarget>x86</PlatformTarget>
35+
<DocumentationFile>bin\Release\SampleVisualStudio2010FSharpConsoleApp.XML</DocumentationFile>
36+
<DebugSymbols>false</DebugSymbols>
37+
</PropertyGroup>
38+
<ItemGroup>
39+
<ReferenceInclude="mscorlib" />
40+
<ReferenceInclude="FSharp.Core" />
41+
<ReferenceInclude="System" />
42+
<ReferenceInclude="System.Core" />
43+
</ItemGroup>
44+
<ItemGroup>
45+
<CompileInclude="Program.fs" />
46+
</ItemGroup>
47+
<ImportProject="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets"Condition="!Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
48+
<ImportProject="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets"Condition=" Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
49+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
50+
Other similar extension points exist, see Microsoft.Common.targets.
51+
<Target Name="BeforeBuild">
52+
</Target>
53+
<Target Name="AfterBuild">
54+
</Target>
55+
-->
56+
</Project>

0 commit comments

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