This commit is contained in:
Matt Sylvia 2017-07-07 14:51:39 -04:00
Родитель 348df7d196
Коммит 38d3a2bfc5
3 изменённых файлов: 6 добавлений и 6 удалений

2
.gitmodules поставляемый
Просмотреть файл

@ -31,4 +31,4 @@
[submodule "external/Xamarin.MacDev"]
path = external/Xamarin.MacDev
url = ../../xamarin/Xamarin.MacDev
branch = master
branch = d15-4

Просмотреть файл

@ -29,7 +29,7 @@ PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
# on wrench, because wrench technically builds hashes, not branches)
#
#
PACKAGE_HEAD_BRANCH=master
PACKAGE_HEAD_BRANCH=d15-4
ifeq ($(BUILD_REVISION),)
CURRENT_BRANCH:=$(shell git rev-parse --abbrev-ref HEAD)
else
@ -40,7 +40,7 @@ IOS_PRODUCT=Xamarin.iOS
IOS_PACKAGE_NAME=Xamarin.iOS
IOS_PACKAGE_NAME_LOWER=$(shell echo $(IOS_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]")
# NEVER customize IOS_PACKAGE_VERSION itself, other parts (mtouch, web updater) are using the IOS_PACKAGE_VERSION_* variables
IOS_PACKAGE_VERSION=10.13.0.$(IOS_COMMIT_DISTANCE)
IOS_PACKAGE_VERSION=10.14.0.$(IOS_COMMIT_DISTANCE)
IOS_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(IOS_PACKAGE_VERSION)))
IOS_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(IOS_PACKAGE_VERSION)))
IOS_PACKAGE_VERSION_REV=$(word 3, $(subst ., ,$(IOS_PACKAGE_VERSION)))
@ -248,7 +248,7 @@ MAC_PRODUCT=Xamarin.Mac
MAC_PACKAGE_NAME=xamarin.mac
MAC_PACKAGE_NAME_LOWER=$(shell echo $(MAC_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]")
MAC_PACKAGE_VERSION=3.7.0.$(MAC_COMMIT_DISTANCE)
MAC_PACKAGE_VERSION=3.8.0.$(MAC_COMMIT_DISTANCE)
MAC_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(MAC_PACKAGE_VERSION)))
MAC_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(MAC_PACKAGE_VERSION)))
MAC_PACKAGE_VERSION_REV=$(word 3, $(subst ., ,$(MAC_PACKAGE_VERSION)))

Просмотреть файл

@ -1,6 +1,6 @@
ifdef ENABLE_XAMARIN
NEEDED_MACCORE_VERSION := 7cc095bfd20d77e43a4ceed3c0e91ff546b743a9
NEEDED_MACCORE_BRANCH := master
NEEDED_MACCORE_VERSION := de764e0825bc27ad06a6e854d2283d11f427adfd
NEEDED_MACCORE_BRANCH := d15-4
MACCORE_DIRECTORY := maccore
MACCORE_MODULE := git@github.com:xamarin/maccore.git