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

Commit1da539a

Browse files
committed
Allow build using xbuild and Mono
xbuild requires absolute paths for tools
1 parentb8ef88b commit1da539a

File tree

18 files changed

+34
-28
lines changed

18 files changed

+34
-28
lines changed

‎README.md‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ brew install automake
1717

1818
##Building
1919

20-
To build and install on non-MacOS systems:
20+
To build and install on non-MacOSUnixsystems:
2121
```
2222
./autogen.sh
2323
make
@@ -31,13 +31,19 @@ make
3131
sudo make install
3232
```
3333

34-
You can alsobuild using xbuild:
34+
On Windows,build usingmsbuild (if .NET is installed) orxbuild (if only Mono 3.0.1 is installed):
3535
```
3636
cd src
37-
xbuild fsharp-build.proj
37+
xbuild fsharp-proto-build.proj
38+
xbuild fsharp-library-build.proj
39+
xbuild fsharp-compiler-build.proj
40+
```
41+
Building using xbuild does not yet lay down a Mono-ready distribution (see src/fsharp/targets.make), so should only
42+
be used for private development rather than preparing distributions. The FSharp.Core.dll produced will be delay-signed,
43+
if a strong-name signed FSharp.Core.dll is needed then use the one in
44+
```
45+
lib\bootstrap\signed\3.0\v4.0\FSharp.Core.dll
3846
```
39-
However the binaries produced are NOT yet usable because they are not correctly strong-name signed. Further, building using
40-
xbuild does not create a Mono-ready distribution (see src/fsharp/targets.make).
4147

4248

4349
##What you get

‎src/FSharpSource.targets‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<TargetFrameworkCondition="'$(TargetFramework)'==''">net40</TargetFramework>
1111
<!-- Use a 4.0 proto compiler-->
1212
<protoCLIDirCondition="'$(protoCLIDir)' == ''">net40</protoCLIDir>
13-
<LkgPath>..\lib\bootstrap\4.0</LkgPath>
13+
<LkgPath>$(FSharpSourcesRoot)\..\lib\bootstrap\4.0</LkgPath>
1414
<FsLexUnicode>true</FsLexUnicode>
1515
<ProjectLanguage>FSharp</ProjectLanguage>
1616
<OtherFlags>$(OtherFlags) --times</OtherFlags>
@@ -465,9 +465,9 @@
465465

466466
<!-- Reference an existing FSI.EXE for use from within MSBuild-->
467467
<PropertyGroup>
468-
<FsSrGenToolPath>$(FSharpSourcesRoot)\$(LkgPath)\..\2.0</FsSrGenToolPath>
469-
<FsLexToolPath>$(FSharpSourcesRoot)\$(LkgPath)\..\2.0</FsLexToolPath>
470-
<FsYaccToolPath>$(FSharpSourcesRoot)\$(LkgPath)\..\2.0</FsYaccToolPath>
468+
<FsSrGenToolPath>$(LkgPath)\..\2.0</FsSrGenToolPath>
469+
<FsLexToolPath>$(LkgPath)\..\2.0</FsLexToolPath>
470+
<FsYaccToolPath>$(LkgPath)\..\2.0</FsYaccToolPath>
471471
<FsLexToolExe>fslex.exe</FsLexToolExe>
472472
<FsYaccToolExe>fsyacc.exe</FsYaccToolExe>
473473
</PropertyGroup>

‎src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-->
1212
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1313
<PropertyGroup>
14-
<FSharpSourcesRoot>..\..</FSharpSourcesRoot>
14+
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
1515
<ConfigurationCondition=" '$(Configuration)' == ''">Proto</Configuration>
1616
<PlatformCondition=" '$(Platform)' == ''">AnyCPU</Platform>
1717
</PropertyGroup>

‎src/fsharp/FSharp.Build/FSharp.Build.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-->
1212
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1313
<PropertyGroup>
14-
<FSharpSourcesRoot>..\..</FSharpSourcesRoot>
14+
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
1515
<ProductVersion>10.0.0</ProductVersion>
1616
<SchemaVersion>2.0</SchemaVersion>
1717
<UsePartialTypes>False</UsePartialTypes>

‎src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-->
1212
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1313
<PropertyGroup>
14-
<FSharpSourcesRoot>..\..</FSharpSourcesRoot>
14+
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
1515
<ConfigurationCondition=" '$(Configuration)' == ''">Proto</Configuration>
1616
<ProductVersion>10.0.0</ProductVersion>
1717
<SchemaVersion>2.0</SchemaVersion>
@@ -439,5 +439,5 @@
439439
<ReferenceInclude="Microsoft.Build.Tasks.v4.0"Condition="'$(TargetFramework)'=='net40'" />
440440
</ItemGroup>
441441
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
442-
<ImportProject="$(FSharpSourcesRoot)\$(LkgPath)\..\2.0\FSharp.PowerPack.targets" />
442+
<ImportProject="$(LkgPath)\..\2.0\FSharp.PowerPack.targets" />
443443
</Project>

‎src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-->
1212
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1313
<PropertyGroup>
14-
<FSharpSourcesRoot>..\..</FSharpSourcesRoot>
14+
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
1515
<ProductVersion>10.0.0</ProductVersion>
1616
<SchemaVersion>2.0</SchemaVersion>
1717
<UsePartialTypes>False</UsePartialTypes>

‎src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-->
1212
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1313
<PropertyGroup>
14-
<FSharpSourcesRoot>..\..</FSharpSourcesRoot>
14+
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
1515
<ProductVersion>10.0.0</ProductVersion>
1616
<SchemaVersion>2.0</SchemaVersion>
1717
<UsePartialTypes>False</UsePartialTypes>

‎src/fsharp/FSharp.Compiler.Silverlight/FSharp.Compiler.Silverlight.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<FSharpSourcesRoot>..\..</FSharpSourcesRoot>
4+
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
55
<TargetFrameworkCondition="'$(TargetFramework)' == ''">sl5-compiler</TargetFramework>
66
<ProductVersion>10.0.0</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>
@@ -491,5 +491,5 @@
491491
</ItemGroup>
492492
<ImportProject="$(FSharpSourcesRoot)\FSharpTeam.targets"Condition=" Exists('$(FSharpSourcesRoot)\FSharpTeam.targets')" />
493493
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets"Condition=" !Exists('$(FSharpSourcesRoot)\FSharpTeam.targets')" />
494-
<ImportProject="$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin\FSharp.PowerPack.targets" />
494+
<ImportProject="$(LkgPath)\..\2.0\FSharp.PowerPack.targets" />
495495
</Project>

‎src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-->
1212
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1313
<PropertyGroup>
14-
<FSharpSourcesRoot>..\..</FSharpSourcesRoot>
14+
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
1515
<ProductVersion>10.0.0</ProductVersion>
1616
<SchemaVersion>2.0</SchemaVersion>
1717
<UsePartialTypes>False</UsePartialTypes>
@@ -515,5 +515,5 @@
515515
</ProjectReference>
516516
</ItemGroup>
517517
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
518-
<ImportProject="$(FSharpSourcesRoot)\$(LkgPath)\..\2.0\FSharp.PowerPack.targets" />
518+
<ImportProject="$(LkgPath)\..\2.0\FSharp.PowerPack.targets" />
519519
</Project>

‎src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<FSharpSourcesRoot>..\..</FSharpSourcesRoot>
4+
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
55
<ProductVersion>10.0.0</ProductVersion>
66
<UsePartialTypes>False</UsePartialTypes>
77
</PropertyGroup>

0 commit comments

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