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

Commit2747996

Browse files
committed
Fix rc build problem
1 parent3b87fcf commit2747996

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

‎tests/BuildTestTools.cmd‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,23 @@ exit /b 1
1515

1616
:ok
1717

18+
:: Check prerequisites
19+
ifnot '%VisualStudioVersion%'== ''goto vsversionset
20+
ifexist"%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\common7\ide\devenv.exe"setVisualStudioVersion=14.0
21+
ifnot '%VisualStudioVersion%'== ''goto vsversionset
22+
ifexist"%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe"setVisualStudioVersion=12.0
23+
:vsversionset
24+
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
25+
26+
if '%VisualStudioVersion%'=='14.0'set_msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
27+
if '%VisualStudioVersion%'=='12.0'set_msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"
28+
ifnotexist%_msbuildexe%echo Error: Could not find MSBuild.exe. Please see http://www.microsoft.com/en-us/download/details.aspx?id=40760.&&goto :eof
29+
1830
ifnotexist"%~dp0\fsharpqa\testenv\bin"mkdir"%~dp0\fsharpqa\testenv\bin"||goto :error
19-
msbuild%~dp0\fsharpqa\testenv\src\ILComparer\ILComparer.fsproj /p:Configuration=%1 /t:Build||goto :error
31+
%_msbuildexe%%~dp0\fsharpqa\testenv\src\ILComparer\ILComparer.fsproj /p:Configuration=%1 /t:Build||goto :error
2032
xcopy /Y%~dp0\fsharpqa\testenv\src\ILComparer\bin\%1\*%~dp0\fsharpqa\testenv\bin||goto :error
2133

22-
msbuild%~dp0\fsharpqa\testenv\src\HostedCompilerServer\HostedCompilerServer.fsproj /p:Configuration=%1 /t:Build||goto :error
34+
%_msbuildexe%%~dp0\fsharpqa\testenv\src\HostedCompilerServer\HostedCompilerServer.fsproj /p:Configuration=%1 /t:Build||goto :error
2335
xcopy /Y%~dp0\fsharpqa\testenv\src\HostedCompilerServer\bin\%1\*%~dp0\fsharpqa\testenv\bin||goto :error
2436

2537
ifexist%~dp0\..\%1\net40\bin (

‎vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ProjectSystem.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,6 @@
136136
<Win32Resource>$(IntermediateOutputPath)\ProjectResources.rc.res</Win32Resource>
137137
</PropertyGroup>
138138
<TargetName="BeforeBuild">
139-
<ExecCommand="rc.exe /fo $(IntermediateOutputPath)$(RCResourceFile).res $(RCResourceFile)" />
139+
<ExecCommand='"$(ProgramFiles)\Windows Kits\8.1\bin\x86\rc.exe" /fo $(IntermediateOutputPath)$(RCResourceFile).res $(RCResourceFile)' />
140140
</Target>
141141
</Project>

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp