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

Commit0fad698

Browse files
committed
Merge branch 'fsharp4' into VS2015Support
Conflicts:appveyor-build.cmdtests/RunTests.cmd
2 parents81f6bbb +1a246cc commit0fad698

File tree

29 files changed

+9875
-319
lines changed

29 files changed

+9875
-319
lines changed

‎DEVGUIDE.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ See the script for what this does. After you do this, you can do further testin
2727
The compiler is compiled as a set of .NET 4.0 components using a bootstrap process. This uses the Last Known Good (LKG) compiler to build.
2828
Note that you need the .NET framework 3.5 installed on your machine in order to complete this step.
2929

30-
gacutil /i lkg\FSharp-2.0.50726.900\bin\FSharp.Core.dll
3130
msbuild src\fsharp-proto-build.proj
3231

3332
##2. Building an F# (Debug) library and compiler

‎appveyor-build.cmd‎

Lines changed: 32 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,22 @@ set APPVEYOR_CI=1
55
:: Check prerequisites
66
ifnot '%VisualStudioVersion%'== ''goto vsversionset
77
ifexist"%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\common7\ide\devenv.exe"setVisualStudioVersion=14.0
8-
98
ifnot '%VisualStudioVersion%'== ''goto vsversionset
109
ifexist"%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe"setVisualStudioVersion=12.0
11-
1210
:vsversionset
13-
echo Visual Studio Version =%VisualStudioVersion%
1411
if '%VisualStudioVersion%'== ''echo Error: Could not find a Visual Studio Installed.MSBuild.exe. Please see http://www.visualstudio.com/en-us/news/vs2015-vs.aspx.&&goto :eof
1512

1613
if '%VisualStudioVersion%'=='14.0'set_msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
1714
if '%VisualStudioVersion%'=='12.0'set_msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"
1815
ifnotexist%_msbuildexe%echo Error: Could not find MSBuild.exe. Please see http://www.microsoft.com/en-us/download/details.aspx?id=40760.&&goto :eof
1916

20-
set_gacutilexe="%ProgramFiles(x86)%\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\gacutil.exe"
21-
ifnotexist%_gacutilexe%echo Error: Could not find gacutil.exe.&&goto :eof
22-
2317
set_ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
2418
ifnotexist%_ngenexe%echo Error: Could not find ngen.exe.&&goto :eof
2519

2620
.\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages
2721
@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :eof
2822

2923
::Build
30-
%_gacutilexe% /i lkg\FSharp-2.0.50726.900\bin\FSharp.Core.dll
31-
@if ERRORLEVEL1echo Error: gacutil failed&&goto :eof
32-
3324
%_msbuildexe% src\fsharp-proto-build.proj
3425
@if ERRORLEVEL1echo Error: compiler proto build failed&&goto :eof
3526

@@ -45,57 +36,60 @@ if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :eof
4536
@if ERRORLEVEL1echo Error: compile debug build failed&&goto :eof
4637

4738
REM We don't build new net20 FSharp.Core anymore
48-
REM %_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=net20
49-
REM @if ERRORLEVEL 1 echo Error: library net20debugbuild failed && goto :eof
39+
REM %_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=net20 /p:Configuration=Release
40+
REM @if ERRORLEVEL 1 echo Error: library net20 build failed && goto :eof
5041

51-
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable47
52-
@if ERRORLEVEL1echo Error: library portable47debugbuild failed&&goto :eof
42+
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
43+
@if ERRORLEVEL1echo Error: library portable47 build failed&&goto :eof
5344

54-
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable7
55-
@if ERRORLEVEL1echo Error: library portable7debugbuild failed&&goto :eof
45+
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
46+
@if ERRORLEVEL1echo Error: library portable7 build failed&&goto :eof
5647

57-
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable78
58-
@if ERRORLEVEL1echo Error: library portable78debugbuild failed&&goto :eof
48+
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
49+
@if ERRORLEVEL1echo Error: library portable78 build failed&&goto :eof
5950

60-
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable259
61-
@if ERRORLEVEL1echo Error: library portable259 debug build failed&&goto :eof
51+
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
52+
@if ERRORLEVEL1echo Error: library portable259 build failed&&goto :eof
53+
%_msbuildexe% src/fsharp-compiler-unittests-build.proj
54+
@if ERRORLEVEL1echo Error: compiler unittests debug build failed&&goto :eof
6255

63-
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true
64-
@if ERRORLEVEL1echo Error: library unittestsdebugbuild failed&&goto :eof
56+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:Configuration=Release
57+
@if ERRORLEVEL1echo Error: library unittests build failed&&goto :eof
6558

66-
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable47
67-
@if ERRORLEVEL1echo Error: library unittestsdebugbuild failed portable47&&goto :eof
59+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
60+
@if ERRORLEVEL1echo Error: library unittests build failed portable47&&goto :eof
6861

69-
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable7
70-
@if ERRORLEVEL1echo Error: library unittestsdebugbuild failed portable7&&goto :eof
62+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
63+
@if ERRORLEVEL1echo Error: library unittests build failed portable7&&goto :eof
7164

72-
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable78
73-
@if ERRORLEVEL1echo Error: library unittestsdebugbuild failed portable78&&goto :eof
65+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
66+
@if ERRORLEVEL1echo Error: library unittests build failed portable78&&goto :eof
7467

68+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
69+
@if ERRORLEVEL1echo Error: library unittests build failed portable259&&goto :eof
7570

7671
@echoon
77-
call src\update.cmddebug -ngen
72+
call src\update.cmdrelease -ngen
7873

7974
@echoon
80-
call tests\BuildTestTools.cmddebug
81-
REM@if ERRORLEVEL 1 echo Error: 'tests\BuildTestTools.cmddebug' failed && goto :eof
75+
call tests\BuildTestTools.cmdrelease
76+
@if ERRORLEVEL1echo Error: 'tests\BuildTestTools.cmdrelease' failed&&goto :eof
8277

8378
@echoon
8479

8580
pushd tests
8681

8782
REM Disabled while working out perl problem, see https://github.com/Microsoft/visualfsharp/pull/169
88-
REM call RunTests.cmddebug fsharp Smoke
83+
REM call RunTests.cmdrelease fsharp Smoke
8984
REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd debug fsharpqa Smoke' failed && goto :eof
9085

9186
REM Disabled while working out perl problem, see https://github.com/Microsoft/visualfsharp/pull/169
92-
REM call RunTests.cmddebug fsharpqa Smoke
93-
REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmddebug fsharpqa Smoke' failed && goto :eof
87+
REM call RunTests.cmdrelease fsharpqa Smoke
88+
REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmdrelease fsharpqa Smoke' failed && goto :eof
9489

95-
call RunTests.cmd debug coreunit
96-
@if ERRORLEVEL1echo Error: 'RunTests.cmd debug coreunit' failed&&goto :eof
90+
call RunTests.cmd release compilerunit
91+
@if ERRORLEVEL1echo Error: 'RunTests.cmd release compilerunit' failed&&goto :eof
92+
call RunTests.cmd release coreunit
93+
@if ERRORLEVEL1echo Error: 'RunTests.cmd release coreunit' failed&&goto :eof
9794

9895
popd
99-
100-
101-

‎appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ install:
1212
test:off
1313
version:0.0.1.{build}
1414
artifacts:
15-
-path:Debug
16-
name:Debug
15+
-path:Release
16+
name:Release
1.57 MB
Binary file not shown.
1.45 MB
Binary file not shown.

0 commit comments

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