Merge pull request #2700 from akoeplinger/monotouch-mobile-static
authormonojenkins <jo.shields+jenkins@xamarin.com>
Fri, 4 Mar 2016 17:20:16 +0000 (17:20 +0000)
committermonojenkins <jo.shields+jenkins@xamarin.com>
Fri, 4 Mar 2016 17:20:16 +0000 (17:20 +0000)
Enable building of monotouch/xammac profiles without mono-extensions and expose mobile_static in configure.ac

Relies on https://github.com/xamarin/mono-extensions/pull/17

This enables us to compile the monotouch, xammac and mobile_static profiles on public Jenkins without mono-extensions.

1  2 
mcs/build/rules.make
mcs/class/corlib/corlib.dll.sources

diff --combined mcs/build/rules.make
index 13aab1d018b476745a727d86c93e23a0f5731a74,de11e244e066fd434616fee6b18810331f5a70ec..54c946a8730f775da8f7976bdcec8fba17a3edf3
@@@ -47,7 -47,6 +47,7 @@@ corlib = mscorlib.dl
  
  INTERNAL_RESGEN = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/resgen.exe
  RESGEN = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN)
 +STRING_REPLACER = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/cil-stringreplacer.exe
  
  depsdir = $(topdir)/build/deps
  
@@@ -202,7 -201,7 +202,7 @@@ $(STD_TARGETS): %: do-
  
  ifdef PLATFORM_AOT_SUFFIX
  Q_AOT=$(if $(V),,@echo "AOT     [$(PROFILE)] AOT All Assemblies";)
- LIST_ALL_PROFILE_ASSEMBLIES = find . | grep -E '(dll|exe)$$' | grep -v -E 'bare|plaincore|secxml'
+ LIST_ALL_PROFILE_ASSEMBLIES = find . | grep -E '(dll|exe)$$' | grep -v -E 'bare|plaincore|secxml|Facades'
  COMPILE_ALL_PROFILE_ASSEMBLIES = $(LIST_ALL_PROFILE_ASSEMBLIES) | MONO_PATH="./" xargs -I '{}' $(RUNTIME) $(RUNTIME_FLAGS) $(AOT_BUILD_FLAGS) '{}'
  
  do-all-aot:
index 62e6ee91a498dc1607e09e07ed1961dc281c1dd5,412582e1a3b53f01ea2725da71fc886b14e080e7..3cd521b6442f58a33681cd8f7597721d65a0d1ca
@@@ -104,7 -104,6 +104,6 @@@ System/GC.c
  System/GCCollectionMode.cs
  System/GCNotificationStatus.cs
  System/Guid.cs
- System/Guid.MonoTouch.cs
  System/IConsoleDriver.cs
  System/IntPtr.cs
  System/KnownTerminals.cs
@@@ -163,6 -162,10 +162,6 @@@ System.Diagnostics/StackFrame.c
  System.Diagnostics/StackTrace.cs
  System.Diagnostics.Tracing/EventAttribute.cs
  System.Diagnostics.Tracing/EventCommand.cs
 -../../../external/referencesource/mscorlib/system/diagnostics/eventing/winmeta.cs
 -../../../external/referencesource/mscorlib/system/diagnostics/eventing/eventactivityoptions.cs
 -../../../external/referencesource/mscorlib/system/diagnostics/eventing/TraceLogging/EventSourceOptions.cs
 -../../../external/referencesource/mscorlib/system/diagnostics/eventing/TraceLogging/TraceLoggingEventTraits.cs
  System.Diagnostics.Tracing/EventSource.cs
  System.Diagnostics.Tracing/EventSourceAttribute.cs
  System.Diagnostics.Tracing/EventSourceSettings.cs
@@@ -1134,13 -1137,8 +1133,13 @@@ ReferenceSources/SecurityContext.c
  
  ../../../external/referencesource/mscorlib/system/diagnostics/contracts/contracts.cs
  ../../../external/referencesource/mscorlib/system/diagnostics/contracts/contractsbcl.cs
 +
 +../../../external/referencesource/mscorlib/system/diagnostics/eventing/eventactivityoptions.cs
  ../../../external/referencesource/mscorlib/system/diagnostics/eventing/winmeta.cs
  
 +../../../external/referencesource/mscorlib/system/diagnostics/eventing/TraceLogging/EventSourceOptions.cs
 +../../../external/referencesource/mscorlib/system/diagnostics/eventing/TraceLogging/TraceLoggingEventTraits.cs
 +
  ../../../external/referencesource/mscorlib/system/globalization/bidicategory.cs
  ../../../external/referencesource/mscorlib/system/globalization/calendar.cs
  ../../../external/referencesource/mscorlib/system/globalization/calendaralgorithmtype.cs