Skip to content

Commit 657f915

Browse files
luhenryluhenry
authored
[2018-08] [sdks] Create archive targets for pre-building on CI (#10932)
* [sdks] Remove redundant --enable-cxx * [sdks] Shorten `-m32`/`-m64` parameters detection for runtimes * [sdks] Build BCL profiles without configure flags * [sdks] Add BclTemplate to build BCL profiles This is to avoid building all the profiles in a single `sdks/out/bcl` directory which will be shared between android, ios and wasm. * [sdks] Add download/pack capabilities for LLVM * [sdks] Create archive targets for pre-building on CI * [sdks] Use archive-{android,ios,wasm} on CI * [sdks] Run archive-llvm-llvm{,win}{32,64} on CI * [sdks] Ensure LLVM is cloned before trying to download * [sdks] Simplify call to BclTemplate * [mcs] Make directory dependency as order-only We would otherwise always rebuild the target since the directory is updated whenever something is added to the directory. This is a common Makefile technique. * [sdks] Build tests for BCL targets
1 parent bd1f64a commit 657f915

File tree

38 files changed

+361
-209
lines changed

38 files changed

+361
-209
lines changed

‎mcs/build/tests.make

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ test_lib_dir = $(topdir)/class/lib/$(PROFILE)/tests
2323

2424
test_nunit_lib = nunitlite.dll
2525
xunit_core := xunit.core xunit.execution.dotnet xunit.abstractions xunit.assert Xunit.NetCore.Extensions
26-
xunit_deps := netstandard System.Runtime
26+
xunit_deps := System.Runtime
2727
xunit_src := $(patsubst %,$(topdir)/../external/xunit-binaries/%,BenchmarkAttribute.cs BenchmarkDiscover.cs) $(topdir)/../mcs/class/test-helpers/PlatformDetection.cs
2828

2929
ifeq ($(USE_XTEST_REMOTE_EXECUTOR), YES)
@@ -249,7 +249,7 @@ ifdef HAVE_CS_TESTS
249249
$(test_lib_dir):
250250
mkdir -p $@
251251

252-
$(test_lib_output): $(test_assembly_dep) $(test_response) $(test_nunit_dep) $(test_lib_dir)
252+
$(test_lib_output): $(test_assembly_dep) $(test_response) $(test_nunit_dep) | $(test_lib_dir)
253253
$(TEST_COMPILE) $(LIBRARY_FLAGS) -target:library -out:$@ $(test_flags) $(LOCAL_TEST_COMPILER_ONDOTNET_FLAGS) @$(test_response)
254254

255255
test_response_preprocessed = $(test_response)_preprocessed
@@ -325,10 +325,10 @@ run-xunit-test-lib: xunit-test-local
325325
@rm -f $(test_lib_dir)/xunit.execution.dotnet.dll
326326

327327
# Some xunit tests want to be executed in a separate process (see RemoteExecutorTestBase)
328-
$(XTEST_REMOTE_EXECUTOR): $(topdir)/../external/corefx/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.cs
328+
$(XTEST_REMOTE_EXECUTOR): $(topdir)/../external/corefx/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.cs | $(test_lib_dir)
329329
$(TEST_COMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll $< -out:$@
330330

331-
$(xtest_lib_output): $(the_assembly) $(xtest_response) $(xunit_libs_dep) $(xunit_src) $(test_lib_dir) $(XTEST_REMOTE_EXECUTOR)
331+
$(xtest_lib_output): $(the_assembly) $(xtest_response) $(xunit_libs_dep) $(xunit_src) $(XTEST_REMOTE_EXECUTOR) | $(test_lib_dir)
332332
$(TEST_COMPILE) $(LIBRARY_FLAGS) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response) $(xunit_src)
333333

334334
xtest_response_preprocessed = $(xtest_response)_preprocessed

‎mcs/class/Microsoft.CSharp/monotouch_Microsoft.CSharp_xtest.dll.exclude.sources

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../external/corefx/src/Microsoft.CSharp/tests/AccessTests.netcoreapp.cs

‎mcs/class/Microsoft.CSharp/wasm_Microsoft.CSharp_xtest.dll.exclude.sources

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../external/corefx/src/Microsoft.CSharp/tests/AccessTests.netcoreapp.cs

‎mcs/class/Mono.Data.Sqlite/monotouch_Mono.Data.Sqlite_test.dll.exclude.sources

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bug27864.cs

‎mcs/class/System.ComponentModel.Composition.4.5/monodroid_System.ComponentModel.Composition_xtest.dll.exclude.sources

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
2+
../../../external/corefx/src/System.ComponentModel.Composition/tests/*.cs
3+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/*.cs
4+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/*.cs
5+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModel/*.cs
6+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Diagnostics/*.cs
7+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Factories/*.cs
8+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Primitives/*.cs
9+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/*.cs
10+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/Integration/*.cs
11+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/UnitTesting/*.cs

‎mcs/class/System.ComponentModel.Composition.4.5/monotouch_System.ComponentModel.Composition_xtest.dll.exclude.sources

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/*.cs
2+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/*.cs
3+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModel/*.cs
4+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Diagnostics/*.cs
5+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Factories/*.cs
6+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Primitives/*.cs
7+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/*.cs
8+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/Integration/*.cs
9+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/UnitTesting/*.cs

‎mcs/class/System.ComponentModel.Composition.4.5/wasm_System.ComponentModel.Composition_xtest.dll.exclude.sources

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/*.cs
2+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/*.cs
3+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModel/*.cs
4+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Diagnostics/*.cs
5+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Factories/*.cs
6+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Primitives/*.cs
7+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/*.cs
8+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/Integration/*.cs
9+
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/UnitTesting/*.cs

‎mcs/class/System.Core/monotouch_System.Core_xtest.dll.exclude.sources

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../external/corefx/src/System.Linq.Expressions/tests/Dynamic/InvokeMemberBindingTests.cs

‎mcs/class/System.Core/wasm_System.Core_xtest.dll.exclude.sources

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../external/corefx/src/System.Linq.Expressions/tests/Dynamic/InvokeMemberBindingTests.cs

‎mcs/class/System.Drawing/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ ifndef MOBILE_PROFILE
1717
LIB_MCS_FLAGS += -d:FEATURE_TYPECONVERTER,SUPPORTS_WINDOWS_COLORS
1818
endif
1919

20-
TEST_LIB_REFS = System.Drawing System.Runtime.Serialization.Formatters.Soap System.Xml
20+
TEST_LIB_REFS = System.Drawing System.Xml
21+
22+
ifneq ($(PROFILE),wasm)
23+
TEST_LIB_REFS += System.Runtime.Serialization.Formatters.Soap
24+
endif
2125

2226
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -define:TEST -resource:Test/resources/indexed.png,indexed.png \
2327
-nowarn:0618 -nowarn:219 -nowarn:169

‎mcs/class/System.Drawing/wasm_System.Drawing_test.dll.exclude.sources

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
System.Drawing/GDIPlusTest.cs
2+
System.Drawing/TestBitmap.cs
3+
System.Drawing/TestGraphics.cs
4+
System.Drawing/TestIcon.cs
5+
System.Drawing/TestIconConverter.cs
6+
System.Drawing/TestImage.cs
7+
System.Drawing/TestImageConverter.cs

‎mcs/class/System.Runtime.Serialization/Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,13 @@ LIB_MCS_FLAGS = \
1313
$(RESOURCE_FILES:%=/resource:%)
1414
TXT_RESOURCE_STRINGS = ../referencesource/System.Runtime.Serialization/System.Runtime.Serialization.txt
1515

16-
XTEST_LIB_REFS = System System.Core System.Xml System.Xml.Linq System.Drawing Facades/System.Threading.Tasks
16+
XTEST_LIB_REFS = System System.Core System.Xml System.Xml.Linq Facades/System.Threading.Tasks
17+
18+
ifneq ($(PROFILE),monodroid)
19+
ifneq ($(PROFILE),monotouch)
20+
XTEST_LIB_REFS += System.Drawing
21+
endif
22+
endif
1723

1824
ifneq (2.1, $(FRAMEWORK_VERSION))
1925
LIB_REFS += System.Data System.Configuration SMDiagnostics

‎mcs/class/System.Runtime.Serialization/monodroid_System.Runtime.Serialization_xtest.dll.exclude.sources

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../external/corefx/src/System.Runtime.Serialization.Xml/tests/SerializationTypes.RuntimeOnly.cs

‎mcs/class/System.Runtime.Serialization/monotouch_System.Runtime.Serialization_xtest.dll.exclude.sources

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../external/corefx/src/System.Runtime.Serialization.Xml/tests/SerializationTypes.RuntimeOnly.cs

‎mcs/class/System.Runtime.Serialization/wasm_System.Runtime.Serialization_xtest.dll.exclude.sources

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../external/corefx/src/System.Runtime.Serialization.Xml/tests/SerializationTypes.RuntimeOnly.cs

‎mcs/class/System.Security/wasm_System.Security_test.dll.exclude.sources

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
System.Security.Permissions/DataProtectionPermissionAttributeTest.cs

‎mcs/class/System.Web.Services/monotouch_System.Web.Services_test.dll.exclude.sources

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
System.Web.Services.Configuration/DiagnosticsElementTest.cs
2+
System.Web.Services.Configuration/ProtocolElementTest.cs
3+
System.Web.Services.Configuration/SoapEnvelopeProcessingElementTest.cs
4+
System.Web.Services.Configuration/SoapExtensionTypeElementTest.cs
5+
System.Web.Services.Configuration/TypeElementTest.cs
6+
System.Web.Services.Configuration/WsdlHelpGeneratorElementTest.cs
7+
System.Web.Services.Configuration/WsiProfilesElementTest.cs
8+

‎mcs/class/System.Web.Services/wasm_System.Web.Services_test.dll.exclude.sources

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
System.Web.Services.Configuration/DiagnosticsElementTest.cs
2+
System.Web.Services.Configuration/ProtocolElementTest.cs
3+
System.Web.Services.Configuration/SoapEnvelopeProcessingElementTest.cs
4+
System.Web.Services.Configuration/SoapExtensionTypeElementTest.cs
5+
System.Web.Services.Configuration/TypeElementTest.cs
6+
System.Web.Services.Configuration/WsdlHelpGeneratorElementTest.cs
7+
System.Web.Services.Configuration/WsiProfilesElementTest.cs
8+

‎mcs/class/System.XML/Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,13 @@ endif
1818

1919
TEST_LIB_REFS = System.Data System.Core
2020
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
21-
XTEST_LIB_REFS = System System.Core System.Xml System.Xml.Linq System.Drawing Facades/System.Threading.Tasks System.Runtime.Serialization Facades/System.Text.Encoding.CodePages
21+
XTEST_LIB_REFS = System System.Core System.Xml System.Xml.Linq Facades/System.Threading.Tasks System.Runtime.Serialization Facades/System.Text.Encoding.CodePages
22+
23+
ifneq ($(PROFILE),monodroid)
24+
ifneq ($(PROFILE),monotouch)
25+
XTEST_LIB_REFS += System.Drawing
26+
endif
27+
endif
2228

2329
LIBRARY_WARN_AS_ERROR = yes
2430

‎mcs/class/System/monodroid_System_xtest.dll.exclude.sources

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2+
../../../external/corefx/src/System.CodeDom/tests/CodeCollections/*.cs
3+
../../../external/corefx/src/System.CodeDom/tests/CodeExpressions/*.cs
4+
../../../external/corefx/src/System.CodeDom/tests/CodeObjects/*.cs
5+
../../../external/corefx/src/System.CodeDom/tests/CodeStatements/*.cs
6+
../../../external/corefx/src/System.CodeDom/tests/CodeTypeMembers/*.cs
7+
../../../external/corefx/src/System.CodeDom/tests/Compiler/*.cs
8+
../../../external/corefx/src/System.CodeDom/tests/Other/*.cs
9+
../../../external/corefx/src/System.CodeDom/tests/Microsoft/CSharp/*.cs
10+
../../../external/corefx/src/System.CodeDom/tests/Microsoft/VisualBasic/*.cs
11+
../../../external/corefx/src/System.CodeDom/tests/*.cs
12+
13+
../../../external/corefx/src/System.Net.Security/tests/UnitTests/Fakes/*.cs
14+
15+
../../../external/corefx/src/System.Text.RegularExpressions/tests/*.cs

‎mcs/class/System/monotouch_System_xtest.dll.exclude.sources

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
../../../external/corefx/src/System.CodeDom/tests/CodeCollections/*.cs
2+
../../../external/corefx/src/System.CodeDom/tests/CodeExpressions/*.cs
3+
../../../external/corefx/src/System.CodeDom/tests/CodeObjects/*.cs
4+
../../../external/corefx/src/System.CodeDom/tests/CodeStatements/*.cs
5+
../../../external/corefx/src/System.CodeDom/tests/CodeTypeMembers/*.cs
6+
../../../external/corefx/src/System.CodeDom/tests/Compiler/*.cs
7+
../../../external/corefx/src/System.CodeDom/tests/Other/*.cs
8+
../../../external/corefx/src/System.CodeDom/tests/Microsoft/CSharp/*.cs
9+
../../../external/corefx/src/System.CodeDom/tests/Microsoft/VisualBasic/*.cs
10+
../../../external/corefx/src/System.CodeDom/tests/*.cs

‎mcs/class/System/wasm_System_xtest.dll.exclude.sources

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
../../../external/corefx/src/System.CodeDom/tests/CodeCollections/*.cs
2+
../../../external/corefx/src/System.CodeDom/tests/CodeExpressions/*.cs
3+
../../../external/corefx/src/System.CodeDom/tests/CodeObjects/*.cs
4+
../../../external/corefx/src/System.CodeDom/tests/CodeStatements/*.cs
5+
../../../external/corefx/src/System.CodeDom/tests/CodeTypeMembers/*.cs
6+
../../../external/corefx/src/System.CodeDom/tests/Compiler/*.cs
7+
../../../external/corefx/src/System.CodeDom/tests/Other/*.cs
8+
../../../external/corefx/src/System.CodeDom/tests/Microsoft/CSharp/*.cs
9+
../../../external/corefx/src/System.CodeDom/tests/Microsoft/VisualBasic/*.cs
10+
../../../external/corefx/src/System.CodeDom/tests/*.cs

‎mcs/class/corlib/monotouch_corlib_xtest.dll.exclude.sources

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderGetGenericArguments.cs
2+
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderGetGenericMethodDefinition.cs
3+
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderGetHashCode.cs
4+
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderIsGenericMethod.cs
5+
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderSetReturnType.cs
6+
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderSetSignature.cs
7+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderDeclaringMethod.cs
8+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderGenericParameterAttributes.cs
9+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderGenericParameterPosition.cs
10+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderGetGenericTypeDefinition.cs
11+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderIsGenericTypeDefinition.cs
12+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderMakeGenericType.cs
13+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderName.cs
14+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderNamespace.cs
15+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderPackingSize.cs
16+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderSize.cs

‎mcs/class/corlib/wasm_corlib_xtest.dll.exclude.sources

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderGetGenericArguments.cs
2+
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderGetGenericMethodDefinition.cs
3+
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderGetHashCode.cs
4+
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderIsGenericMethod.cs
5+
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderSetReturnType.cs
6+
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderSetSignature.cs
7+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderDeclaringMethod.cs
8+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderGenericParameterAttributes.cs
9+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderGenericParameterPosition.cs
10+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderGetGenericTypeDefinition.cs
11+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderIsGenericTypeDefinition.cs
12+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderMakeGenericType.cs
13+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderName.cs
14+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderNamespace.cs
15+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderPackingSize.cs
16+
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderSize.cs

‎runtime/Makefile.am

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
tmpinst = _tmpinst
23

34
noinst_SCRIPTS = mono-wrapper monodis-wrapper
@@ -81,34 +82,49 @@ endif
8182

8283
test_profiles = $(filter-out binary_reference_assemblies monodroid_tools,$(build_profiles))
8384

84-
if BUILD_MCS
85-
8685
MAKE_FLAGS=$(if $(V),,--no-print-directory -s)
8786

8887
# The write check is to foil 'make distcheck'
89-
all-local: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
88+
all-mcs: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
9089
if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi
9190
cd $(mcs_topdir) && $(MAKE) $(MAKE_FLAGS) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' CC='$(CC)' all-profiles
9291

93-
# override automake
94-
install: install-exec install-data
92+
install-mcs: install-mcs-exec install-mcs-data
9593

9694
# override automake
97-
install-exec: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
95+
install-mcs-exec: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
9896
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles
9997

10098
# override automake
101-
install-data:
99+
install-mcs-data:
102100
@:
103101

104102
# override automake
105-
uninstall:
103+
uninstall-mcs:
106104
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles
107105

108-
clean-local:
106+
clean-mcs:
109107
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' clean-profiles
110108
-rm -fr $(etctmp) $(tmpinst)
111109

110+
if BUILD_MCS
111+
112+
all-local: all-mcs
113+
114+
# override automake
115+
install: install-mcs
116+
117+
# override automake
118+
install-exec: install-mcs-exec
119+
120+
# override automake
121+
install-data: install-mcs-data
122+
123+
# override automake
124+
uninstall: uninstall-mcs
125+
126+
clean-local: clean-mcs
127+
112128
endif BUILD_MCS
113129

114130
TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/csc $(tmpinst)/bin/mcs $(tmpinst)/bin/al

0 commit comments

Comments
 (0)