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

Commit3f39201

Browse files
smoothdeveloperdsyme
authored andcommitted
[wip] changes to build.cmd to attempt to make the copy of fscomp files for the build from source target "automagicall" (#5119)
* changes to build.cmd to attempt to make the copy of fscomp files for the build from source target "automagicall"* Update build.cmd
1 parent259a419 commit3f39201

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

‎DEVGUIDE.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,8 @@ To do this, build the non-buildfromsource version of FSharp.Compiler.Private (sr
224224
.\build net40
225225
copy /y src\fsharp\FSharp.Compiler.Private\obj\release\net40\FSComp.* src\buildfromsource\FSharp.Compiler.Private\
226226

227+
You can also change build.cmd to default COPY_FSCOMP_RESOURCE_FOR_BUILD_FROM_SOURCES to 1 under ":ARGUMENTS_OK" label.
228+
227229
####Configuring proxy server
228230

229231
If you are behind a proxy server, NuGet client tool must be configured to use it:

‎build.cmd‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ set TEST_END_2_END=0
7979
setINCLUDE_TEST_SPEC_NUNIT=
8080
setINCLUDE_TEST_TAGS=
8181

82+
setCOPY_FSCOMP_RESOURCE_FOR_BUILD_FROM_SOURCES=0
83+
8284
setSIGN_TYPE=%PB_SIGNTYPE%
8385

8486
REM ------------------ Parse all arguments -----------------------
@@ -156,6 +158,7 @@ if /i "%ARG%" == "net40" (
156158
set_autoselect=0
157159
setBUILD_NET40_FSHARP_CORE=1
158160
setBUILD_NET40=1
161+
setCOPY_FSCOMP_RESOURCE_FOR_BUILD_FROM_SOURCES=1
159162
)
160163

161164
if /i"%ARG%"=="coreclr" (
@@ -175,6 +178,7 @@ if /i "%ARG%" == "vs" (
175178
set_autoselect=0
176179
setBUILD_NET40=1
177180
setBUILD_VS=1
181+
setCOPY_FSCOMP_RESOURCE_FOR_BUILD_FROM_SOURCES=1
178182
)
179183

180184
if /i"%ARG%"=="fcs" (
@@ -191,6 +195,7 @@ if /i "%ARG%" == "nobuild" (
191195
)
192196
if /i"%ARG%"=="all" (
193197
set_autoselect=0
198+
setCOPY_FSCOMP_RESOURCE_FOR_BUILD_FROM_SOURCES=1
194199
setBUILD_PROTO=1
195200
setBUILD_PROTO_WITH_CORECLR_LKG=1
196201
setBUILD_NET40=1
@@ -512,6 +517,9 @@ echo PB_SKIPTESTS=%PB_SKIPTESTS%
512517
echo PB_RESTORESOURCE=%PB_RESTORESOURCE%
513518
echo.
514519
echo SIGN_TYPE=%SIGN_TYPE%
520+
echo.
521+
echo COPY_FSCOMP_RESOURCE_FOR_BUILD_FROM_SOURCES=%COPY_FSCOMP_RESOURCE_FOR_BUILD_FROM_SOURCES%
522+
echo.
515523
echo TEST_FCS=%TEST_FCS%
516524
echo TEST_NET40_COMPILERUNIT_SUITE=%TEST_NET40_COMPILERUNIT_SUITE%
517525
echo TEST_NET40_COREUNIT_SUITE=%TEST_NET40_COREUNIT_SUITE%
@@ -815,6 +823,11 @@ if "%BUILD_NET40_FSHARP_CORE%" == "1" (
815823
call src\update.cmd%BUILD_CONFIG% -ngen
816824
)
817825

826+
if"%COPY_FSCOMP_RESOURCE_FOR_BUILD_FROM_SOURCES%"=="1" (
827+
echo ---------------- copy fscomp resource for build from sources ---------------
828+
copy /y src\fsharp\FSharp.Compiler.Private\obj\%BUILD_CONFIG%\net40\FSComp.* src\buildfromsource\FSharp.Compiler.Private
829+
)
830+
818831
@echo set NUNITPATH=packages\NUnit.Console.3.0.0\tools\
819832
setNUNITPATH=packages\NUnit.Console.3.0.0\tools\
820833
ifnotexist%NUNITPATH%echo Error: Could not find%NUNITPATH%&&goto :failure

0 commit comments

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