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

Commit28930c9

Browse files
committed
Makefile improvements to partially enable parallel build with 'make -j3'
1 parent9220bab commit28930c9

File tree

10 files changed

+74
-79
lines changed

10 files changed

+74
-79
lines changed

‎config.make.in‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,27 @@ tooldir := $(topdir)lib/bootstrap/4.0/
2020
#Enable this fo faster bulds, but not on Mono 2.11.5, see https://bugzilla.xamarin.com/show_bug.cgi?id=7815
2121
#MONO_OPTIONS += --gc=sgen
2222

23+
CONFIG = release
24+
DISTVERSION = 201011
25+
26+
VERSION_2_0 = 2.3.0.0
27+
VERSION_2_1 = 2.3.1.0
28+
VERSION_4_0 = 4.3.0.0
29+
TARGET_2_0 = 2.0
30+
TARGET_2_1 = 2.1
31+
TARGET_4_0 = 4.0
32+
TOKEN = b03f5f7f11d50a3a
33+
2334
bootstrapdir = $(bootstrap)/4.0/
2435
tmpdir = .libs/
2536
objdir = $(tmpdir)$(TARGET)/
2637
protodir = $(builddir)/lib/proto/4.0/
2738
outdir = $(builddir)lib/$(CONFIG)/$(TARGET)/
2839

29-
FSSRGEN := $(tooldir)../2.0/fssrgen.exe
30-
FSLEX := $(tooldir)../2.0/fslex.exe
31-
FSYACC := $(tooldir)../2.0/fsyacc.exe
32-
33-
CONFIG := release
34-
DISTVERSION := 201011
40+
FSSRGEN = $(tooldir)../2.0/fssrgen.exe
41+
FSLEX = $(tooldir)../2.0/fslex.exe
42+
FSYACC = $(tooldir)../2.0/fsyacc.exe
3543

36-
VERSION_2_0 := 2.3.0.0
37-
VERSION_2_1 := 2.3.1.0
38-
VERSION_4_0 := 4.3.0.0
39-
TARGET_2_0 := 2.0
40-
TARGET_2_1 := 2.1
41-
TARGET_4_0 := 4.0
42-
TOKEN := b03f5f7f11d50a3a
4344

4445
FLAGS = \
4546
--doc:$(objdir)$(NAME).xml \

‎src/fsharp/FSharp.Build-proto/Makefile.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ REFERENCES += \
1818
-r:$(bootstrapdir)FSharp.Core.dll
1919

2020
sources=\
21-
$(objdir)FSBuild.fs\
21+
$(tmpdir)FSBuild.fs\
2222
../../utils/CompilerLocationUtils.fs\
2323
../FSharp.Build/CreateFSharpManifestResourceName.fsi\
2424
../FSharp.Build/CreateFSharpManifestResourceName.fs\
@@ -28,9 +28,9 @@ sources= \
2828
RESOURCES =\
2929
$(tmpdir)FSBuild.resources
3030

31-
$(tmpdir)FSBuild.resources:$(srcdir)../FSharp.Build/FSBuild.txt
32-
mono$(MONO_OPTIONS)$(FSSRGEN)$<$(@:.resources=.fs)$(@:.resources=.resx)
33-
resgen$(@:.resources=.resx)$@
31+
$(tmpdir)FSBuild.fs$(tmpdir)FSBuild.resources:$(srcdir)../FSharp.Build/FSBuild.txt
32+
mono$(MONO_OPTIONS)$(FSSRGEN)$<$(tmpdir)FSBuild.fs$(tmpdir)FSBuild.resx
33+
resgen$(tmpdir)FSBuild.resx$(tmpdir)FSBuild.resources
3434

3535
do-proto: do-4-0
3636

‎src/fsharp/FSharp.Build/Makefile.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ sources= \
2727
RESOURCES =\
2828
$(tmpdir)FSBuild.resources
2929

30-
$(tmpdir)FSBuild.resources:$(srcdir)FSBuild.txt
31-
mono--debug$(FSSRGEN)$<$(@:.resources=.fs)$(@:.resources=.resx)
32-
resgen$(@:.resources=.resx)$@
30+
$(tmpdir)FSBuild.fs$(tmpdir)FSBuild.resources:FSBuild.txt
31+
mono$(MONO_OPTIONS)$(FSSRGEN)$<$(tmpdir)FSBuild.fs$(tmpdir)FSBuild.resx
32+
resgen$(tmpdir)FSBuild.resx$(tmpdir)FSBuild.resources
3333

3434
include$(topdir)/src/fsharp/targets.make
3535

‎src/fsharp/FSharp.Compiler-proto/Makefile.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ RESOURCES= \
155155
$(tmpdir)FSStrings.resources\
156156
$(tmpdir)FSComp.resources
157157

158-
$(tmpdir)FSComp.resources:$(srcdir)../FSComp.txt
159-
mono$(MONO_OPTIONS)$(FSSRGEN)$<$(@:.resources=.fs)$(@:.resources=.resx)
160-
resgen$(@:.resources=.resx)$@
158+
$(tmpdir)FSComp.fs$(tmpdir)FSComp.resources:$(srcdir)../FSComp.txt
159+
mono$(MONO_OPTIONS)$(FSSRGEN)$<$(tmpdir)FSComp.fs$(tmpdir)FSComp.resx
160+
resgen$(tmpdir)FSComp.resx$(tmpdir)FSComp.resources
161161

162162
$(tmpdir)FSStrings.resources:$(srcdir)../FSStrings.resx
163163
resgen$<$@

‎src/fsharp/FSharp.Compiler.Interactive.Settings/Makefile.in‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ sources = \
2222
../fsiaux.fs\
2323
../fsiattrs.fs
2424

25-
RESOURCES=\
26-
$(tmpdir)FSInteractiveSettings.resources
27-
28-
$(tmpdir)FSInteractiveSettings.resources:$(srcdir)../FSInteractiveSettings.txt
29-
mono --debug$(FSSRGEN)$<$(@:.resources=.fs)$(@:.resources=.resx)
30-
resgen$(@:.resources=.resx)$@
31-
3225
include$(topdir)/src/fsharp/targets.make
3326

3427
do-final: do-4-0

‎src/fsharp/FSharp.Compiler.Server.Shared/Makefile.in‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ sources = \
2121
../../assemblyinfo/assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs\
2222
../fsiserver/fsiserver.fs
2323

24-
RESOURCES=\
25-
$(tmpdir)FSServerShared.resources
26-
27-
$(tmpdir)FSServerShared.resources:$(srcdir)../fsiserver/FSServerShared.txt
28-
mono --debug$(FSSRGEN)$<$(@:.resources=.fs)$(@:.resources=.resx)
29-
resgen$(@:.resources=.resx)$@
30-
3124
include$(topdir)/src/fsharp/targets.make
3225

3326
do-final: do-4-0

‎src/fsharp/FSharp.Compiler/Makefile.in‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ DEFINES_4_0 += \
2222

2323
REFERENCES +=\
2424
-r:$(outdir)FSharp.Core.dll\
25-
-r:$(monolibdir)System.Drawing.dll\
26-
-r:$(monolibdir)System.Windows.Forms.dll
25+
-r:$(monolibdir)System.Drawing.dll\
26+
-r:$(monolibdir)System.Windows.Forms.dll
2727

2828

2929
sources =\
@@ -43,8 +43,8 @@ sources = \
4343
../../utils/HashMultiMap.fs\
4444
../../utils/TaggedCollections.fsi\
4545
../../utils/TaggedCollections.fs\
46-
../FlatList.fs\
47-
../../absil/illib.fs\
46+
../FlatList.fs\
47+
../../absil/illib.fs\
4848
../../utils/filename.fsi\
4949
../../utils/filename.fs\
5050
../../absil/zmap.fsi\
@@ -76,8 +76,8 @@ sources = \
7676
../range.fsi\
7777
../range.fs\
7878
../ErrorLogger.fs\
79-
../tainted.fsi\
80-
../tainted.fs\
79+
../tainted.fsi\
80+
../tainted.fs\
8181
../InternalCollections.fsi\
8282
../InternalCollections.fs\
8383
../../absil/ilread.fsi\
@@ -92,15 +92,15 @@ sources = \
9292
../../ilx/pubclo.fs\
9393
../../ilx/cu_erase.fsi\
9494
../../ilx/cu_erase.fs\
95-
../InternalFileSystemUtils.fsi\
96-
../InternalFileSystemUtils.fs\
95+
../InternalFileSystemUtils.fsi\
96+
../InternalFileSystemUtils.fs\
9797
../unilex.fsi\
9898
../unilex.fs\
9999
../layout.fsi\
100100
../layout.fs\
101-
../ast.fs\
102-
../est.fsi\
103-
../est.fs\
101+
../ast.fs\
102+
../est.fsi\
103+
../est.fs\
104104
$(tmpdir)pars.fs\
105105
../lexhelp.fsi\
106106
../lexhelp.fs\
@@ -118,18 +118,18 @@ sources = \
118118
../import.fsi\
119119
../import.fs\
120120
../infos.fs\
121-
../NicePrint.fs\
121+
../NicePrint.fs\
122122
../augment.fsi\
123123
../augment.fs\
124-
../typrelns.fs\
125-
../patcompile.fsi\
126-
../patcompile.fs\
124+
../typrelns.fs\
125+
../patcompile.fsi\
126+
../patcompile.fs\
127127
../outcome.fsi\
128128
../outcome.fs\
129-
../csolve.fsi\
130-
../csolve.fs\
131-
../formats.fsi\
132-
../formats.fs\
129+
../csolve.fsi\
130+
../csolve.fs\
131+
../formats.fsi\
132+
../formats.fs\
133133
../nameres.fsi\
134134
../nameres.fs\
135135
../unsolved.fs\
@@ -141,7 +141,7 @@ sources = \
141141
../tc.fs\
142142
../opt.fsi\
143143
../opt.fs\
144-
../detuple.fsi\
144+
../detuple.fsi\
145145
../detuple.fs\
146146
../tlr.fsi\
147147
../tlr.fs\
@@ -156,30 +156,30 @@ sources = \
156156
../vs/IncrementalBuild.fsi\
157157
../vs/IncrementalBuild.fs\
158158
../vs/Reactor.fsi\
159-
../vs/Reactor.fs\
160-
../vs/ServiceLexing.fsi\
161-
../vs/ServiceLexing.fs\
162-
../vs/ServiceConstants.fs\
163-
../vs/ServiceParseTreeWalk.fs\
164-
../vs/ServiceNavigation.fsi\
165-
../vs/ServiceNavigation.fs\
166-
../vs/ServiceParamInfoLocations.fsi\
167-
../vs/ServiceParamInfoLocations.fs\
168-
../vs/ServiceUntypedParse.fsi\
169-
../vs/ServiceUntypedParse.fs\
170-
../vs/ServiceDeclarations.fsi\
171-
../vs/ServiceDeclarations.fs\
159+
../vs/Reactor.fs\
160+
../vs/ServiceLexing.fsi\
161+
../vs/ServiceLexing.fs\
162+
../vs/ServiceConstants.fs\
163+
../vs/ServiceParseTreeWalk.fs\
164+
../vs/ServiceNavigation.fsi\
165+
../vs/ServiceNavigation.fs\
166+
../vs/ServiceParamInfoLocations.fsi\
167+
../vs/ServiceParamInfoLocations.fs\
168+
../vs/ServiceUntypedParse.fsi\
169+
../vs/ServiceUntypedParse.fs\
170+
../vs/ServiceDeclarations.fsi\
171+
../vs/ServiceDeclarations.fs\
172172
../vs/service.fsi\
173173
../vs/service.fs\
174-
../fsc.fs
174+
../fsc.fs
175175

176176
RESOURCES=\
177177
$(tmpdir)FSStrings.resources\
178178
$(tmpdir)FSComp.resources
179179

180-
$(tmpdir)FSComp.resources:$(srcdir)../FSComp.txt
181-
mono$(MONO_OPTIONS)$(FSSRGEN)$<$(@:.resources=.fs)$(@:.resources=.resx)
182-
resgen$(@:.resources=.resx)$@
180+
$(tmpdir)FSComp.fs$(tmpdir)FSComp.resources:../FSComp.txt
181+
mono$(MONO_OPTIONS)$(FSSRGEN)$<$(tmpdir)FSComp.fs$(tmpdir)FSComp.resx
182+
resgen$(tmpdir)FSComp.resx$(tmpdir)FSComp.resources
183183

184184
$(tmpdir)FSStrings.resources:$(srcdir)../FSStrings.resx
185185
resgen$<$@

‎src/fsharp/Fsc-proto/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ clean: clean-4-0
3232

3333
include$(topdir)/src/fsharp/targets.make
3434

35+
# We need the bootstrap's FSharp.Core to run the proto
3536
$(protodir)FSharp.Core.dll:$(bootstrapdir)FSharp.Core.dll
3637
@-mkdir$(protodir)
3738
cp -p$(bootstrapdir)FSharp.Core.dll$(protodir)FSharp.Core.dll

‎src/fsharp/Makefile.in‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
all: do-proto do-final
1+
2+
# Make the proto using the bootstrap, then make the final compiler using the proto
3+
# We call MAKE sequentially because we don't want do-final to explicitly depend on do-proto,
4+
# as that causes a complete recompilation of both proto and final everytime you touch the
5+
# compiler sources.
6+
all:
7+
$(MAKE) do-proto
8+
$(MAKE) do-final
29

310
do-proto:
411
$(MAKE) -C FSharp.Build-proto$@

‎src/fsharp/fsi/Makefile.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ sources = \
2727
../InternalCollections.fs\
2828
console.fs\
2929
fsi.fs\
30-
fsimain.fs
30+
fsimain.fs
3131

3232
RESOURCES =\
3333
$(tmpdir)FSIstrings.resources
3434

35-
$(tmpdir)FSIstrings.resources:$(srcdir)/FSIstrings.txt
36-
mono--debug$(FSSRGEN)$<$(@:.resources=.fs)$(@:.resources=.resx)
37-
resgen$(@:.resources=.resx)$@
35+
$(tmpdir)FSIstrings.fs$(tmpdir)FSIstrings.resources:$(srcdir)../FSIstrings.txt
36+
mono$(MONO_OPTIONS)$(FSSRGEN)$<$(tmpdir)FSIstrings.fs$(tmpdir)FSIstrings.resx
37+
resgen$(tmpdir)FSIstrings.resx$(tmpdir)FSIstrings.resources
3838

3939
include$(topdir)/src/fsharp/targets.make
4040

0 commit comments

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