Bump Xamarin.iOS to 14.0. (#9646)
* Bump Xamarin.iOS to 14.0. * Don't verify that the commit distances for Xamarin.iOS and Xamarin.Mac match unless we're building both of them.
This commit is contained in:
Родитель
c8e056166b
Коммит
7ec3751a10
|
@ -43,5 +43,5 @@
|
||||||
# line changed in git).
|
# line changed in git).
|
||||||
#
|
#
|
||||||
|
|
||||||
IOS_PACKAGE_VERSION=13.99.0.$(IOS_COMMIT_DISTANCE)
|
IOS_PACKAGE_VERSION=14.0.0.$(IOS_COMMIT_DISTANCE)
|
||||||
MAC_PACKAGE_VERSION=6.99.0.$(MAC_COMMIT_DISTANCE)
|
MAC_PACKAGE_VERSION=6.99.0.$(MAC_COMMIT_DISTANCE)
|
||||||
|
|
12
Makefile
12
Makefile
|
@ -18,6 +18,8 @@ world: check-system
|
||||||
|
|
||||||
.PHONY: check-system
|
.PHONY: check-system
|
||||||
check-system:
|
check-system:
|
||||||
|
ifdef INCLUDE_MAC
|
||||||
|
ifdef INCLUDE_IOS
|
||||||
@if [[ "x$(IOS_COMMIT_DISTANCE)" != "x$(MAC_COMMIT_DISTANCE)" ]]; then \
|
@if [[ "x$(IOS_COMMIT_DISTANCE)" != "x$(MAC_COMMIT_DISTANCE)" ]]; then \
|
||||||
echo "$(COLOR_RED)*** The commit distance for Xamarin.iOS ($(IOS_COMMIT_DISTANCE)) and Xamarin.Mac ($(MAC_COMMIT_DISTANCE)) are different.$(COLOR_CLEAR)"; \
|
echo "$(COLOR_RED)*** The commit distance for Xamarin.iOS ($(IOS_COMMIT_DISTANCE)) and Xamarin.Mac ($(MAC_COMMIT_DISTANCE)) are different.$(COLOR_CLEAR)"; \
|
||||||
echo "$(COLOR_RED)*** To fix this problem, bump the revision (the third number) for both $(COLOR_GRAY)IOS_PACKAGE_NUMBER$(COLOR_RED) and $(COLOR_GRAY)MAC_PACKAGE_NUMBER$(COLOR_RED) in Make.versions.$(COLOR_CLEAR)"; \
|
echo "$(COLOR_RED)*** To fix this problem, bump the revision (the third number) for both $(COLOR_GRAY)IOS_PACKAGE_NUMBER$(COLOR_RED) and $(COLOR_GRAY)MAC_PACKAGE_NUMBER$(COLOR_RED) in Make.versions.$(COLOR_CLEAR)"; \
|
||||||
|
@ -29,8 +31,18 @@ check-system:
|
||||||
echo "$(COLOR_RED)*** Once fixed, you need to commit the changes for them to pass this check.$(COLOR_CLEAR)"; \
|
echo "$(COLOR_RED)*** Once fixed, you need to commit the changes for them to pass this check.$(COLOR_CLEAR)"; \
|
||||||
exit 1; \
|
exit 1; \
|
||||||
fi
|
fi
|
||||||
|
endif
|
||||||
|
endif
|
||||||
@./system-dependencies.sh
|
@./system-dependencies.sh
|
||||||
|
ifdef INCLUDE_MAC
|
||||||
|
ifdef INCLUDE_IOS
|
||||||
@echo "Building Xamarin.iOS $(IOS_PACKAGE_VERSION) and Xamarin.Mac $(MAC_PACKAGE_VERSION)"
|
@echo "Building Xamarin.iOS $(IOS_PACKAGE_VERSION) and Xamarin.Mac $(MAC_PACKAGE_VERSION)"
|
||||||
|
else
|
||||||
|
@echo "Building Xamarin.Mac $(MAC_PACKAGE_VERSION)"
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
@echo "Building Xamarin.iOS $(IOS_PACKAGE_VERSION)"
|
||||||
|
endif
|
||||||
|
|
||||||
check-permissions:
|
check-permissions:
|
||||||
ifdef INCLUDE_MAC
|
ifdef INCLUDE_MAC
|
||||||
|
|
Загрузка…
Ссылка в новой задаче