fix to build
This commit is contained in:
Родитель
7c2518eb53
Коммит
4c7463d966
15
build.cmd
15
build.cmd
|
@ -26,6 +26,8 @@ exit /b 1
|
|||
|
||||
:ARGUMENTS_OK
|
||||
|
||||
set BUILD_PROTO_WITH_CORECLR_LKG=1
|
||||
|
||||
set BUILD_PROTO=0
|
||||
set BUILD_NET40=1
|
||||
set BUILD_CORECLR=0
|
||||
|
@ -100,6 +102,11 @@ if /i '%ARG%' == 'all' (
|
|||
set SKIP_EXPENSIVE_TESTS=0
|
||||
)
|
||||
|
||||
if /i '%ARG%' == 'protofx' (
|
||||
set BUILD_PROTO_WITH_CORECLR_LKG=0
|
||||
set BUILD_PROTO=1
|
||||
)
|
||||
|
||||
if /i '%ARG%' == 'microbuild' (
|
||||
set BUILD_PROTO=1
|
||||
set BUILD_NET40=1
|
||||
|
@ -257,6 +264,7 @@ REM after this point, ARG variable should not be used, use only BUILD_* or TEST_
|
|||
echo Build/Tests configuration:
|
||||
echo.
|
||||
echo BUILD_PROTO=%BUILD_PROTO%
|
||||
echo BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG%
|
||||
echo BUILD_NET40=%BUILD_NET40%
|
||||
echo BUILD_CORECLR=%BUILD_CORECLR%
|
||||
echo BUILD_PORTABLE=%BUILD_PORTABLE%
|
||||
|
@ -327,7 +335,7 @@ if '%RestorePackages%' == 'true' (
|
|||
.\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget\nuget.config
|
||||
@if ERRORLEVEL 1 echo Error: Nuget restore failed && goto :failure
|
||||
)
|
||||
if '%BUILD_CORECLR%' == '1' (
|
||||
if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '1' (
|
||||
|
||||
:: Restore the Tools directory
|
||||
call %~dp0init-tools.cmd
|
||||
|
@ -358,6 +366,11 @@ if '%BUILD_CORECLR%' == '1' (
|
|||
popd
|
||||
|
||||
)
|
||||
if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '0' (
|
||||
%_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj %BUILD_DIAG%
|
||||
@if ERRORLEVEL 1 echo Error: '%_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj %BUILD_DIAG%' failed && goto :failure
|
||||
)
|
||||
|
||||
rem copy targestfile into tools directory ... temporary fix until packaging complete.
|
||||
copy src\fsharp\FSharp.Build\Microsoft.FSharp.targets tools\Microsoft.FSharp.targets
|
||||
copy src\fsharp\FSharp.Build\Microsoft.Portable.FSharp.targets tools\Microsoft.Portable.FSharp.targets
|
||||
|
|
|
@ -739,12 +739,25 @@
|
|||
|
||||
<Choose>
|
||||
<When Condition="'$(BuildWith)' == 'LKG'">
|
||||
<PropertyGroup>
|
||||
<FSharpTargetsPath>..\lkg\FSharp-$(LkgVersion)\bin\Microsoft.FSharp.Targets</FSharpTargetsPath>
|
||||
<FscToolPath>$(FSharpSourcesRoot)\..\lkg\bin\Debug\netstandard1.6\win7-x64\publish</FscToolPath>
|
||||
<FSLKGPath>$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin</FSLKGPath>
|
||||
<FSCoreLKGPath>$(FSLKGPath)\FSharp.Core.dll</FSCoreLKGPath>
|
||||
</PropertyGroup>
|
||||
<Choose>
|
||||
<When Condition="Exists('$(FSharpSourcesRoot)\..\lkg\bin\Debug\netstandard1.6\win7-x64\publish\fsc.exe')">
|
||||
<PropertyGroup >
|
||||
<FSharpTargetsPath>$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin\Microsoft.FSharp.Targets</FSharpTargetsPath>
|
||||
<FscToolPath>$(FSharpSourcesRoot)\..\lkg\bin\Debug\netstandard1.6\win7-x64\publish</FscToolPath>
|
||||
<FSLKGPath>$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin</FSLKGPath>
|
||||
<FSCoreLKGPath>$(FSLKGPath)\FSharp.Core.dll</FSCoreLKGPath>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<Otherwise>
|
||||
<PropertyGroup >
|
||||
<FSharpTargetsPath>..\lkg\FSharp-$(LkgVersion)\bin\Microsoft.FSharp.Targets</FSharpTargetsPath>
|
||||
<FscToolPath>$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin</FscToolPath>
|
||||
<FSLKGPath>$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin</FSLKGPath>
|
||||
<FSCoreLKGPath>$(FSLKGPath)\FSharp.Core.dll</FSCoreLKGPath>
|
||||
</PropertyGroup>
|
||||
</Otherwise>
|
||||
</Choose>
|
||||
|
||||
</When>
|
||||
<When Condition="'$(TargetFramework)'=='portable47' OR '$(TargetFramework)'=='portable7' OR '$(TargetFramework)'=='portable78' OR '$(TargetFramework)'=='portable259' OR '$(TargetFramework)'=='coreclr'">
|
||||
<PropertyGroup>
|
||||
|
|
Загрузка…
Ссылка в новой задаче