Remove the watch-mono repository, and use a single mono repository. (#941)
Still keeping some of the logic so that it's easy to switch back if we wish to.
This commit is contained in:
Родитель
642173828e
Коммит
1d54c461b0
|
@ -29,7 +29,3 @@
|
||||||
[submodule "external/guiunit"]
|
[submodule "external/guiunit"]
|
||||||
path = external/guiunit
|
path = external/guiunit
|
||||||
url = ../../mono/guiunit.git
|
url = ../../mono/guiunit.git
|
||||||
[submodule "external/watch-mono"]
|
|
||||||
path = external/watch-mono
|
|
||||||
url = ../../mono/mono.git
|
|
||||||
branch = master
|
|
||||||
|
|
|
@ -215,7 +215,7 @@ DEVICETV_OBJC_CFLAGS = $(DEVICETV_CFLAGS) $(DEVICE_OBJC_CFLAGS)
|
||||||
# paths to the modules we depend on, as variables, so people can put
|
# paths to the modules we depend on, as variables, so people can put
|
||||||
# things in other places if they absolutely must.
|
# things in other places if they absolutely must.
|
||||||
MONO_PATH=$(TOP)/external/mono
|
MONO_PATH=$(TOP)/external/mono
|
||||||
WATCH_MONO_PATH=$(TOP)/external/watch-mono
|
WATCH_MONO_PATH=$(TOP)/external/mono
|
||||||
LLVM_PATH=$(TOP)/external/llvm
|
LLVM_PATH=$(TOP)/external/llvm
|
||||||
FSHARP_PATH=$(TOP)/external/fsharp
|
FSHARP_PATH=$(TOP)/external/fsharp
|
||||||
MONOTOUCH_DIALOG_PATH=$(TOP)/external/MonoTouch.Dialog
|
MONOTOUCH_DIALOG_PATH=$(TOP)/external/MonoTouch.Dialog
|
||||||
|
|
|
@ -346,8 +346,10 @@ endif
|
||||||
$(MONO_PATH)/configure: $(MONO_PATH)/configure.ac $(BUILDS_MAKEFILE_DEP)
|
$(MONO_PATH)/configure: $(MONO_PATH)/configure.ac $(BUILDS_MAKEFILE_DEP)
|
||||||
$(Q) ./wrap-autogen.sh $(MONO_PATH) mono $(XAMARIN_AUTOGEN_FLAGS)
|
$(Q) ./wrap-autogen.sh $(MONO_PATH) mono $(XAMARIN_AUTOGEN_FLAGS)
|
||||||
|
|
||||||
|
ifneq ($(WATCH_MONO_PATH),$(MONO_PATH))
|
||||||
$(WATCH_MONO_PATH)/configure: $(WATCH_MONO_PATH)/configure.ac $(BUILDS_MAKEFILE_DEP)
|
$(WATCH_MONO_PATH)/configure: $(WATCH_MONO_PATH)/configure.ac $(BUILDS_MAKEFILE_DEP)
|
||||||
$(Q) ./wrap-autogen.sh $(WATCH_MONO_PATH) mono
|
$(Q) ./wrap-autogen.sh $(WATCH_MONO_PATH) mono
|
||||||
|
endif
|
||||||
|
|
||||||
configure-mono:
|
configure-mono:
|
||||||
rm -f $(MONO_PATH)/configure
|
rm -f $(MONO_PATH)/configure
|
||||||
|
@ -1871,15 +1873,21 @@ install-llvm64: .stamp-build-llvm64 $(LLVM_TARGETS)
|
||||||
llvm: setup-llvm build-llvm install-llvm
|
llvm: setup-llvm build-llvm install-llvm
|
||||||
llvm64: install-llvm64
|
llvm64: install-llvm64
|
||||||
|
|
||||||
|
ifneq ($(WATCH_MONO_PATH),$(MONO_PATH))
|
||||||
$(MONO_PATH)/tools/offsets-tool/.stamp-clone $(WATCH_MONO_PATH)/tools/offsets-tool/.stamp-clone:
|
$(MONO_PATH)/tools/offsets-tool/.stamp-clone $(WATCH_MONO_PATH)/tools/offsets-tool/.stamp-clone:
|
||||||
|
else
|
||||||
|
$(MONO_PATH)/tools/offsets-tool/.stamp-clone:
|
||||||
|
endif
|
||||||
@echo Cloning for offsets-tool in $(dir $@)
|
@echo Cloning for offsets-tool in $(dir $@)
|
||||||
$(Q) $(MAKE) -C $(dir $@) .stamp-clone
|
$(Q) $(MAKE) -C $(dir $@) .stamp-clone
|
||||||
|
|
||||||
$(MONO_PATH)/tools/offsets-tool/MonoAotOffsetsDumper.exe: $(MONO_PATH)/tools/offsets-tool/.stamp-clone $(wildcard $(MONO_PATH)/tools/offsets-tool/*.cs)
|
$(MONO_PATH)/tools/offsets-tool/MonoAotOffsetsDumper.exe: $(MONO_PATH)/tools/offsets-tool/.stamp-clone $(wildcard $(MONO_PATH)/tools/offsets-tool/*.cs)
|
||||||
$(Q) $(MAKE) -C $(dir $@) MonoAotOffsetsDumper.exe
|
$(Q) $(MAKE) -C $(dir $@) MonoAotOffsetsDumper.exe
|
||||||
|
|
||||||
|
ifneq ($(WATCH_MONO_PATH),$(MONO_PATH))
|
||||||
$(WATCH_MONO_PATH)/tools/offsets-tool/MonoAotOffsetsDumper.exe: $(WATCH_MONO_PATH)/tools/offsets-tool/.stamp-clone $(wildcard $(WATCH_MONO_PATH)/tools/offsets-tool/*.cs)
|
$(WATCH_MONO_PATH)/tools/offsets-tool/MonoAotOffsetsDumper.exe: $(WATCH_MONO_PATH)/tools/offsets-tool/.stamp-clone $(wildcard $(WATCH_MONO_PATH)/tools/offsets-tool/*.cs)
|
||||||
$(Q) $(MAKE) -C $(dir $@) MonoAotOffsetsDumper.exe
|
$(Q) $(MAKE) -C $(dir $@) MonoAotOffsetsDumper.exe
|
||||||
|
endif
|
||||||
|
|
||||||
target7/mono/arch/arm/arm_dpimacros.h: setup-target7
|
target7/mono/arch/arm/arm_dpimacros.h: setup-target7
|
||||||
$(Q) $(MAKE) -C $(dir $@) $(notdir $@)
|
$(Q) $(MAKE) -C $(dir $@) $(notdir $@)
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit e66a9c7086fdaa13212457a941161004a9419ce5
|
|
|
@ -59,7 +59,6 @@ endef
|
||||||
$(shell rm -f .check-versions-failure)
|
$(shell rm -f .check-versions-failure)
|
||||||
$(eval $(call CheckSubmoduleTemplate,llvm,LLVM))
|
$(eval $(call CheckSubmoduleTemplate,llvm,LLVM))
|
||||||
$(eval $(call CheckSubmoduleTemplate,mono,MONO))
|
$(eval $(call CheckSubmoduleTemplate,mono,MONO))
|
||||||
$(eval $(call CheckSubmoduleTemplate,watch-mono,WATCH_MONO))
|
|
||||||
$(eval $(call CheckSubmoduleTemplate,fsharp,FSHARP))
|
$(eval $(call CheckSubmoduleTemplate,fsharp,FSHARP))
|
||||||
$(eval $(call CheckSubmoduleTemplate,MonoTouch.Dialog,MONOTOUCH_DIALOG))
|
$(eval $(call CheckSubmoduleTemplate,MonoTouch.Dialog,MONOTOUCH_DIALOG))
|
||||||
$(eval $(call CheckSubmoduleTemplate,Touch.Unit,TOUCH_UNIT))
|
$(eval $(call CheckSubmoduleTemplate,Touch.Unit,TOUCH_UNIT))
|
||||||
|
|
Загрузка…
Ссылка в новой задаче