Skip to content

Commit fc22191

Browse files
radekdoulikjonpryor
authored andcommitted
[build] convert parts of leeroy rule to phony targets (#515)
- this way the [x|ms]build will be called always and thus dependencies will be handled by the msbuild targets and not by make - it means that when we edit for example xamarin-android/src/Mono.Android/System.Drawing/KnownColors.cs and then run make in monodroid, all the required API levels will be rebuilt and the updated Mono.Android.dll, ... will be rsynced - we should probably review the msbuild target dependencies in xamarin-android to make sure we don't run targets where not needed. in example add Inputs and Outputs
1 parent 2ebaf45 commit fc22191

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

build-tools/scripts/BuildEverything.mk

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,24 +74,22 @@ _MSBUILD_ARGS = \
7474
/p:AndroidSupportedTargetAotAbis=$(call join-with,:,$(ALL_AOT_ABIS))
7575

7676
CONFIGURATIONS ?= Debug Release
77-
TASK_ASSEMBLIES = $(foreach conf, $(CONFIGURATIONS), bin/$(conf)/lib/xbuild/Xamarin/Android/Xamarin.Android.Build.Tasks.dll)
78-
RUNTIME_LIBRARIES = $(foreach conf, $(CONFIGURATIONS), $(ALL_JIT_ABIS:%=bin/$(conf)/lib/xbuild/Xamarin/Android/lib/%/libmonosgen-2.0.so))
79-
FRAMEWORK_ASSEMBLIES = $(foreach conf, $(CONFIGURATIONS), $(FRAMEWORKS:%=bin/$(conf)/lib/xbuild-frameworks/MonoAndroid/%/Mono.Android.dll))
8077

81-
.PHONY: leeroy jenkins leeroy-all
78+
.PHONY: leeroy jenkins leeroy-all opentk-jcw framework-assemblies runtime-libraries task-assemblies
8279

8380
jenkins: prepare leeroy $(ZIP_OUTPUT)
8481

85-
leeroy: leeroy-all $(RUNTIME_LIBRARIES) $(TASK_ASSEMBLIES) $(FRAMEWORK_ASSEMBLIES) opentk-jcw
82+
leeroy: leeroy-all runtime-libraries task-assemblies framework-assemblies opentk-jcw
8683

8784
leeroy-all:
8885
$(foreach conf, $(CONFIGURATIONS), \
8986
$(MSBUILD) $(MSBUILD_FLAGS) Xamarin.Android.sln /p:Configuration=$(conf) $(_MSBUILD_ARGS) ; )
9087

91-
$(TASK_ASSEMBLIES): bin/%/lib/xbuild/Xamarin/Android/Xamarin.Android.Build.Tasks.dll:
92-
$(MSBUILD) $(MSBUILD_FLAGS) /p:Configuration=$* $(_MSBUILD_ARGS) $(SOLUTION)
88+
task-assemblies:
89+
$(foreach conf, $(CONFIGURATIONS), \
90+
$(MSBUILD) $(MSBUILD_FLAGS) /p:Configuration=$(conf) $(_MSBUILD_ARGS) $(SOLUTION); )
9391

94-
$(FRAMEWORK_ASSEMBLIES):
92+
framework-assemblies:
9593
PREV_VERSION="v1.0"; \
9694
for a in $(API_LEVELS); do \
9795
CUR_VERSION=`echo "$(ALL_FRAMEWORKS)"|tr -s " "|cut -d " " -s -f $${a}`; \
@@ -105,7 +103,7 @@ $(FRAMEWORK_ASSEMBLIES):
105103
PREV_VERSION=$${CUR_VERSION}; \
106104
done
107105

108-
$(RUNTIME_LIBRARIES):
106+
runtime-libraries:
109107
$(foreach conf, $(CONFIGURATIONS), \
110108
$(MSBUILD) $(MSBUILD_FLAGS) /p:Configuration=$(conf) $(_MSBUILD_ARGS) $(SOLUTION); )
111109

0 commit comments

Comments
 (0)