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

Commit7975efc

Browse files
committed
Assume Mono 5.0 and build using msbuild, no longer build PCLs
1 parentcc455c1 commit7975efc

File tree

16 files changed

+162
-148
lines changed

16 files changed

+162
-148
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ os:
66

77
mono:
88
-latest
9-
-4.8.0
10-
-4.4.2
9+
-5.0.1
1110

1211
install:
1312

‎CHANGELOG-fsharp.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
4.1.24
2+
* Build using Mono 5.0 and msbuild
3+
4+
4.1.23
5+
* Fix nuget package for FSharp.Compiler.Tools System.ValueTuple.dll
6+
17
4.1.21
28
* Fix nuget package for FSharp.Compiler.Tools
39

‎FSharp.Compiler.Tools.Nuget/FSharp.Compiler.Tools.nuspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<filesrc="..\Release\net40\bin\FSharp.Build.xml"target="tools\FSharp.Build.xml" />
4545
<filesrc="..\Release\net40\bin\System.Collections.Immutable.dll"target="tools\System.Collections.Immutable.dll" />
4646
<filesrc="..\Release\net40\bin\System.Reflection.Metadata.dll"target="tools\System.Reflection.Metadata.dll" />
47+
<filesrc="..\Release\net40\bin\System.ValueTuple.dll"target="tools\System.ValueTuple.dll" />
4748
<filesrc="..\Release\net40\bin\Microsoft.DiaSymReader.dll"target="tools\Microsoft.DiaSymReader.dll" />
4849
<filesrc="..\Release\net40\bin\Microsoft.DiaSymReader.PortablePdb.dll"target="tools\Microsoft.DiaSymReader.PortablePdb.dll" />
4950

‎Makefile‎

Lines changed: 65 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -14,50 +14,59 @@ all:
1414
$(MAKE) build
1515

1616
build-proto: restore
17-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
18-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/Fsc-proto/Fsc-proto.fsproj
17+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=Proto /p:TargetDotnetProfile=$(TargetDotnetProfile) src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
18+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=Proto /p:TargetDotnetProfile=$(TargetDotnetProfile) src/fsharp/Fsc-proto/Fsc-proto.fsproj
1919

2020
# The main targets
2121
build:
22-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Core/FSharp.Core.fsproj
23-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Build/FSharp.Build.fsproj
24-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
25-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/Fsc/Fsc.fsproj
26-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
27-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
28-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/fsi/Fsi.fsproj
29-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
30-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
31-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 /p:FSharpCoreBackVersion=3.0 src/fsharp/FSharp.Core/FSharp.Core.fsproj
32-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 /p:FSharpCoreBackVersion=3.1 src/fsharp/FSharp.Core/FSharp.Core.fsproj
33-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 /p:FSharpCoreBackVersion=4.0 src/fsharp/FSharp.Core/FSharp.Core.fsproj
34-
$(MAKE) -C mono/policy.2.0.FSharp.Core TargetFramework=net40$@
35-
$(MAKE) -C mono/policy.2.3.FSharp.Core TargetFramework=net40$@
36-
$(MAKE) -C mono/policy.3.3.FSharp.Core TargetFramework=net40$@
37-
$(MAKE) -C mono/policy.3.7.FSharp.Core TargetFramework=net40$@
38-
$(MAKE) -C mono/policy.3.47.FSharp.Core TargetFramework=net40$@
39-
$(MAKE) -C mono/policy.3.78.FSharp.Core TargetFramework=net40$@
40-
$(MAKE) -C mono/policy.3.259.FSharp.Core TargetFramework=net40$@
41-
$(MAKE) -C mono/policy.4.0.FSharp.Core TargetFramework=net40$@
42-
$(MAKE) -C mono/policy.4.3.FSharp.Core TargetFramework=net40$@
43-
$(MAKE) -C mono/policy.4.4.FSharp.Core TargetFramework=net40$@
22+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Core/FSharp.Core.fsproj
23+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Build/FSharp.Build.fsproj
24+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
25+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/Fsc/Fsc.fsproj
26+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
27+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
28+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsi/Fsi.fsproj
29+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
30+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
31+
$(MAKE) -C mono/policy.2.0.FSharp.Core TargetDotnetProfile=net40$@
32+
$(MAKE) -C mono/policy.2.3.FSharp.Core TargetDotnetProfile=net40$@
33+
$(MAKE) -C mono/policy.3.3.FSharp.Core TargetDotnetProfile=net40$@
34+
$(MAKE) -C mono/policy.3.7.FSharp.Core TargetDotnetProfile=net40$@
35+
$(MAKE) -C mono/policy.3.47.FSharp.Core TargetDotnetProfile=net40$@
36+
$(MAKE) -C mono/policy.3.78.FSharp.Core TargetDotnetProfile=net40$@
37+
$(MAKE) -C mono/policy.3.259.FSharp.Core TargetDotnetProfile=net40$@
38+
$(MAKE) -C mono/policy.4.0.FSharp.Core TargetDotnetProfile=net40$@
39+
$(MAKE) -C mono/policy.4.3.FSharp.Core TargetDotnetProfile=net40$@
40+
$(MAKE) -C mono/policy.4.4.FSharp.Core TargetDotnetProfile=net40$@
41+
mkdir -p$(Configuration)/fsharp30/net40/bin
42+
mkdir -p$(Configuration)/fsharp31/net40/bin
43+
mkdir -p$(Configuration)/fsharp40/net40/bin
44+
cp -p packages/FSharp.Core.3.0.2/lib/net40/*$(Configuration)/fsharp30/net40/bin
45+
cp -p packages/FSharp.Core.3.1.2.5/lib/net40/*$(Configuration)/fsharp31/net40/bin
46+
cp -p packages/FSharp.Core.4.0.0.1/lib/net40/*$(Configuration)/fsharp40/net40/bin
4447
ifeq ("$(pclenabled47)", "yes")
45-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable47 src/fsharp/FSharp.Core/FSharp.Core.fsproj
48+
mkdir -p $(Configuration)/portable7/bin
49+
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45/* $(Configuration)/portable7/bin
4650
endif
4751
ifeq ("$(pclenabled7)", "yes")
48-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable7 src/fsharp/FSharp.Core/FSharp.Core.fsproj
52+
mkdir -p $(Configuration)/portable47/bin
53+
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+sl5+netcore45/* $(Configuration)/portable47/bin
4954
endif
5055
ifeq ("$(pclenabled78)", "yes")
51-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable78 src/fsharp/FSharp.Core/FSharp.Core.fsproj
56+
mkdir -p $(Configuration)/portable78/bin
57+
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45+wp8/* $(Configuration)/portable78/bin
5258
endif
5359
ifeq ("$(pclenabled259)", "yes")
54-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable259 src/fsharp/FSharp.Core/FSharp.Core.fsproj
60+
mkdir -p $(Configuration)/portable259/bin
61+
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45+wpa81+wp8/* $(Configuration)/portable259/bin
5562
endif
5663
ifeq ("$(monodroidenabled)", "yes")
57-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=monoandroid10+monotouch10+xamarinios10 src/fsharp/FSharp.Core/FSharp.Core.fsproj
64+
mkdir -p $(Configuration)/monoandroid10+monotouch10+xamarinios10/bin
65+
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+monoandroid10+monotouch10+xamarinios10/* $(Configuration)/monoandroid10+monotouch10+xamarinios10/bin
5866
endif
5967
ifeq ("$(xamarinmacenabled)", "yes")
60-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=xamarinmacmobile src/fsharp/FSharp.Core/FSharp.Core.fsproj
68+
mkdir -p $(Configuration)/xamarinmacmobile/bin
69+
cp -p packages/FSharp.Core.4.1.17/lib/xamarinmac20/* $(Configuration)/xamarinmacmobile/bin
6170
endif
6271

6372

@@ -68,52 +77,52 @@ install:
6877
-rm -fr$(DESTDIR)$(monodir)/Microsoft\SDKs/F#
6978
-rm -fr$(DESTDIR)$(monodir)/gac/FSharp.Core
7079
-rm -fr$(DESTDIR)$(monodir)/gac/FSharp.Compiler.Private
71-
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp
72-
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp
73-
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp
74-
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp
75-
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp
76-
$(MAKE) -C mono/FSharp.CoreTargetFramework=net40 install
80+
-rm -fr$(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v/FSharp
81+
-rm -fr$(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v11.0/FSharp
82+
-rm -fr$(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v12.0/FSharp
83+
-rm -fr$(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v14.0/FSharp
84+
-rm -fr$(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v15.0/FSharp
85+
$(MAKE) -C mono/FSharp.CoreTargetDotnetProfile=net40 install
7786
$(MAKE) -C mono/FSharp.Build install
7887
$(MAKE) -C mono/FSharp.Compiler.Private install
7988
$(MAKE) -C mono/Fsc install
8089
$(MAKE) -C mono/FSharp.Compiler.Interactive.Settings install
8190
$(MAKE) -C mono/FSharp.Compiler.Server.Shared install
8291
$(MAKE) -C mono/fsi install
8392
$(MAKE) -C mono/fsiAnyCpu install
84-
$(MAKE) -C mono/FSharp.CoreTargetFramework=net40 FSharpCoreBackVersion=3.0 install
85-
$(MAKE) -C mono/FSharp.CoreTargetFramework=net40 FSharpCoreBackVersion=3.1 install
86-
$(MAKE) -C mono/FSharp.CoreTargetFramework=net40 FSharpCoreBackVersion=4.0 install
87-
$(MAKE) -C mono/policy.2.0.FSharp.CoreTargetFramework=net40 install
88-
$(MAKE) -C mono/policy.2.3.FSharp.CoreTargetFramework=net40 install
89-
$(MAKE) -C mono/policy.3.3.FSharp.CoreTargetFramework=net40 install
90-
$(MAKE) -C mono/policy.3.7.FSharp.CoreTargetFramework=net40 install
91-
$(MAKE) -C mono/policy.3.47.FSharp.CoreTargetFramework=net40 install
92-
$(MAKE) -C mono/policy.3.78.FSharp.CoreTargetFramework=net40 install
93-
$(MAKE) -C mono/policy.3.259.FSharp.CoreTargetFramework=net40 install
94-
$(MAKE) -C mono/policy.4.0.FSharp.CoreTargetFramework=net40 install
95-
$(MAKE) -C mono/policy.4.3.FSharp.CoreTargetFramework=net40 install
96-
$(MAKE) -C mono/policy.4.4.FSharp.CoreTargetFramework=net40 install
93+
$(MAKE) -C mono/FSharp.CoreTargetDotnetProfile=net40 FSharpCoreBackVersion=3.0 install
94+
$(MAKE) -C mono/FSharp.CoreTargetDotnetProfile=net40 FSharpCoreBackVersion=3.1 install
95+
$(MAKE) -C mono/FSharp.CoreTargetDotnetProfile=net40 FSharpCoreBackVersion=4.0 install
96+
$(MAKE) -C mono/policy.2.0.FSharp.CoreTargetDotnetProfile=net40 install
97+
$(MAKE) -C mono/policy.2.3.FSharp.CoreTargetDotnetProfile=net40 install
98+
$(MAKE) -C mono/policy.3.3.FSharp.CoreTargetDotnetProfile=net40 install
99+
$(MAKE) -C mono/policy.3.7.FSharp.CoreTargetDotnetProfile=net40 install
100+
$(MAKE) -C mono/policy.3.47.FSharp.CoreTargetDotnetProfile=net40 install
101+
$(MAKE) -C mono/policy.3.78.FSharp.CoreTargetDotnetProfile=net40 install
102+
$(MAKE) -C mono/policy.3.259.FSharp.CoreTargetDotnetProfile=net40 install
103+
$(MAKE) -C mono/policy.4.0.FSharp.CoreTargetDotnetProfile=net40 install
104+
$(MAKE) -C mono/policy.4.3.FSharp.CoreTargetDotnetProfile=net40 install
105+
$(MAKE) -C mono/policy.4.4.FSharp.CoreTargetDotnetProfile=net40 install
97106
ifeq ("$(pclenabled47)", "yes")
98-
$(MAKE) -C mono/FSharp.CoreTargetFramework=portable47 install
107+
$(MAKE) -C mono/FSharp.CoreTargetDotnetProfile=portable47 install
99108
endif
100109
ifeq ("$(pclenabled7)", "yes")
101-
$(MAKE) -C mono/FSharp.CoreTargetFramework=portable7 install
110+
$(MAKE) -C mono/FSharp.CoreTargetDotnetProfile=portable7 install
102111
endif
103112
ifeq ("$(pclenabled78)", "yes")
104-
$(MAKE) -C mono/FSharp.CoreTargetFramework=portable78 install
113+
$(MAKE) -C mono/FSharp.CoreTargetDotnetProfile=portable78 install
105114
endif
106115
ifeq ("$(pclenabled259)", "yes")
107-
$(MAKE) -C mono/FSharp.CoreTargetFramework=portable259 install
116+
$(MAKE) -C mono/FSharp.CoreTargetDotnetProfile=portable259 install
108117
endif
109118
ifeq ("$(monodroidenabled)", "yes")
110-
$(MAKE) -C mono/FSharp.CoreTargetFramework=monoandroid10+monotouch10+xamarinios10 install
119+
$(MAKE) -C mono/FSharp.CoreTargetDotnetProfile=monoandroid10+monotouch10+xamarinios10 install
111120
endif
112121
ifeq ("$(xamarinmacenabled)", "yes")
113-
$(MAKE) -C mono/FSharp.CoreTargetFramework=xamarinmacmobile install
122+
$(MAKE) -C mono/FSharp.CoreTargetDotnetProfile=xamarinmacmobile install
114123
endif
115124
echo "------------------------------ INSTALLED FILES --------------"
116-
ls -xlR $(DESTDIR)$(monodir)/fsharp $(DESTDIR)$(monodir)/xbuild $(DESTDIR)$(monodir)/gac/FSharp* $(DESTDIR)$(monodir)/Microsoft*
125+
ls -xlR $(DESTDIR)$(monodir)/fsharp $(DESTDIR)$(monodir)/msbuild $(DESTDIR)$(monodir)/gac/FSharp* $(DESTDIR)$(monodir)/Microsoft*
117126

118127
dist:
119128
-rm -r fsharp-$(DISTVERSION) fsharp-$(DISTVERSION).tar.bz2

‎README.md‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -144,31 +144,24 @@ If using NuGet Package Manager, add the source to the list of available package
144144

145145
###Building on Linux and other Unix systems:
146146

147-
Building F# on Unix-type platforms requires
148-
[Mono](http://www.mono-project.com/download/) 4.4 or higher. If you
149-
get a complaint in subsequent steps about`xbuild` being missing, it means
150-
you don't have Mono installed.
151-
152-
The usual:
147+
Building F# on Unix-type platforms requires[Mono](http://www.mono-project.com/download/) 5.0 or higher.
153148

154149
./autogen.sh --prefix=/usr
155150
make
156151
sudo make install
157152

158-
By default that makes optimized binaries. To make debug, use```make CONFIG=debug```
153+
That build and installs optimized binaries. To make debug, use```make CONFIG=debug```
159154

160155

161156
###Building on macOS
162157

163-
Building on macOS requires an install of the Xamarin tools.
164-
165-
Use a prefix to your version of Mono:
158+
Building on macOS requires an install of the latest Xamarin tools or Mono package. Use a prefix to your version of Mono:
166159

167160
./autogen.sh --prefix=/Library/Frameworks/Mono.framework/Versions/Current/
168161
make
169162
sudo make install
170163

171-
By default that makes optimized binaries. To make debug, use```make CONFIG=debug```
164+
That build and installs optimized binaries. To make debug, use```make CONFIG=debug```
172165

173166
###Building on Windows
174167

‎build.bat‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,18 @@ if not exist %_ngenexe% echo Note: Could not find ngen.exe.
1818
.\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget\nuget.config
1919
@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :failure
2020

21-
%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.5\tools\fsc.exe
21+
%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.23\tools\fsc.exe
2222

2323
setBUILD_NET40=1
24-
setBUILD_PORTABLE=1
25-
setBUILD_XAMARIN=1
2624
setTEST_NET40_COREUNIT_SUITE=1
27-
setTEST_PORTABLE_COREUNIT_SUITE=1
2825

2926
%_msbuildexe% src\fsharp-proto-build.proj /p:Configuration=Proto
3027
@if ERRORLEVEL1echo Error:"%_msbuildexe% src\fsharp-proto-build.proj" failed&&goto :failure
3128

3229
%_ngenexe% install Proto\net440\bin\fsc-proto.exe
3330

34-
%_msbuildexe%%msbuildflags% build-everything.proj /p:TargetFramework=net40 /p:Configuration=Release
35-
@if ERRORLEVEL1echo Error:"%_msbuildexe%%msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=net40 /p:Configuration=Release" failed&&goto :failure
31+
%_msbuildexe%%msbuildflags% build-everything.proj /p:TargetDotnetProfile=net40 /p:Configuration=Release
32+
@if ERRORLEVEL1echo Error:"%_msbuildexe%%msbuildflags% src\fsharp-library-build.proj /p:TargetDotnetProfile=net40 /p:Configuration=Release" failed&&goto :failure
3633

3734

3835
@echo"Finished"

‎configure.ac‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ MONOPREFIX=$(cd `$PKG_CONFIG --variable=prefix mono` && pwd)
4646
MONOBINDIR="$MONOPREFIX"/bin
4747
MONOLIBDIR="$MONOPREFIX"/lib
4848

49-
AC_PATH_PROG(XBUILD,xbuild,no)
50-
xbuild_from_pkg_config="$MONOBINDIR"/xbuild
51-
if test -e $xbuild_from_pkg_config; then
52-
XBUILD=$xbuild_from_pkg_config
53-
elif test "x$XBUILD" == "xno"; then
54-
AC_MSG_ERROR([Could not findxbuild])
49+
AC_PATH_PROG(MSBUILD,msbuild,no)
50+
msbuild_from_pkg_config="$MONOBINDIR"/msbuild
51+
if test -e $msbuild_from_pkg_config; then
52+
MSBUILD=$msbuild_from_pkg_config
53+
elif test "x$MSBUILD" == "xno"; then
54+
AC_MSG_ERROR([Could not findmsbuild])
5555
fi
56-
AC_MSG_NOTICE(xbuild:$XBUILD)
56+
AC_MSG_NOTICE(msbuild:$MSBUILD)
5757

5858
MONOGACDIR="$MONOLIBDIR"/mono
5959
if ! test "x$with_gacdir" = "xno"; then

‎mono/config.make.in‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ DISTVERSION = 201011
3030

3131
# Version number mappings for various versions of FSharp.Core
3232

33+
3334
ifeq (x-$(TargetDotnetProfile)-,x-net40-)
3435

3536
ifeq (x-$(FSharpCoreBackVersion)-,x--)
@@ -105,7 +106,7 @@ INSTALL = $(SHELL) $(topdir)/mono/install-sh
105106
INSTALL_BIN = $(INSTALL) -c -m 755
106107
INSTALL_LIB = $(INSTALL_BIN)
107108

108-
XBUILD = @XBUILD@
109+
MSBUILD = @MSBUILD@
109110

110111
EXTRA_DIST = configure
111112
NO_DIST = .gitignore lib/debug lib/proto lib/release

‎mono/prepare-mono.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ fi)
5454
fi)
5555

5656
#TODO: work out how to avoid the need for this
57-
echo"chmod u+x packages/FSharp.Compiler.Tools.4.1.5/tools/fsi.exe"
57+
echo"chmod u+x packages/FSharp.Compiler.Tools.4.1.23/tools/fsi.exe"
5858
echo"chmod u+x packages/FsLexYacc.7.0.4/build/fslex.exe"
5959
echo"chmod u+x packages/FsLexYacc.7.0.4/build/fsyacc.exe"
60-
chmod u+x packages/FSharp.Compiler.Tools.4.1.5/tools/fsi.exe
60+
chmod u+x packages/FSharp.Compiler.Tools.4.1.23/tools/fsi.exe
6161
chmod u+x packages/FsLexYacc.7.0.4/build/fslex.exe
6262
chmod u+x packages/FsLexYacc.7.0.4/build/fsyacc.exe
6363

‎packages.config‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,23 @@
3030

3131
<!-- FSharp.Compiler.Tools is only used to get a working FSI.EXE to execute some scripts during the build-->
3232
<!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful-->
33-
<packageid="FSharp.Compiler.Tools"version="4.1.5"/>
33+
<packageid="FSharp.Compiler.Tools"version="4.1.23"/>
3434

3535
<!-- Frozen portable library versions of FSharp.Core.dll (simply a renamed fsharp.core.4.1.18-->
3636
<packageid="Microsoft.Portable.FSharp.Core"version="4.1.20"/>
3737

38+
<!-- FSharp.Core is used to get back versions of FSharp.Core-->
39+
<packageid="FSharp.Core"version="4.1.17"/>
40+
41+
<!-- FSharp.Core is used to get back versions of FSharp.Core-->
42+
<packageid="FSharp.Core"version="4.0.0.1"/>
43+
44+
<!-- FSharp.Core is used to get back versions of FSharp.Core-->
45+
<packageid="FSharp.Core"version="3.1.2.5"/>
46+
47+
<!-- FSharp.Core is used to get back versions of FSharp.Core-->
48+
<packageid="FSharp.Core"version="3.0.2"/>
49+
3850
<!-- FSharp.Data is used in some of the scripts ued for the coreclr build-->
3951
<packageid="FSharp.Data"version="2.2.5" />
4052

0 commit comments

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