From 3821e8235e945a2c0b1cedb4add0d572d910e93e Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Fri, 10 Feb 2017 16:46:53 +0100 Subject: [PATCH] [build] split leeroy and jenkins rules (#434) - leeroy builds everything *except* zip output - jenkins builds leeroy and zip output - introduced new variable, `$(CONFIGURATIONS)`. it is used in the leeroy and jenkins rules to choose which configurations to build. so for example `make leeroy CONFIGURATIONS=Release` should build just Release configurations --- build-tools/scripts/BuildEverything.mk | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/build-tools/scripts/BuildEverything.mk b/build-tools/scripts/BuildEverything.mk index d61f86d1618..213b549d11b 100644 --- a/build-tools/scripts/BuildEverything.mk +++ b/build-tools/scripts/BuildEverything.mk @@ -73,19 +73,14 @@ _MSBUILD_ARGS = \ /p:AndroidSupportedHostJitAbis=$(call join-with,:,$(ALL_HOST_ABIS)) \ /p:AndroidSupportedTargetAotAbis=$(call join-with,:,$(ALL_AOT_ABIS)) -TASK_ASSEMBLIES = \ - bin/Debug/lib/xbuild/Xamarin/Android/Xamarin.Android.Build.Tasks.dll \ - bin/Release/lib/xbuild/Xamarin/Android/Xamarin.Android.Build.Tasks.dll +CONFIGURATIONS ?= Debug Release +TASK_ASSEMBLIES = $(foreach conf, $(CONFIGURATIONS), bin/$(conf)/lib/xbuild/Xamarin/Android/Xamarin.Android.Build.Tasks.dll) +RUNTIME_LIBRARIES = $(foreach conf, $(CONFIGURATIONS), $(ALL_JIT_ABIS:%=bin/$(conf)/lib/xbuild/Xamarin/Android/lib/%/libmonosgen-2.0.so)) +FRAMEWORK_ASSEMBLIES = $(foreach conf, $(CONFIGURATIONS), $(FRAMEWORKS:%=bin/$(conf)/lib/xbuild-frameworks/MonoAndroid/%/Mono.Android.dll)) -RUNTIME_LIBRARIES = \ - $(ALL_JIT_ABIS:%=bin/Debug/lib/xbuild/Xamarin/Android/lib/%/libmonosgen-2.0.so) \ - $(ALL_JIT_ABIS:%=bin/Release/lib/xbuild/Xamarin/Android/lib/%/libmonosgen-2.0.so) +jenkins: leeroy $(ZIP_OUTPUT) -FRAMEWORK_ASSEMBLIES = \ - $(FRAMEWORKS:%=bin/Debug/lib/xbuild-frameworks/MonoAndroid/%/Mono.Android.dll) \ - $(FRAMEWORKS:%=bin/Release/lib/xbuild-frameworks/MonoAndroid/%/Mono.Android.dll) - -leeroy jenkins: prepare $(RUNTIME_LIBRARIES) $(TASK_ASSEMBLIES) $(FRAMEWORK_ASSEMBLIES) $(ZIP_OUTPUT) +leeroy: prepare $(RUNTIME_LIBRARIES) $(TASK_ASSEMBLIES) $(FRAMEWORK_ASSEMBLIES) $(TASK_ASSEMBLIES): bin/%/lib/xbuild/Xamarin/Android/Xamarin.Android.Build.Tasks.dll: $(MSBUILD) $(MSBUILD_FLAGS) /p:Configuration=$* $(_MSBUILD_ARGS) $(SOLUTION)