Skip to content

Move guiunit to public repo so it can be used for XM unit tests #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chamons merged 2 commits into from
May 4, 2016
Merged

Move guiunit to public repo so it can be used for XM unit tests #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3cabe4
Move guiunit to public repo so it can be used for XM unit tests
spouliot May 4, 2016
9801c4d
Bump maccore (to remove the same guiunit copy)
spouliot May 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@
path = external/Xamarin.MacDev
url = git@github.com:xamarin/Xamarin.MacDev
branch = master
[submodule "external/guiunit"]
path = external/guiunit
url = https://github.com/mono/guiunit.git
1 change: 1 addition & 0 deletions Make.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ NUNITLITE_PATH=$(TOP)/external/mono/external/nunit-lite
OPENTK_PATH=$(TOP)/external/opentk
MODERNHTTPCLIENT_PATH=$(TOP)/external/ModernHttpClient
XAMARIN_MACDEV_PATH=$(TOP)/external/Xamarin.MacDev
GUI_UNIT_PATH=$(TOP)/external/guiunit
MACCORE_PATH=$(TOP)/../maccore

MONO_PREFIX ?= /Library/Frameworks/Mono.framework/Versions/Current
Expand Down
1 change: 1 addition & 0 deletions external/guiunit
Open in desktop
Submodule guiunit added at 4ca863
1 change: 1 addition & 0 deletions mk/versions.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ $(eval $(call CheckSubmoduleTemplate,Touch.Unit,TOUCH_UNIT))
$(eval $(call CheckSubmoduleTemplate,opentk,OPENTK))
$(eval $(call CheckSubmoduleTemplate,ModernHttpClient,MODERNHTTPCLIENT))
$(eval $(call CheckSubmoduleTemplate,Xamarin.MacDev,XAMARIN_MACDEV))
$(eval $(call CheckSubmoduleTemplate,guiunit,GUI_UNIT))

include $(TOP)/mk/xamarin.mk

Expand Down
2 changes: 1 addition & 1 deletion mk/xamarin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ifdef ENABLE_XAMARIN
NEEDED_MACCORE_VERSION := 05277dd2bc19bc6d291fcd0639e571b4d222eaef
NEEDED_MACCORE_VERSION := 07870f393340356a93a80b09b6261bad800ea736
NEEDED_MACCORE_BRANCH := master

MACCORE_DIRECTORY := maccore
Expand Down