diff --git a/builds/.gitignore b/builds/.gitignore index b3557803f791..f28d20e17587 100644 --- a/builds/.gitignore +++ b/builds/.gitignore @@ -22,4 +22,4 @@ target64 targettv targetwatch watchbcl - +mono-ios-sdk-destdir diff --git a/builds/Makefile b/builds/Makefile index d13a34694eaf..3dbbfedb61a2 100644 --- a/builds/Makefile +++ b/builds/Makefile @@ -46,6 +46,8 @@ IPHONESIMULATOR_PREFIX=$(MONOTOUCH_PREFIX)/SDKs/MonoTouch.iphonesimulator.sdk/us IPHONEOS_SDK=$(MONOTOUCH_PREFIX)/SDKs/MonoTouch.iphoneos.sdk IPHONEOS_PREFIX=$(MONOTOUCH_PREFIX)/SDKs/MonoTouch.iphoneos.sdk/usr +all-local:: .stamp-mono-ios-sdk-destdir + ifdef ENABLE_XAMARIN XAMARIN_AUTOGEN_FLAGS=--enable-extension-module=xamarin XAMARIN_IOS_CONFIGURE_FLAGS=--enable-extension-module=xamarin @@ -142,6 +144,10 @@ endif SDK_BUILDDIR = $(MONO_PATH)/sdks/builds SDK_DESTDIR = $(abspath $(MONO_PATH)/sdks/out) +.stamp-mono-ios-sdk-destdir: + ln -sf $(MONO_IOS_SDK_DESTDIR) mono-ios-sdk-destdir + $(Q) touch $@ + $(MONO_PATH)/sdks/Make.config: echo "DISABLE_ANDROID=1" > $@ diff --git a/mk/xamarin.mk b/mk/xamarin.mk index b715eddd37cf..7b678a0caf3b 100644 --- a/mk/xamarin.mk +++ b/mk/xamarin.mk @@ -1,5 +1,5 @@ ifdef ENABLE_XAMARIN -NEEDED_MACCORE_VERSION := 34725fe136aee39a9f9984bbb508b6670654f7b3 +NEEDED_MACCORE_VERSION := 104656b89060d3c98cdc626709f7cadc467549af NEEDED_MACCORE_BRANCH := master MACCORE_DIRECTORY := maccore diff --git a/src/generator.csproj b/src/generator.csproj index 3753f9a8666e..50e942306f09 100644 --- a/src/generator.csproj +++ b/src/generator.csproj @@ -80,271 +80,271 @@ generator-errors.md - + ikvm\ITypeOwner.cs - + ikvm\SymbolSupport.cs - + ikvm\CryptoConvert.cs - + ikvm\AmbiguousMatchException.cs - + ikvm\Assembly.cs - + ikvm\AssemblyName.cs - + ikvm\BadImageFormatException.cs - + ikvm\Binder.cs - + ikvm\ConstructorInfo.cs - + ikvm\CustomAttributeData.cs - + ikvm\CustomAttributeNamedArgument.cs - + ikvm\CustomAttributeTypedArgument.cs - + ikvm\CustomModifiers.cs - + ikvm\Enums.cs - + ikvm\EventInfo.cs - + ikvm\ExceptionHandlingClause.cs - + ikvm\FieldInfo.cs - + ikvm\FieldSignature.cs - + ikvm\Fusion.cs - + ikvm\GenericWrappers.cs - + ikvm\InterfaceMapping.cs - + ikvm\LocalVariableInfo.cs - + ikvm\ManifestResourceInfo.cs - + ikvm\MarshalSpec.cs - + ikvm\MemberInfo.cs - + ikvm\MethodBase.cs - + ikvm\MethodBody.cs - + ikvm\MethodImplMap.cs - + ikvm\MethodInfo.cs - + ikvm\MethodSignature.cs - + ikvm\Missing.cs - + ikvm\Module.cs - + ikvm\ParameterInfo.cs - + ikvm\ParameterModifier.cs - + ikvm\Projection.cs - + ikvm\PropertyInfo.cs - + ikvm\PropertySignature.cs - + ikvm\Signature.cs - + ikvm\StandAloneMethodSig.cs - + ikvm\StrongNameKeyPair.cs - + ikvm\Type.cs - + ikvm\TypeInfo.cs - + ikvm\TypeNameParser.cs - + ikvm\Universe.cs - + ikvm\Util.cs - + ikvm\coreclr.cs - + ikvm\AssemblyBuilder.cs - + ikvm\ConstructorBuilder.cs - + ikvm\CustomAttributeBuilder.cs - + ikvm\CustomModifiersBuilder.cs - + ikvm\EnumBuilder.cs - + ikvm\Enums.cs - + ikvm\EventBuilder.cs - + ikvm\ExceptionHandler.cs - + ikvm\FieldBuilder.cs - + ikvm\ILGenerator.cs - + ikvm\MethodBuilder.cs - + ikvm\ModuleBuilder.cs - + ikvm\OpCode.cs - + ikvm\OpCodes.cs - + ikvm\ParameterBuilder.cs - + ikvm\PropertyBuilder.cs - + ikvm\SignatureHelper.cs - + ikvm\Tokens.cs - + ikvm\TypeBuilder.cs - + ikvm\CliHeader.cs - + ikvm\MetadataRW.cs - + ikvm\Tables.cs - + ikvm\AssemblyReader.cs - + ikvm\Authenticode.cs - + ikvm\ByteReader.cs - + ikvm\EventInfoImpl.cs - + ikvm\Field.cs - + ikvm\GenericTypeParameter.cs - + ikvm\MetadataReader.cs - + ikvm\Method.cs - + ikvm\ModuleReader.cs - + ikvm\PEReader.cs - + ikvm\PropertyInfoImpl.cs - + ikvm\ResourceModule.cs - + ikvm\TypeDefImpl.cs - + ikvm\ByteBuffer.cs - + ikvm\Heaps.cs - + ikvm\MetadataWriter.cs - + ikvm\ModuleWriter.cs - + ikvm\PEWriter.cs - + ikvm\ResourceSection.cs - + ikvm\TextSection.cs - + ikvm\VersionInfo.cs @@ -359,7 +359,7 @@ - + diff --git a/tools/mmp/mmp.csproj b/tools/mmp/mmp.csproj index b4a5e4fd932f..508b0214efc0 100644 --- a/tools/mmp/mmp.csproj +++ b/tools/mmp/mmp.csproj @@ -46,172 +46,172 @@ - + Mono.Tuner\ApplyPreserveAttributeBase.cs - + Mono.Tuner\CecilRocks.cs - + Mono.Tuner\CustomizeActions.cs - + Mono.Tuner\Dispatcher.cs - + Mono.Tuner\Extensions.cs - + Mono.Tuner\PreserveCrypto.cs - + Mono.Tuner\PreserveSoapHttpClients.cs - + Mono.Tuner\RemoveAttributesBase.cs - + Mono.Tuner\RemoveResources.cs - + Mono.Tuner\RemoveSecurity.cs - + Mono.Tuner\TunerAnnotations.cs - + Linker\Annotations.cs - + Linker\Inflater.cs - + Linker\AssemblyAction.cs - + Linker\AssemblyResolver.cs - + Linker\I18nAssemblies.cs - + Linker\IXApiVisitor.cs - + Linker\ILogger.cs - + Linker\ConsoleLogger.cs - + Linker\LinkContext.cs - + Linker\LoadException.cs - + Linker\MarkException.cs - + Linker\MethodAction.cs - + Linker\Pipeline.cs - + Linker\Linker\MethodReferenceExtensions.cs - + Linker\Linker\MarkingHelpers.cs - + Linker\Linker\Tracer.cs - + Linker\Linker\TypeReferenceExtensions.cs - + Linker\TypePreserve.cs - + Linker\KnownMembers.cs - + Linker\BCL.cs - + Linker\MethodDefinitionExtensions.cs - + Linker\TypeDefinitionExtensions.cs - + Linker\MethodBodyScanner.cs - + Linker\OverrideInformation.cs - + Linker\AssemblyUtilities.cs - + Linker\TypeNameParser.cs - + Linker\XApiReader.cs - + Linker.Steps\BaseStep.cs - + Linker.Steps\BlacklistStep.cs - + Linker.Steps\CleanStep.cs - + Linker.Steps\IStep.cs - + Linker.Steps\LoadI18nAssemblies.cs - + Linker.Steps\LoadReferencesStep.cs - + Linker.Steps\MarkStep.cs - + Linker.Steps\OutputStep.cs - + Linker.Steps\PreserveDependencyLookupStep.cs - + Linker.Steps\RegenerateGuidStep.cs - + Linker.Steps\ResolveFromAssemblyStep.cs - + Linker.Steps\ResolveFromXApiStep.cs - + Linker.Steps\ResolveFromXmlStep.cs - + Linker.Steps\ResolveStep.cs - + Linker.Steps\SweepStep.cs - + Linker.Steps\TypeMapStep.cs - + Mono.Tuner\Profile.cs - + Options.cs diff --git a/tools/mtouch/mtouch.csproj b/tools/mtouch/mtouch.csproj index fce048fb3cee..9b9b5d7accae 100644 --- a/tools/mtouch/mtouch.csproj +++ b/tools/mtouch/mtouch.csproj @@ -43,7 +43,7 @@ - + Options.cs @@ -79,154 +79,154 @@ MonoTouch.Tuner\RemoveCode.cs - + Linker\XApiReader.cs - + Linker\Annotations.cs - + Linker\Inflater.cs - + Linker\LinkContext.cs - + Linker\Pipeline.cs - + Linker\MethodReferenceExtensions.cs - + Linker\Linker\MarkingHelpers.cs - + Linker\Linker\Tracer.cs - + Linker\TypeReferenceExtensions.cs - + Linker\KnownMembers.cs - + Linker\BCL.cs - + Linker\MethodDefinitionExtensions.cs - + Linker\TypeDefinitionExtensions.cs - + Linker\MethodBodyScanner.cs - + Linker\OverrideInformation.cs - + Linker\AssemblyResolver.cs - + Linker\IXApiVisitor.cs - + Linker\ILogger.cs - + Linker\ConsoleLogger.cs - + Linker\I18nAssemblies.cs - + Linker\AssemblyAction.cs - + Linker\TypePreserve.cs - + Linker\LoadException.cs - + Linker\MarkException.cs - + Linker\MethodAction.cs - + Linker.Steps\BaseStep.cs - + Linker.Steps\BlacklistStep.cs - + Linker.Steps\CleanStep.cs - + Linker.Steps\IStep.cs - + Linker.Steps\LoadI18nAssemblies.cs - + Linker.Steps\LoadReferencesStep.cs - + Linker.Steps\MarkStep.cs - + Linker.Steps\OutputStep.cs - + Linker.Steps\PreserveDependencyLookupStep.cs - + Linker.Steps\ResolveFromAssemblyStep.cs - + Linker.Steps\ResolveFromXApiStep.cs - + Linker.Steps\ResolveFromXmlStep.cs - + Linker.Steps\ResolveStep.cs - + Linker.Steps\SweepStep.cs - + Linker.Steps\TypeMapStep.cs - + Mono.Tuner\ApplyPreserveAttributeBase.cs - + Mono.Tuner\RemoveAttributesBase.cs - + Mono.Tuner\PreserveSoapHttpClients.cs - + Mono.Tuner\Profile.cs - + Mono.Tuner\CustomizeActions.cs - + Mono.Tuner\RemoveResources.cs - + Mono.Tuner\RemoveSecurity.cs - + Mono.Tuner\Extensions.cs - + Mono.Tuner\FixModuleFlags.cs - + Mono.Tuner\Dispatcher.cs @@ -235,7 +235,7 @@ MonoTouch.Tuner\ProcessExportedFields.cs - + Mono.Tuner\CecilRocks.cs @@ -404,10 +404,10 @@ external\maccore\BindingImplAttribute.cs - + Linker\AssemblyUtilities.cs - + Linker\TypeNameParser.cs