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

Commitbca446d

Browse files
authored
Fix the Mono and OSX builds (#4273)
* fix build.sh for OSX and a little cleanup* fix build for mono packaging* fix build for mono packaging* disable some tests by default on OSX with build.sh test* fix build from source IVTs
1 parente2168fa commitbca446d

File tree

33 files changed

+262
-432
lines changed

33 files changed

+262
-432
lines changed

‎FSharp.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Tests.FSharpSuite",
3131
EndProject
3232
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.UnitTests","tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj","{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
3333
EndProject
34-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core.UnitTests","tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"
34+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core.UnitTests","tests\FSharp.Core.UnitTests\FSharp.Core.Unittests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"
3535
EndProject
3636
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Compiler","Compiler","{3881429D-A97A-49EB-B7AE-A82BA5FE9C77}"
3737
EndProject

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include$(topsrcdir)mono/config.make
22

3-
.PHONY: restore
3+
.PHONY: restore build
44

55
restore:
66
MONO_ENV_OPTIONS=$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config
@@ -27,7 +27,7 @@ build:
2727
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
2828
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsi/Fsi.fsproj
2929
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 tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
30+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj
3131
mkdir -p$(Configuration)/fsharp30/net40/bin
3232
mkdir -p$(Configuration)/fsharp31/net40/bin
3333
mkdir -p$(Configuration)/fsharp40/net40/bin

‎before_install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fi
3232
# We need to run the command twice -- on some systems (e.g. macOS) the certs are installed in the user store,
3333
# and on other systems (e.g., Ubuntu) they're installed to the machine store. certmgr only shows what's in
3434
# the selected store, which is why we need to check both.
35-
if ["$(certmgr -list -c Trust| grep -c -F"X.509")"-le 1 ]&& ["$(certmgr -list -c -m Trust| grep -c -F"X.509")"-le 1 ];then
35+
if [$OS='Linux' ]&& ["$(certmgr -list -c Trust| grep -c -F"X.509")"-le 1 ]&& ["$(certmgr -list -c -m Trust| grep -c -F"X.509")"-le 1 ];then
3636
echo"No SSL certificates installed so unable to restore NuGet packages.">&2;
3737
echo"Run 'mozroots --sync --import' to install certificates to Mono's certificate store.">&2;
3838
exit 1

‎build-everything.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@
5454
<!-- +++++++++++++++++++++++ Project selection for testing +++++++++++++++++++++++++++++++-->
5555

5656
<ItemGroupCondition="'$(TEST_NET40_COREUNIT_SUITE)'=='1'" >
57-
<ProjectsWithNet40Include="tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj"/>
57+
<ProjectsWithNet40Include="tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj"/>
5858
<ProjectsWithNet40Include="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
5959
</ItemGroup>
6060

6161
<ItemGroupCondition="'$(TEST_CORECLR_COREUNIT_SUITE)'=='1'">
62-
<ProjectsWithCoreClrInclude="tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj"/>
62+
<ProjectsWithCoreClrInclude="tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj"/>
6363
<ProjectsWithCoreClrInclude="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
6464
</ItemGroup>
6565

0 commit comments

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