Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
path = external/mono
url = ../../mono/mono.git
branch = 2017-12
[submodule "external/MonoTouch.Dialog"]
path = external/MonoTouch.Dialog
url = ../../migueldeicaza/MonoTouch.Dialog.git
branch = master
[submodule "external/opentk"]
path = external/opentk
url = ../../mono/opentk.git
Expand Down
1 change: 0 additions & 1 deletion Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@ MONO_PATH=$(TOP)/external/mono
WATCH_MONO_PATH=$(TOP)/external/mono
LLVM_PATH=$(TOP)/external/llvm
FSHARP_PATH=$(TOP)/external/fsharp
MONOTOUCH_DIALOG_PATH=$(TOP)/external/MonoTouch.Dialog
TOUCH_UNIT_PATH=$(TOP)/external/Touch.Unit
NUNITLITE_PATH=$(TOP)/external/mono/external/nunit-lite
OPENTK_PATH=$(TOP)/external/opentk
Expand Down
1 change: 0 additions & 1 deletion external/MonoTouch.Dialog
Submodule MonoTouch.Dialog deleted from c2c648
1 change: 0 additions & 1 deletion mk/versions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ $(shell rm -f .check-versions-failure)
$(eval $(call CheckSubmoduleTemplate,llvm,LLVM))
$(eval $(call CheckSubmoduleTemplate,mono,MONO))
$(eval $(call CheckSubmoduleTemplate,fsharp,FSHARP))
$(eval $(call CheckSubmoduleTemplate,MonoTouch.Dialog,MONOTOUCH_DIALOG))
$(eval $(call CheckSubmoduleTemplate,Touch.Unit,TOUCH_UNIT))
$(eval $(call CheckSubmoduleTemplate,opentk,OPENTK))
$(eval $(call CheckSubmoduleTemplate,Xamarin.MacDev,XAMARIN_MACDEV))
Expand Down
3 changes: 0 additions & 3 deletions src/.gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
build
MonoTouch.Dialog-1.csproj
MonoTouch.Dialog-1.tvos.csproj
MonoTouch.Dialog-1.unified.csproj
MonoTouch.NUnitLite.csproj
MonoTouch.NUnitLite.tvos.csproj
MonoTouch.NUnitLite.unified.csproj
Expand Down
30 changes: 7 additions & 23 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ include $(TOP)/src/frameworks.sources
include $(TOP)/mk/rules.mk

include $(TOP)/src/system-drawing.sources
include $(TOP)/src/monotouch-dialog.sources
include $(TOP)/src/touch-unit.sources

export MD_MTOUCH_SDK_ROOT=$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)
Expand Down Expand Up @@ -180,11 +179,8 @@ define IOS_LIBS_template
IOS_VARIANTS_TARGETS += $(addprefix $(IOS_BUILD_DIR)/$(1)/,$(4) $(5))

# MonoTouch.Dialog-1
$(IOS_BUILD_DIR)/$(1)%$(4) $(IOS_BUILD_DIR)/$(1)%$(4:.dll=.pdb): $$(IOS_SOURCES) $(IOS_BUILD_DIR)/$(1)/$(3) $$(MONOTOUCH_DIALOG_SOURCES) $(PRODUCT_KEY_PATH) $(IOS_BUILD_DIR)/reference/Xamarin.iOS.dll
$$(call Q_PROF_CSC,ios/$(1)) $$(IOS_CSC) -nologo -out:$$(basename $$@).dll -target:library -debug:portable -optimize -publicsign \
-keyfile:$(PRODUCT_KEY_PATH) -r:$(IOS_BUILD_DIR)/$(1)/$(3) $(6) -r:$(MONOTOUCH_MONO_PATH)/System.Core.dll -r:$(MONOTOUCH_MONO_PATH)/System.dll -r:$(MONOTOUCH_MONO_PATH)/System.Json.dll \
-nowarn:219,618,114,414,1635,3021,$$(IOS_WARNINGS_THAT_YOU_SHOULD_FIX) \
$$(MONOTOUCH_DIALOG_SOURCES) $$(MONOTOUCH_DIALOG_RESOURCES)
$(IOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.%: $(MACIOS_BINARIES_PATH)/MonoTouch.Dialog-Unified/ios/MonoTouch.Dialog-1.% | $(IOS_BUILD_DIR)/reference
$$(Q) cp $$< $$@

# MonoTouch.NUnitLite
$(IOS_BUILD_DIR)/$(1)%$(5) $(IOS_BUILD_DIR)/$(1)%$(5:.dll=.pdb): $$(IOS_TOUCHUNIT_SOURCES) $(IOS_BUILD_DIR)/$(1)/$(4) $(PRODUCT_KEY_PATH) $(IOS_BUILD_DIR)/reference/Xamarin.iOS.dll
Expand Down Expand Up @@ -303,7 +299,6 @@ IOS_TARGETS_DIRS += \
IOS_TARGETS += \
$(PROJECT_DIR)/xamios.csproj \
$(PROJECT_DIR)/MonoTouch.NUnitLite.csproj \
$(PROJECT_DIR)/MonoTouch.Dialog-1.csproj \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/Version \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/System.Net.Http.dll \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/System.Net.Http.pdb \
Expand Down Expand Up @@ -391,10 +386,7 @@ $(PROJECT_DIR)/xamios.csproj: xamios.tmpl.csproj Makefile $(wildcard $(TOP)/src/
$(PROJECT_DIR)/MonoTouch.NUnitLite.csproj: MonoTouch.NUnitLite.templ.csproj Makefile touch-unit.sources
$(Q) sed -e 's*<!--%FILES%-->*$(foreach file,$(IOS_TOUCHUNIT_SOURCES),<Compile Include="$(file)"/>)*' $< | xmllint --format - > $@

$(PROJECT_DIR)/MonoTouch.Dialog-1.csproj: MonoTouch.Dialog-1.templ.csproj Makefile touch-unit.sources
$(Q) sed -e 's*<!--%FILES%-->*$(foreach file,$(MONOTOUCH_DIALOG_SOURCES),<Compile Include="$(file)"/>)*' $< | xmllint --format - > $@

PROJECT_FILES += $(PROJECT_DIR)/xamios.csproj $(PROJECT_DIR)/MonoTouch.NUnitLite.csproj $(PROJECT_DIR)/MonoTouch.Dialog-1.csproj
PROJECT_FILES += $(PROJECT_DIR)/xamios.csproj $(PROJECT_DIR)/MonoTouch.NUnitLite.csproj

all-ios: $(IOS_TARGETS)
install-ios: $(IOS_TARGETS)
Expand Down Expand Up @@ -1040,13 +1032,9 @@ $(TVOS_BUILD_DIR)/reference/MonoTouch.NUnitLite%dll $(TVOS_BUILD_DIR)/reference/
$(TVOS_BUILD_DIR)/%.pdb: $(TVOS_BUILD_DIR)/%.dll
@touch $@

$(TVOS_BUILD_DIR)/reference/MonoTouch.Dialog-1%dll $(TVOS_BUILD_DIR)/reference/MonoTouch.Dialog-1%pdb: $(TVOS_BUILD_DIR)/reference/Xamarin.TVOS.dll $(TVOS_SOURCES) $(MONOTOUCH_DIALOG_SOURCES) $(PRODUCT_KEY_PATH)
$(call Q_PROF_CSC,tvos) $(SYSTEM_CSC) -nologo -r:$(MONOTOUCH_TV_MONO_PATH)/mscorlib.dll -out:$(basename $@).dll -target:library -debug:portable -optimize -noconfig -nostdlib -publicsign \
-keyfile:$(PRODUCT_KEY_PATH) -r:$< -r:$(MONOTOUCH_TV_MONO_PATH)/System.dll -r:$(MONOTOUCH_TV_MONO_PATH)/System.Core.dll -r:$(MONOTOUCH_TV_MONO_PATH)/System.Json.dll \
-define:XAMCORE_2_0 -define:XAMCORE_3_0 -define:TVOS -define:__TVOS__ -define:__UNIFIED__ \
-nowarn:219,618,114,414,1635,3021,$(IOS_WARNINGS_THAT_YOU_SHOULD_FIX) \
$(MONOTOUCH_DIALOG_SOURCES) $(MONOTOUCH_DIALOG_RESOURCES)
@touch $(basename $@).dll $(basename $@).pdb
# MonoTouch.Dialog-1
$(TVOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.%: $(MACIOS_BINARIES_PATH)/MonoTouch.Dialog-Unified/tvos/MonoTouch.Dialog-1.% | $(TVOS_BUILD_DIR)/reference
$(Q) cp $< $@

# System.Drawing.Primitives.dll is special

Expand Down Expand Up @@ -1096,10 +1084,7 @@ $(PROJECT_DIR)/xamtvos.csproj: xamtvos.tmpl.csproj Makefile $(wildcard $(TOP)/*.
$(PROJECT_DIR)/MonoTouch.NUnitLite.tvos.csproj: MonoTouch.NUnitLite.tvos.templ.csproj Makefile touch-unit.sources
$(Q) sed -e 's*<!--%FILES%-->*$(foreach file,$(TVOS_TOUCHUNIT_SOURCES),<Compile Include="$(file)"/>)*' $< | xmllint --format - > $@

$(PROJECT_DIR)/MonoTouch.Dialog-1.tvos.csproj: MonoTouch.Dialog-1.tvos.templ.csproj Makefile touch-unit.sources
$(Q) sed -e 's*<!--%FILES%-->*$(foreach file,$(MONOTOUCH_DIALOG_SOURCES),<Compile Include="$(file)"/>)*' $< | xmllint --format - > $@

PROJECT_FILES += $(PROJECT_DIR)/xamtvos.csproj $(PROJECT_DIR)/MonoTouch.NUnitLite.tvos.csproj $(PROJECT_DIR)/MonoTouch.Dialog-1.tvos.csproj
PROJECT_FILES += $(PROJECT_DIR)/xamtvos.csproj $(PROJECT_DIR)/MonoTouch.NUnitLite.tvos.csproj

clean-tvos:
$(Q) rm -rf $(TVOS_BUILD_DIR)
Expand All @@ -1119,7 +1104,6 @@ TVOS_TARGETS_DIRS += \
TVOS_TARGETS += \
$(PROJECT_DIR)/xamtvos.csproj \
$(PROJECT_DIR)/MonoTouch.NUnitLite.tvos.csproj \
$(PROJECT_DIR)/MonoTouch.Dialog-1.tvos.csproj \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/Xamarin.TVOS.dll \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/Xamarin.TVOS.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits/Xamarin.TVOS.dll \
Expand Down
48 changes: 0 additions & 48 deletions src/MonoTouch.Dialog-1.templ.csproj

This file was deleted.

48 changes: 0 additions & 48 deletions src/MonoTouch.Dialog-1.tvos.templ.csproj

This file was deleted.

5 changes: 1 addition & 4 deletions src/MonoTouch.NUnitLite.templ.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@
<Reference Include="Xamarin.iOS" />
<Reference Include="System" />
<Reference Include="System.Xml" />
<ProjectReference Include="MonoTouch.Dialog-1.csproj">
<Project>{48585BC2-D604-4CF2-A827-D887BEA51FD6}</Project>
<Name>MonoTouch.Dialog-1</Name>
</ProjectReference>
<Reference Include="MonoTouch.Dialog-1" />
</ItemGroup>
<ItemGroup>
<!--%FILES%-->
Expand Down
5 changes: 1 addition & 4 deletions src/MonoTouch.NUnitLite.tvos.templ.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@
<Reference Include="Xamarin.TVOS" />
<Reference Include="System" />
<Reference Include="System.Xml" />
<ProjectReference Include="MonoTouch.Dialog-1.tvos.csproj">
<Project>{114214A5-A95C-456A-85BA-1B3F23B7AA0C}</Project>
<Name>MonoTouch.Dialog-1</Name>
</ProjectReference>
<Reference Include="MonoTouch.Dialog-1" />
</ItemGroup>
<ItemGroup>
<!--%FILES%-->
Expand Down
19 changes: 0 additions & 19 deletions src/monotouch-dialog.sources

This file was deleted.

26 changes: 0 additions & 26 deletions tests/tests.sln
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "link sdk", "linker\ios\link
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoTouch.NUnitLite", "..\src\MonoTouch.NUnitLite.csproj", "{E1F334C3-8F77-46C9-A28B-A8E9BAEA9FE5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoTouch.Dialog-1", "..\src\MonoTouch.Dialog-1.csproj", "{48585BC2-D604-4CF2-A827-D887BEA51FD6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mtouch", "mtouch\mtouch.csproj", "{9A1177F5-16E6-45DE-AA69-DC9924EC39B8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mscorlib-0", "bcl-test\mscorlib\mscorlib-0.csproj", "{6F47C092-2F85-43D6-1111-E687426F6BF3}"
Expand Down Expand Up @@ -664,30 +662,6 @@ Global
{E1F334C3-8F77-46C9-A28B-A8E9BAEA9FE5}.Release32|iPhone.Build.0 = Release|Any CPU
{E1F334C3-8F77-46C9-A28B-A8E9BAEA9FE5}.Release64|iPhone.ActiveCfg = Release|Any CPU
{E1F334C3-8F77-46C9-A28B-A8E9BAEA9FE5}.Release64|iPhone.Build.0 = Release|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Debug|iPhone.Build.0 = Debug|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Release-bitcode|Any CPU.ActiveCfg = Release-bitcode|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Release-bitcode|Any CPU.Build.0 = Release-bitcode|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Release-bitcode|iPhone.ActiveCfg = Release-bitcode|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Release-bitcode|iPhone.Build.0 = Release-bitcode|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Release|Any CPU.Build.0 = Release|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Release|iPhone.ActiveCfg = Release|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Release|iPhone.Build.0 = Release|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Debug32|iPhone.ActiveCfg = Debug|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Debug32|iPhone.Build.0 = Debug|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Debug64|iPhone.ActiveCfg = Debug|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Debug64|iPhone.Build.0 = Debug|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Release32|iPhone.ActiveCfg = Release|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Release32|iPhone.Build.0 = Release|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Release64|iPhone.ActiveCfg = Release|Any CPU
{48585BC2-D604-4CF2-A827-D887BEA51FD6}.Release64|iPhone.Build.0 = Release|Any CPU
{9A1177F5-16E6-45DE-AA69-DC9924EC39B8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{9A1177F5-16E6-45DE-AA69-DC9924EC39B8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{9A1177F5-16E6-45DE-AA69-DC9924EC39B8}.Release|iPhoneSimulator.ActiveCfg = Debug|Any CPU
Expand Down
8 changes: 0 additions & 8 deletions tests/xharness/SolutionGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,6 @@ public static void CreateSolution (Harness harness, IEnumerable<Target> targets,
if (!File.Exists (proj_path))
proj_path = Path.GetFullPath (Path.Combine (srcDirectory, "MonoTouch.NUnitLite.csproj"));
AddProjectToSolution (harness, sln_path, writer, proj_path, out configuration);
string configuration2 = string.Empty;
if (infix != "watchos") {
proj_path = Path.GetFullPath (Path.Combine (srcDirectory, "MonoTouch.Dialog-1." + infix + ".csproj"));
if (!File.Exists (proj_path))
proj_path = Path.GetFullPath (Path.Combine (srcDirectory, "MonoTouch.Dialog-1.csproj"));
AddProjectToSolution (harness, sln_path, writer, proj_path, out configuration2);
}

writer.WriteLine ("Global");

Expand Down Expand Up @@ -164,7 +157,6 @@ public static void CreateSolution (Harness harness, IEnumerable<Target> targets,

}
writer.Write (configuration);
writer.Write (configuration2);
writer.WriteLine ("\tEndGlobalSection");

if (folders.Length > 0) {
Expand Down
9 changes: 0 additions & 9 deletions tests/xharness/TVOSTarget.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,7 @@ protected override void ProcessProject ()

var srcDirectory = Path.Combine (Harness.RootDirectory, "..", "src");

var mt_dialog_project_path = Path.GetFullPath (Path.Combine (srcDirectory, "MonoTouch.Dialog-1.tvos.csproj"));
string project_guid;
if (!project_guids.TryGetValue (mt_dialog_project_path, out project_guid)) {
XmlDocument mt_dialog_project = new XmlDocument ();
mt_dialog_project.LoadWithoutNetworkAccess (mt_dialog_project_path);
project_guid = mt_dialog_project.GetProjectGuid ();
project_guids [mt_dialog_project_path] = project_guid;
}
inputProject.CreateProjectReferenceValue ("MonoTouch.Dialog-1", mt_dialog_project_path, project_guid, "MonoTouch.Dialog-1");

var mt_nunitlite_project_path = Path.GetFullPath (Path.Combine (srcDirectory, "MonoTouch.NUnitLite.tvos.csproj"));
if (!project_guids.TryGetValue (mt_nunitlite_project_path, out project_guid)) {
XmlDocument mt_nunitlite_project = new XmlDocument ();
Expand Down
1 change: 1 addition & 0 deletions tools/compare-commits.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ rm -Rf "$OUTPUT_DIR"
echo "${BLUE}Preparing temporary output directory...${CLEAR}"
mkdir -p "$OUTPUT_DIR/_ios-build/Library/Frameworks/Xamarin.iOS.framework/Versions/git/lib/mono"
mkdir -p "$OUTPUT_DIR/_mac-build/Library/Frameworks/Xamarin.Mac.framework/Versions/git/lib/mono"
mkdir -p "$OUTPUT_DIR/project-files"

ln -s git "$OUTPUT_DIR/_ios-build/Library/Frameworks/Xamarin.iOS.framework/Versions/Current"
ln -s git "$OUTPUT_DIR/_mac-build/Library/Frameworks/Xamarin.Mac.framework/Versions/Current"
Expand Down