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

Commitaaa8f4b

Browse files
committed
Merge branch 'master' into fsharp4
Conflicts:DEVGUIDE.mdREADME.mdappveyor-build.cmdappveyor.ymlsrc/fsharp/FSharp.Core.Unittests/SurfaceArea.net40.fstests/test.lst
2 parents911c33a +ce944e6 commitaaa8f4b

File tree

12 files changed

+9252
-83
lines changed

12 files changed

+9252
-83
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: 33 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -9,88 +9,78 @@ if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin
99
ifnotexist%_msbuildexe%set_msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe"
1010
ifnotexist%_msbuildexe%echo Error: Could not find MSBuild.exe. Please see http://www.microsoft.com/en-us/download/details.aspx?id=40760.&&goto :eof
1111

12-
set_gacutilexe="%ProgramFiles(x86)%\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\gacutil.exe"
13-
ifnotexist%_gacutilexe%echo Error: Could not find gacutil.exe.&&goto :eof
14-
1512
set_ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
1613
ifnotexist%_ngenexe%echo Error: Could not find ngen.exe.&&goto :eof
1714

1815
.\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages
1916
@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :eof
2017

2118
::Build
22-
%_gacutilexe% /i lkg\FSharp-2.0.50726.900\bin\FSharp.Core.dll
23-
@if ERRORLEVEL1echo Error: gacutil failed&&goto :eof
24-
2519
%_msbuildexe% src\fsharp-proto-build.proj
2620
@if ERRORLEVEL1echo Error: compiler proto build failed&&goto :eof
2721

2822
%_ngenexe% install Proto\net40\bin\fsc-proto.exe
2923
@if ERRORLEVEL1echo Error: NGen of proto failed&&goto :eof
3024

31-
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true
32-
@if ERRORLEVEL1echo Error: librarydebugbuild failed&&goto :eof
25+
%_msbuildexe% src/fsharp-library-build.proj /p:Configuration=Release
26+
@if ERRORLEVEL1echo Error: library build failed&&goto :eof
3327

34-
%_msbuildexe% src/fsharp-compiler-build.proj /p:UseNugetPackages=true
35-
@if ERRORLEVEL1echo Error:compile debug build failed&&goto :eof
28+
%_msbuildexe% src/fsharp-compiler-build.proj /p:Configuration=Release
29+
@if ERRORLEVEL1echo Error:compiler build failed&&goto :eof
3630

3731
REM We don't build new net20 FSharp.Core anymore
38-
REM %_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=net20
39-
REM @if ERRORLEVEL 1 echo Error: library net20 debug build failed && goto :eof
40-
41-
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable47
42-
@if ERRORLEVEL1echo Error: library portable47 debug build failed&&goto :eof
43-
44-
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable7
45-
@if ERRORLEVEL1echo Error: library portable7 debug build failed&&goto :eof
32+
REM %_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=net20 /p:Configuration=Release
33+
REM @if ERRORLEVEL 1 echo Error: library net20 build failed && goto :eof
4634

35+
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
36+
@if ERRORLEVEL1echo Error: library portable47 build failed&&goto :eof
4737

48-
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable78
49-
@if ERRORLEVEL1echo Error: libraryportable78 debug build failed&&goto :eof
38+
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
39+
@if ERRORLEVEL1echo Error: libraryportable7 build failed&&goto :eof
5040

51-
%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable259
52-
@if ERRORLEVEL1echo Error: libraryportable259 debug build failed&&goto :eof
41+
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
42+
@if ERRORLEVEL1echo Error: libraryportable78 build failed&&goto :eof
5343

44+
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
45+
@if ERRORLEVEL1echo Error: library portable259 build failed&&goto :eof
5446

5547

48+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:Configuration=Release
49+
@if ERRORLEVEL1echo Error: library unittests build failed&&goto :eof
5650

57-
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true
58-
@if ERRORLEVEL1echo Error: library unittestsdebugbuild failed&&goto :eof
51+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
52+
@if ERRORLEVEL1echo Error: library unittests build failed portable47&&goto :eof
5953

60-
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable47
61-
@if ERRORLEVEL1echo Error: library unittestsdebugbuild failedportable47&&goto :eof
54+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
55+
@if ERRORLEVEL1echo Error: library unittests build failedportable7&&goto :eof
6256

63-
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable7
64-
@if ERRORLEVEL1echo Error: library unittestsdebugbuild failedportable7&&goto :eof
57+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
58+
@if ERRORLEVEL1echo Error: library unittests build failedportable78&&goto :eof
6559

66-
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable78
67-
@if ERRORLEVEL1echo Error: library unittestsdebugbuild failedportable78&&goto :eof
60+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
61+
@if ERRORLEVEL1echo Error: library unittests build failedportable259&&goto :eof
6862

6963

7064
@echoon
71-
call src\update.cmddebug -ngen
65+
call src\update.cmdrelease -ngen
7266

7367
@echoon
74-
call tests\BuildTestTools.cmddebug
75-
REM@if ERRORLEVEL 1 echo Error: 'tests\BuildTestTools.cmddebug' failed && goto :eof
68+
call tests\BuildTestTools.cmdrelease
69+
@if ERRORLEVEL1echo Error: 'tests\BuildTestTools.cmdrelease' failed&&goto :eof
7670

7771
@echoon
7872

7973
pushd tests
8074

8175
REM Disabled while working out perl problem, see https://github.com/Microsoft/visualfsharp/pull/169
82-
REM call RunTests.cmddebug fsharp Smoke
83-
REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmddebug fsharpqa Smoke' failed && goto :eof
76+
REM call RunTests.cmdrelease fsharp Smoke
77+
REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmdrelease fsharpqa Smoke' failed && goto :eof
8478

8579
REM Disabled while working out perl problem, see https://github.com/Microsoft/visualfsharp/pull/169
86-
REM call RunTests.cmddebug fsharpqa Smoke
87-
REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmddebug fsharpqa Smoke' failed && goto :eof
80+
REM call RunTests.cmdrelease fsharpqa Smoke
81+
REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmdrelease fsharpqa Smoke' failed && goto :eof
8882

89-
setPATH=%PATH%;%~dp0%packages\NUnit.Runners.2.6.3\tools\
90-
call RunTests.cmd debug coreunit
91-
@if ERRORLEVEL1echo Error: 'RunTests.cmd debug coreunit' failed&&goto :eof
83+
call RunTests.cmd release coreunit
84+
@if ERRORLEVEL1echo Error: 'RunTests.cmd release coreunit' failed&&goto :eof
9285

9386
popd
94-
95-
96-

‎appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ build_script:
44
test:off
55
version:0.0.1.{build}
66
artifacts:
7-
-path:Debug
8-
name:Debug
7+
-path:Release
8+
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