From faaa908b2f0fcdae907bd12233efb0febb04fe91 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Tue, 30 Oct 2018 13:58:05 -0400 Subject: [PATCH] [build] Remove unnecessary $(CONFIGURATION) use (#2353) Commit ae093bf0 removed all uses of `$(CONFIGURATIONS)`, replacing `$(foreach conf, $(CONFIGURATIONS))` with `$(CONFIGURATION)`. This works, but results in Makefile fragments which are more complicated than necessary, and `$(call)` invocations which needlessly pass `$(CONFIGURATION)` when the make `define` could directly use `$(CONFIGURATION)` instead. Remove unnecessary uses of `$(CONFIGURATION)`, simplifying the rules. --- Makefile | 26 +++++++++++++------------- build-tools/scripts/BuildEverything.mk | 14 +++++++------- build-tools/scripts/msbuild.mk | 6 +++--- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index e0fb94c3f9e..7857e89a3a0 100644 --- a/Makefile +++ b/Makefile @@ -150,15 +150,15 @@ $(XA_BUILD_PATHS_OUT): bin/Test%/XABuildPaths.cs: build-tools/scripts/XABuildPat cat $@ -# Usage: $(call CALL_CREATE_THIRD_PARTY_NOTICES,configuration,path,licenseType,includeExternalDeps,includeBuildDeps) +# Usage: $(call CALL_CREATE_THIRD_PARTY_NOTICES,path,licenseType,includeExternalDeps,includeBuildDeps) define CREATE_THIRD_PARTY_NOTICES - $(call MSBUILD_BINLOG,create-tpn,$(MSBUILD),$(1)) $(_MSBUILD_ARGS) \ + $(call MSBUILD_BINLOG,create-tpn,$(MSBUILD)) $(_MSBUILD_ARGS) \ $(topdir)/build-tools/ThirdPartyNotices/ThirdPartyNotices.csproj \ - /p:Configuration=$(1) \ - /p:ThirdPartyNoticeFile=$(topdir)/$(2) \ - /p:ThirdPartyNoticeLicenseType=$(3) \ - /p:TpnIncludeExternalDependencies=$(4) \ - /p:TpnIncludeBuildDependencies=$(5) + /p:Configuration=$(CONFIGURATION) \ + /p:ThirdPartyNoticeFile=$(topdir)/$(1) \ + /p:ThirdPartyNoticeLicenseType=$(2) \ + /p:TpnIncludeExternalDependencies=$(3) \ + /p:TpnIncludeBuildDependencies=$(4) endef # CREATE_THIRD_PARTY_NOTICES prepare:: prepare-tpn @@ -167,20 +167,20 @@ TPN_LICENSE_FILES = $(shell grep -h '' external/*.tpnitems src/*.tp | sed -E 's,(.*),\1,g;s,.\(MSBuildThisFileDirectory\),$(topdir)/external/,g' \ | tr \\ / ) -# Usage: $(call CREATE_THIRD_PARTY_NOTICES,configuration,path,licenseType,includeExternalDeps,includeBuildDeps) +# Usage: $(call CREATE_THIRD_PARTY_NOTICES_RULE,path,licenseType,includeExternalDeps,includeBuildDeps) define CREATE_THIRD_PARTY_NOTICES_RULE -prepare-tpn:: $(2) +prepare-tpn:: $(1) -$(2) $(topdir)/$(2): build-tools/ThirdPartyNotices/ThirdPartyNotices.csproj \ +$(1) $(topdir)/$(1): build-tools/ThirdPartyNotices/ThirdPartyNotices.csproj \ $(wildcard external/*.tpnitems src/*.tpnitems) \ $(TPN_LICENSE_FILES) - $(call CREATE_THIRD_PARTY_NOTICES,$(1),$(2),$(3),$(4),$(5)) + $(call CREATE_THIRD_PARTY_NOTICES,$(1),$(2),$(3),$(4)) endef # CREATE_THIRD_PARTY_NOTICES_RULE THIRD_PARTY_NOTICE_LICENSE_TYPE = microsoft-oss -$(eval $(call CREATE_THIRD_PARTY_NOTICES_RULE,$(CONFIGURATION),ThirdPartyNotices.txt,foundation,False,False)) -$(eval $(call CREATE_THIRD_PARTY_NOTICES_RULE,$(CONFIGURATION),bin/$(CONFIGURATION)/lib/xamarin.android/ThirdPartyNotices.txt,$(THIRD_PARTY_NOTICE_LICENSE_TYPE),True,False)) +$(eval $(call CREATE_THIRD_PARTY_NOTICES_RULE,ThirdPartyNotices.txt,foundation,False,False)) +$(eval $(call CREATE_THIRD_PARTY_NOTICES_RULE,bin/$(CONFIGURATION)/lib/xamarin.android/ThirdPartyNotices.txt,$(THIRD_PARTY_NOTICE_LICENSE_TYPE),True,False)) run-all-tests: $(call MSBUILD_BINLOG,run-all-tests) $(TEST_TARGETS) /t:RunAllTests diff --git a/build-tools/scripts/BuildEverything.mk b/build-tools/scripts/BuildEverything.mk index 5a26e14c4a3..3f82244d8ac 100644 --- a/build-tools/scripts/BuildEverything.mk +++ b/build-tools/scripts/BuildEverything.mk @@ -88,8 +88,8 @@ jenkins: prepare leeroy $(ZIP_OUTPUT) leeroy: leeroy-all framework-assemblies opentk-jcw leeroy-all: - $(call MSBUILD_BINLOG,leeroy-all,$(_SLN_BUILD),$(CONFIGURATION)) $(SOLUTION) /p:Configuration=$(CONFIGURATION) $(_MSBUILD_ARGS) && \ - $(call CREATE_THIRD_PARTY_NOTICES,$(CONFIGURATION),bin/$(CONFIGURATION)/lib/xamarin.android/ThirdPartyNotices.txt,$(THIRD_PARTY_NOTICE_LICENSE_TYPE),True,False) + $(call MSBUILD_BINLOG,leeroy-all,$(_SLN_BUILD)) $(SOLUTION) /p:Configuration=$(CONFIGURATION) $(_MSBUILD_ARGS) && \ + $(call CREATE_THIRD_PARTY_NOTICES,bin/$(CONFIGURATION)/lib/xamarin.android/ThirdPartyNotices.txt,$(THIRD_PARTY_NOTICE_LICENSE_TYPE),True,False) framework-assemblies: PREV_VERSION="v1.0"; \ @@ -100,24 +100,24 @@ framework-assemblies: if [ $$? -ne 0 ] ; then \ rm -f bin/$(CONFIGURATION)/lib/xamarin.android/xbuild-frameworks/MonoAndroid/$${CUR_VERSION}/RedistList/FrameworkList.xml; \ fi; \ - $(call MSBUILD_BINLOG,Mono.Android,$(_SLN_BUILD),$(CONFIGURATION)) src/Mono.Android/Mono.Android.csproj \ + $(call MSBUILD_BINLOG,Mono.Android,$(_SLN_BUILD)) src/Mono.Android/Mono.Android.csproj \ /p:Configuration=$(CONFIGURATION) $(_MSBUILD_ARGS) \ /p:AndroidApiLevel=$(a) /p:AndroidPlatformId=$(word $(a), $(ALL_PLATFORM_IDS)) /p:AndroidFrameworkVersion=$${CUR_VERSION} \ /p:AndroidPreviousFrameworkVersion=$${PREV_VERSION} || exit 1; \ PREV_VERSION=$${CUR_VERSION}; ) rm -f bin/$(CONFIGURATION)/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Xamarin.Android.NUnitLite.dll; \ - $(call MSBUILD_BINLOG,NUnitLite,$(_SLN_BUILD),$(CONFIGURATION)) $(MSBUILD_FLAGS) src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.csproj \ + $(call MSBUILD_BINLOG,NUnitLite,$(_SLN_BUILD)) $(MSBUILD_FLAGS) src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.csproj \ /p:Configuration=$(CONFIGURATION) $(_MSBUILD_ARGS) \ /p:AndroidApiLevel=$(firstword $(API_LEVELS)) /p:AndroidPlatformId=$(word $(firstword $(API_LEVELS)), $(ALL_PLATFORM_IDS)) \ /p:AndroidFrameworkVersion=$(firstword $(FRAMEWORKS)) || exit 1; _latest_stable_framework=$$($(MSBUILD) /p:DoNotLoadOSProperties=True /nologo /v:minimal /t:GetAndroidLatestStableFrameworkVersion build-tools/scripts/Info.targets | tr -d '[[:space:]]') ; \ rm -f "bin/$(CONFIGURATION)/lib/xamarin.android/xbuild-frameworks/MonoAndroid/$$_latest_stable_framework"/Mono.Android.Export.* ; \ - $(call MSBUILD_BINLOG,Mono.Android.Export,$(_SLN_BUILD),$(CONFIGURATION)) $(MSBUILD_FLAGS) src/Mono.Android.Export/Mono.Android.Export.csproj \ + $(call MSBUILD_BINLOG,Mono.Android.Export,$(_SLN_BUILD)) $(MSBUILD_FLAGS) src/Mono.Android.Export/Mono.Android.Export.csproj \ /p:Configuration=$(CONFIGURATION) $(_MSBUILD_ARGS) \ /p:AndroidApiLevel=$(firstword $(API_LEVELS)) /p:AndroidPlatformId=$(word $(firstword $(API_LEVELS)), $(ALL_PLATFORM_IDS)) \ /p:AndroidFrameworkVersion=$(firstword $(FRAMEWORKS)) || exit 1; \ rm -f "bin/$(CONFIGURATION)/lib/xamarin.android/xbuild-frameworks/MonoAndroid/$$_latest_stable_framework"/OpenTK-1.0.* ; \ - $(call MSBUILD_BINLOG,OpenTK,$(_SLN_BUILD),$(CONFIGURATION)) $(MSBUILD_FLAGS) src/OpenTK-1.0/OpenTK.csproj \ + $(call MSBUILD_BINLOG,OpenTK,$(_SLN_BUILD)) $(MSBUILD_FLAGS) src/OpenTK-1.0/OpenTK.csproj \ /p:Configuration=$(CONFIGURATION) $(_MSBUILD_ARGS) \ /p:AndroidApiLevel=$(firstword $(API_LEVELS)) /p:AndroidPlatformId=$(word $(firstword $(API_LEVELS)), $(ALL_PLATFORM_IDS)) \ /p:AndroidFrameworkVersion=$(firstword $(FRAMEWORKS)) || exit 1; @@ -125,6 +125,6 @@ framework-assemblies: opentk-jcw: $(foreach a, $(API_LEVELS), \ touch bin/$(CONFIGURATION)/lib/xamarin.android/xbuild-frameworks/MonoAndroid/*/OpenTK-1.0.dll; \ - $(call MSBUILD_BINLOG,OpenTK-JCW,$(_SLN_BUILD),$(CONFIGURATION)) $(MSBUILD_FLAGS) src/OpenTK-1.0/OpenTK.csproj \ + $(call MSBUILD_BINLOG,OpenTK-JCW,$(_SLN_BUILD)) $(MSBUILD_FLAGS) src/OpenTK-1.0/OpenTK.csproj \ /t:GenerateJavaCallableWrappers /p:Configuration=$(CONFIGURATION) $(_MSBUILD_ARGS) \ /p:AndroidApiLevel=$(a) /p:AndroidPlatformId=$(word $(a), $(ALL_PLATFORM_IDS)) /p:AndroidFrameworkVersion=$(word $(a), $(ALL_FRAMEWORKS)) || exit 1; ) diff --git a/build-tools/scripts/msbuild.mk b/build-tools/scripts/msbuild.mk index 8ac65387ec7..2230ef90584 100644 --- a/build-tools/scripts/msbuild.mk +++ b/build-tools/scripts/msbuild.mk @@ -37,10 +37,10 @@ endif # $(MSBUILD) == msbuild ifeq ($(USE_MSBUILD),1) -# $(call MSBUILD_BINLOG,name,msbuild=$(MSBUILD),conf=$(CONFIGURATION)) +# $(call MSBUILD_BINLOG,name,msbuild=$(MSBUILD)) define MSBUILD_BINLOG $(if $(2),$(2),$(MSBUILD)) $(MSBUILD_FLAGS) /v:normal \ - /binaryLogger:"$(dir $(realpath $(firstword $(MAKEFILE_LIST))))/bin/Build$(if $(3),$(3),$(CONFIGURATION))/msbuild-`date +%Y%m%dT%H%M%S`-$(1).binlog" + /binaryLogger:"$(dir $(realpath $(firstword $(MAKEFILE_LIST))))/bin/Build$(CONFIGURATION)/msbuild-`date +%Y%m%dT%H%M%S`-$(1).binlog" endef else # $(MSBUILD) != 1 @@ -55,7 +55,7 @@ ifneq ($(V),0) MSBUILD_FLAGS += /v:diag endif # $(V) != 0 -# $(call MSBUILD_BINLOG,name,msbuild=$(MSBUILD),conf=$(CONFIGURATION)) +# $(call MSBUILD_BINLOG,name,msbuild=$(MSBUILD)) define MSBUILD_BINLOG $(if $(2),$(2),$(MSBUILD)) $(MSBUILD_FLAGS) endef