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

Commit2433812

Browse files
committed
Get perl for fsharpqa tests from nuget
1 parent528b933 commit2433812

File tree

3 files changed

+11
-24
lines changed

3 files changed

+11
-24
lines changed

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ For Visual F# IDE Tools 4.1 development (Windows)
5353
####Additional frameworks
5454

5555
-[Git for windows](http://msysgit.github.io/)
56-
-[Perl](http://www.perl.org/get.html#win32) (ActiveState 5.16.3 is known to be supported)
5756
-[.NET 3.5](http://www.microsoft.com/en-us/download/details.aspx?id=21)
5857
-[.NET 4.5](http://www.microsoft.com/en-us/download/details.aspx?id=30653)
5958
-[.NET 4.5.1](http://www.microsoft.com/en-us/download/details.aspx?id=40779)

‎build.cmd‎

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -410,18 +410,6 @@ if "%RestorePackages%"=="" (
410410

411411
@call src\update.cmd signonly
412412

413-
echo ===========================================================
414-
echo ===========================================================
415-
echo%VS150COMNTOOLS%
416-
echo ===========================================================
417-
echo ===========================================================
418-
dir"%ProgramFiles(x86)%\Microsoft Visual Studio"
419-
echo ===========================================================
420-
echo ===========================================================
421-
dir"%ProgramFiles(x86)%\Microsoft Visual Studio\2017"
422-
echo ===========================================================
423-
echo ===========================================================
424-
425413
:: Check prerequisites
426414
ifnot"%VisualStudioVersion%"==""goto vsversionset
427415
ifexist"%VS150COMNTOOLS%\..\ide\devenv.exe"setVisualStudioVersion=15.0
@@ -610,9 +598,9 @@ set PATH=%PATH%;%CORDIR%
610598

611599
setREGEXE32BIT=reg.exe
612600

613-
IFNOTDEFINED SNEXE32IFEXIST"%WINSDKNETFXTOOLS%\sn.exe"setSNEXE32=%WINSDKNETFXTOOLS%sn.exe
614-
IFNOTDEFINED SNEXE64IFEXIST"%WINSDKNETFXTOOLS%x64\sn.exe"setSNEXE64=%WINSDKNETFXTOOLS%x64\sn.exe
615-
IFNOTDEFINED ildasmIFEXIST"%WINSDKNETFXTOOLS%\ildasm.exe"setildasm=%WINSDKNETFXTOOLS%ildasm.exe
601+
IFNOTDEFINED SNEXE32IFEXIST"%WINSDKNETFXTOOLS%\sn.exe"setSNEXE32=%WINSDKNETFXTOOLS%sn.exe
602+
IFNOTDEFINED SNEXE64IFEXIST"%WINSDKNETFXTOOLS%x64\sn.exe"setSNEXE64=%WINSDKNETFXTOOLS%x64\sn.exe
603+
IFNOTDEFINED ildasmIFEXIST"%WINSDKNETFXTOOLS%\ildasm.exe"setildasm=%WINSDKNETFXTOOLS%ildasm.exe
616604

617605
echo .
618606
echo SDK environment vars
@@ -698,20 +686,16 @@ if "%TEST_NET40_FSHARPQA_SUITE%" == "1" (
698686
setFSC=!FSCBINPATH!\fsc.exe
699687
setFSCOREDLLPATH=!FSCBinPath!\FSharp.Core.dll
700688
setPATH=!FSCBINPATH!;!PATH!
701-
702-
where.exe perl>NUL2>NUL
703-
iferrorlevel1 (
704-
echo Error: perl is not in the PATH, it is required for the net40-fsharpqa test suite
705-
goto :failure
706-
)
689+
setperlexe=%~dp0packages\StrawberryPerl64.5.22.2.1\Tools\perl\bin\perl.exe
690+
ifnotexist%perlexe%echo Error: perl was not downloaded from check the packages directory:%perlexe%&&goto :failure
707691

708692
setOUTPUTFILE=test-net40-fsharpqa-results.log
709693
setERRORFILE=test-net40-fsharpqa-errors.log
710694
setFAILENV=test-net40-fsharpqa-errors
711695

712696
pushd%~dp0tests\fsharpqa\source
713-
echoperl%~dp0tests\fsharpqa\testenv\bin\runall.pl -resultsroot!RESULTSDIR! -results!OUTPUTFILE! -log!ERRORFILE! -fail!FAILENV! -cleanup:no!TTAGS_ARG_RUNALL!!PARALLEL_ARG!
714-
perl%~dp0tests\fsharpqa\testenv\bin\runall.pl -resultsroot!RESULTSDIR! -results!OUTPUTFILE! -log!ERRORFILE! -fail!FAILENV! -cleanup:no!TTAGS_ARG_RUNALL!!PARALLEL_ARG!
697+
echo%perlexe%%~dp0tests\fsharpqa\testenv\bin\runall.pl -resultsroot!RESULTSDIR! -results!OUTPUTFILE! -log!ERRORFILE! -fail!FAILENV! -cleanup:no!TTAGS_ARG_RUNALL!!PARALLEL_ARG!
698+
%perlexe%%~dp0tests\fsharpqa\testenv\bin\runall.pl -resultsroot!RESULTSDIR! -results!OUTPUTFILE! -log!ERRORFILE! -fail!FAILENV! -cleanup:no!TTAGS_ARG_RUNALL!!PARALLEL_ARG!
715699

716700
popd
717701
ifERRORLEVEL1 (

‎packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,8 @@
4242

4343
<!-- FSharp.Data is used in some of the scripts ued for the coreclr build-->
4444
<packageid="FSharp.Data"version="2.2.5" />
45+
46+
<!-- Perl is used for the fsharpqa test suite-->
47+
<packageid="StrawberryPerl64"version="5.22.2.1" />
48+
4549
</packages>

0 commit comments

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