From 399886e0d00f8140901b913a07251cde3b96400d Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Thu, 8 Nov 2018 16:31:15 -0500 Subject: [PATCH 1/2] Replace use of `$(MonoSourceDirectory)` by `$(MonoSourceFullPath)` This leaves us with only 1 variable to look for and completely remove. --- src/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj | 58 +++++----- src/Mono.Posix/Mono.Posix.csproj | 106 +++++++++--------- .../Xamarin.Android.Bcl-Tests.csproj | 4 +- 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj b/src/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj index 28768f0078e..9b714af11a9 100644 --- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj +++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj @@ -86,91 +86,91 @@ Android.Runtime\CPUArchitecture.cs - + Assembly\AssemblyInfo.cs - + Mono.Data.Sqlite_2.0\SQLite3.cs - + Mono.Data.Sqlite_2.0\SQLite3_UTF16.cs - + Mono.Data.Sqlite_2.0\SQLiteBase.cs - + Mono.Data.Sqlite_2.0\SQLiteCommandBuilder.cs - + Mono.Data.Sqlite_2.0\SQLiteCommand.cs - + Mono.Data.Sqlite_2.0\SQLiteConnection.cs - + Mono.Data.Sqlite_2.0\LINQ\SQLiteConnection_Linq.cs - + Mono.Data.Sqlite_2.0\SQLiteConnectionPool.cs - + Mono.Data.Sqlite_2.0\SQLiteConnectionStringBuilder.cs - + Mono.Data.Sqlite_2.0\SQLiteConvert.cs - + Mono.Data.Sqlite_2.0\SQLiteDataAdapter.cs - + Mono.Data.Sqlite_2.0\SQLiteDataReader.cs - + Mono.Data.Sqlite_2.0\SqliteDataSourceEnumerator.cs - + Mono.Data.Sqlite_2.0\SQLiteEnlistment.cs - + Mono.Data.Sqlite_2.0\SQLiteException.cs - + Mono.Data.Sqlite_2.0\SQLiteFactory.cs - + Mono.Data.Sqlite_2.0\LINQ\SQLiteFactory_Linq.cs - + Mono.Data.Sqlite_2.0\SQLiteFunctionAttribute.cs - + Mono.Data.Sqlite_2.0\SQLiteFunction.cs - + Mono.Data.Sqlite_2.0\SQLiteKeyReader.cs - + Mono.Data.Sqlite_2.0\SQLiteMetaDataCollectionNames.cs - + Mono.Data.Sqlite_2.0\SQLiteParameterCollection.cs - + Mono.Data.Sqlite_2.0\SQLiteParameter.cs - + Mono.Data.Sqlite_2.0\SQLiteStatement.cs - + Mono.Data.Sqlite_2.0\SQLiteTransaction.cs - + Mono.Data.Sqlite_2.0\SR.Designer.cs - + Mono.Data.Sqlite_2.0\UnsafeNativeMethods.cs - + Locale.cs diff --git a/src/Mono.Posix/Mono.Posix.csproj b/src/Mono.Posix/Mono.Posix.csproj index d9ff5684bcd..b5bdf74bc6b 100644 --- a/src/Mono.Posix/Mono.Posix.csproj +++ b/src/Mono.Posix/Mono.Posix.csproj @@ -70,163 +70,163 @@ Android.Runtime\CPUArchitecture.cs - + Assembly\AssemblyInfo.cs - + Mono.Remoting.Channels.Unix\UnixBinaryClientFormatterSink.cs - + Mono.Remoting.Channels.Unix\UnixBinaryClientFormatterSinkProvider.cs - + Mono.Remoting.Channels.Unix\UnixBinaryCore.cs - + Mono.Remoting.Channels.Unix\UnixBinaryServerFormatterSink.cs - + Mono.Remoting.Channels.Unix\UnixBinaryServerFormatterSinkProvider.cs - + Mono.Remoting.Channels.Unix\UnixChannel.cs - + Mono.Remoting.Channels.Unix\UnixClientChannel.cs - + Mono.Remoting.Channels.Unix\UnixClientTransportSink.cs - + Mono.Remoting.Channels.Unix\UnixClientTransportSinkProvider.cs - + Mono.Remoting.Channels.Unix\UnixConnectionPool.cs - + Mono.Remoting.Channels.Unix\UnixMessageIO.cs - + Mono.Remoting.Channels.Unix\UnixServerChannel.cs - + Mono.Remoting.Channels.Unix\UnixServerTransportSink.cs - + Mono.Unix.Native\CdeclFunction.cs - + Mono.Unix.Native\FileNameMarshaler.cs - + Mono.Unix.Native\MapAttribute.cs - + Mono.Unix.Native\NativeConvert.cs - + Mono.Unix.Android\AndroidUtils.cs - + Mono.Unix.Native\NativeConvert.generated.cs - + Mono.Unix.Native\RealTimeSignum.cs - + Mono.Unix.Native\Stdlib.cs - + Mono.Unix.Native\Syscall.cs - + Mono.Unix.Native\TypeAttributes.cs - + Mono.Unix\AbstractUnixEndPoint.cs - + Mono.Unix\Catalog.cs - + Mono.Unix\FileAccessPattern.cs - + Mono.Unix\FileAccessPermissions.cs - + Mono.Unix\FileHandleOperations.cs - + Mono.Unix\FileSpecialAttributes.cs - + Mono.Unix\FileTypes.cs - + Mono.Unix\PeerCred.cs - + Mono.Unix\StdioFileStream.cs - + Mono.Unix\UnixClient.cs - + Mono.Unix\UnixDirectoryInfo.cs - + Mono.Unix\UnixDriveInfo.cs - + Mono.Unix\UnixEncoding.cs - + Mono.Unix\UnixEndPoint.cs - + Mono.Unix\UnixEnvironment.cs - + Mono.Unix\UnixFileInfo.cs - + Mono.Unix\UnixFileSystemInfo.cs - + Mono.Unix\UnixGroupInfo.cs - + Mono.Unix\UnixIOException.cs - + Mono.Unix\UnixListener.cs - + Mono.Unix\UnixMarshal.cs - + Mono.Unix\UnixPath.cs - + Mono.Unix\UnixPipes.cs - + Mono.Unix\UnixProcess.cs - + Mono.Unix\UnixSignal.cs - + Mono.Unix\UnixStream.cs - + Mono.Unix\UnixSymbolicLinkInfo.cs - + Mono.Unix\UnixUserInfo.cs - + Locale.cs diff --git a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj index 5ba06531cc2..326a167f23e 100644 --- a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj +++ b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj @@ -63,10 +63,10 @@ ..\..\..\packages\xunit.extensibility.execution.2.3.1\lib\netstandard1.1\xunit.execution.dotnet.dll - $(MonoSourceDirectory)\external\xunit-binaries\Xunit.NetCore.Extensions.dll + $(MonoSourceFullPath)\external\xunit-binaries\Xunit.NetCore.Extensions.dll - $(MonoSourceDirectory)\external\xunit-binaries\xunit.execution.desktop.dll + $(MonoSourceFullPath)\external\xunit-binaries\xunit.execution.desktop.dll From caad2c9c860ce4e8b363f511842509729e64ca12 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Thu, 8 Nov 2018 16:32:17 -0500 Subject: [PATCH 2/2] [monodroid] Remove dependency on `$(MonoSourceFullPath)/support/{zlib-helper,nl}.c` These are now compiled in as part of `libmonosgen-2.0.so`, and the BCL more simply InternalCall into the runtime. --- src/monodroid/CMakeLists.txt | 9 --------- src/monodroid/monodroid.csproj | 5 ----- src/monodroid/monodroid.props | 2 +- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/monodroid/CMakeLists.txt b/src/monodroid/CMakeLists.txt index 00903a855f2..8f2db6a4a1a 100644 --- a/src/monodroid/CMakeLists.txt +++ b/src/monodroid/CMakeLists.txt @@ -18,12 +18,6 @@ if(NOT DEFINED SGEN_BRIDGE_VERSION) message(FATAL_ERROR "Please set the SGEN_BRIDGE_VERSION variable on command line (-DSGEN_BRIDGE_VERSION=VERSION)") endif() -if(NOT DEFINED MONO_PATH) - message(FATAL_ERROR "Please set the MONO_PATH variable on command line (-DMONO_PATH=PATH)") -else() - string(REPLACE "\\" "/" MONO_PATH ${MONO_PATH}) -endif() - if(NOT ANDROID) if (NOT DEFINED JDK_INCLUDE) message(FATAL_ERROR "Please set the JDK_INCLUDE variable on command line (-DJDK_INCLUDE)") @@ -223,7 +217,6 @@ if (DEFINED CONFIGURATION) include_directories("../../bin/${CONFIGURATION}/include") include_directories("../../bin/${CONFIGURATION}/include/${ANDROID_ABI}/eglib") endif() -include_directories("${MONO_PATH}/mono/eglib") include_directories("jni/zip") include_directories("${JAVA_INTEROP_SRC_PATH}") @@ -233,7 +226,6 @@ check_include_files("linux/rtnetlink.h" HAVE_LINUX_RTNETLINK_H) set(SOURCES_DIR ${TOP_DIR}/jni) set(MONODROID_SOURCES ${MONODROID_SOURCES} - ${MONO_PATH}/support/zlib-helper.c ${SOURCES_DIR}/android-system.cc ${SOURCES_DIR}/cpu-arch-detect.cc ${SOURCES_DIR}/debug-constants.cc @@ -256,7 +248,6 @@ set(MONODROID_SOURCES if(UNIX) set(MONODROID_SOURCES ${MONODROID_SOURCES} - ${MONO_PATH}/support/nl.c ${SOURCES_DIR}/debug.cc ${SOURCES_DIR}/monodroid-networkinfo.cc ${SOURCES_DIR}/xamarin_getifaddrs.cc diff --git a/src/monodroid/monodroid.csproj b/src/monodroid/monodroid.csproj index 8c7bdf0f2d3..85c068ed2e4 100644 --- a/src/monodroid/monodroid.csproj +++ b/src/monodroid/monodroid.csproj @@ -46,11 +46,6 @@ jnimarshalmethod-gen False - - {C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2} - mono-runtimes - False - {2C1C68CD-CFED-4DEB-A2D3-61D6932F3E8E} linux-mingw-dependencies diff --git a/src/monodroid/monodroid.props b/src/monodroid/monodroid.props index 9f22d6cff4d..4f0a5af4da9 100644 --- a/src/monodroid/monodroid.props +++ b/src/monodroid/monodroid.props @@ -12,7 +12,7 @@ - <_CommonDefines>-DJDK_INCLUDE="@(JdkIncludePath->'%(Identity)', ' ')" -DMONO_PATH=$(MonoSourceFullPath) -DSGEN_BRIDGE_VERSION=$(MonoSgenBridgeVersion) + <_CommonDefines>-DJDK_INCLUDE="@(JdkIncludePath->'%(Identity)', ' ')" -DSGEN_BRIDGE_VERSION=$(MonoSgenBridgeVersion) <_CmakeCommonHostFlags>$(_CmakeCommonFlags) $(_CommonDefines) -DENABLE_NDK=OFF <_CmakeMxeCommonFlags>$(_CmakeCommonFlags) $(_CommonDefines) -DENABLE_NDK=OFF