Skip to content

Commit

Permalink
[mono-api-diff] Moved mono-api-diff into its own tools directory (#9563)
Browse files Browse the repository at this point in the history
* [mono-api-diff] Moved mono-api-diff into its own tools directory

* [mono-api-diff] Making the requested changes
  • Loading branch information
mattleibow authored and marek-safar committed Jul 15, 2018
1 parent f1b677f commit 5f11f0d
Show file tree
Hide file tree
Showing 9 changed files with 123 additions and 3 deletions.
24 changes: 24 additions & 0 deletions bcl.sln
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp", "mcs/tools/csharp/
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mono-api-info", "mcs/tools/corcompare/mono-api-info.csproj", "{804E854F-E8F5-4E2B-807A-4FAF4BE99C03}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mono-api-diff", "mcs/tools/mono-api-diff/mono-api-diff.csproj", "{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mono-api-html", "mcs/tools/mono-api-html/mono-api-html.csproj", "{D25986E2-7A41-4966-A26D-5614BAC7B8A7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "compiler-tester", "mcs/tools/compiler-tester/compiler-tester.csproj", "{988B01B8-F772-4E69-AC95-03A357CF2C3B}"
Expand Down Expand Up @@ -10561,6 +10563,28 @@ Global
{804E854F-E8F5-4E2B-807A-4FAF4BE99C03}.Release|winaot.ActiveCfg = Release|net_4_x
{804E854F-E8F5-4E2B-807A-4FAF4BE99C03}.Debug|xammac.ActiveCfg = Debug|net_4_x
{804E854F-E8F5-4E2B-807A-4FAF4BE99C03}.Release|xammac.ActiveCfg = Release|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Debug|net_4_x.ActiveCfg = Debug|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Debug|net_4_x.Build.0 = Debug|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Release|net_4_x.ActiveCfg = Release|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Release|net_4_x.Build.0 = Release|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Debug|monodroid.ActiveCfg = Debug|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Release|monodroid.ActiveCfg = Release|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Debug|monotouch.ActiveCfg = Debug|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Release|monotouch.ActiveCfg = Release|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Debug|monotouch_tv.ActiveCfg = Debug|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Release|monotouch_tv.ActiveCfg = Release|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Debug|monotouch_watch.ActiveCfg = Debug|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Release|monotouch_watch.ActiveCfg = Release|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Debug|orbis.ActiveCfg = Debug|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Release|orbis.ActiveCfg = Release|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Debug|unreal.ActiveCfg = Debug|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Release|unreal.ActiveCfg = Release|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Debug|wasm.ActiveCfg = Debug|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Release|wasm.ActiveCfg = Release|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Debug|winaot.ActiveCfg = Debug|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Release|winaot.ActiveCfg = Release|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Debug|xammac.ActiveCfg = Debug|net_4_x
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Release|xammac.ActiveCfg = Release|net_4_x
{D25986E2-7A41-4966-A26D-5614BAC7B8A7}.Debug|net_4_x.ActiveCfg = Debug|net_4_x
{D25986E2-7A41-4966-A26D-5614BAC7B8A7}.Debug|net_4_x.Build.0 = Debug|net_4_x
{D25986E2-7A41-4966-A26D-5614BAC7B8A7}.Release|net_4_x.ActiveCfg = Release|net_4_x
Expand Down
2 changes: 1 addition & 1 deletion mcs/build/corcompare.make
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
API_INFO = $(MONO_PATH) $(RUNTIME) $(topdir)/class/lib/$(PROFILE)/mono-api-info.exe
API_DIFF = $(MONO_PATH) $(RUNTIME) $(topdir)/tools/corcompare/mono-api-diff.exe
API_DIFF = $(MONO_PATH) $(RUNTIME) $(topdir)/class/lib/$(PROFILE)/mono-api-diff.exe
TRANSFORM = $(MONO_PATH) $(RUNTIME) $(topdir)/tools/corcompare/transform.exe

OBJECTS = $(topdir)/build/corcompare/$(LIBRARY_NAME:.dll=.html)
Expand Down
2 changes: 1 addition & 1 deletion mcs/class/System.Web.Services/Test/standalone/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ test-wsdl: tools
mcs /r:System.Web.Services.dll /r:System.Data /target:library -out:proxies.dll @proxies.sources
$(MONO) ../../../../tools/corcompare/mono-api-info.exe proxies.dll > proxies.mono.xml
$(MONO) wstest.exe msfix proxies.net.xml
$(MONO) ../../../../tools/corcompare/mono-api-diff.exe proxies.net.xml proxies.mono.xml > proxies.diff.xml
$(MONO) ../../../../tools/mono-api-diff/mono-api-diff.exe proxies.net.xml proxies.mono.xml > proxies.diff.xml
$(MONO) wstest.exe checkdiff proxies.diff.xml

test-clients: tests
Expand Down
3 changes: 2 additions & 1 deletion mcs/tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ net_4_5_dirs := \
xbuild \
csharp \
corcompare \
mono-api-diff \
mono-api-html \
compiler-tester \
mono-xmltool \
Expand Down Expand Up @@ -48,7 +49,7 @@ net_4_5_dirs := \
mono-symbolicate \
linker-analyzer

build_SUBDIRS = resgen gacutil security culevel cil-stringreplacer commoncryptogenerator resx2sr linker cil-strip corcompare mono-api-html
build_SUBDIRS = resgen gacutil security culevel cil-stringreplacer commoncryptogenerator resx2sr linker cil-strip corcompare mono-api-diff mono-api-html
monodroid_tools_SUBDIRS = cil-strip linker-analyzer mkbundle mdoc mono-symbolicate
monodroid_SUBDIRS = nunit-lite
monotouch_SUBDIRS = nunit-lite
Expand Down
26 changes: 26 additions & 0 deletions mcs/tools/corcompare/corcompare.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "..\..\..\exte
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mono-api-html", "mono-api-html\mono-api-html.csproj", "{D25986E2-7A41-4966-A26D-5614BAC7B8A7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mono-api-diff", "mono-api-diff\mono-api-diff.csproj", "{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -95,6 +97,30 @@ Global
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.winphone_Debug|Any CPU.Build.0 = winphone_Debug|Any CPU
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.winphone_Release|Any CPU.ActiveCfg = winphone_Release|Any CPU
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.winphone_Release|Any CPU.Build.0 = winphone_Release|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.net_2_0_Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.net_2_0_Debug|Any CPU.Build.0 = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.net_2_0_Release|Any CPU.ActiveCfg = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.net_2_0_Release|Any CPU.Build.0 = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.net_3_5_Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.net_3_5_Debug|Any CPU.Build.0 = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.net_3_5_Release|Any CPU.ActiveCfg = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.net_3_5_Release|Any CPU.Build.0 = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.net_4_0_Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.net_4_0_Debug|Any CPU.Build.0 = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.net_4_0_Release|Any CPU.ActiveCfg = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.net_4_0_Release|Any CPU.Build.0 = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.Release|Any CPU.Build.0 = Release|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.silverlight_Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.silverlight_Debug|Any CPU.Build.0 = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.silverlight_Release|Any CPU.ActiveCfg = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.silverlight_Release|Any CPU.Build.0 = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.winphone_Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.winphone_Debug|Any CPU.Build.0 = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.winphone_Release|Any CPU.ActiveCfg = Debug|Any CPU
{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}.winphone_Release|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = mono-api-html\mono-api-html.csproj
Expand Down
10 changes: 10 additions & 0 deletions mcs/tools/mono-api-diff/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
thisdir = tools/mono-api-diff
SUBDIRS =
include ../../build/rules.make

LIB_REFS = System.Xml System.Core System
LOCAL_MCS_FLAGS =

PROGRAM = mono-api-diff.exe

include ../../build/executable.make
File renamed without changes.
58 changes: 58 additions & 0 deletions mcs/tools/mono-api-diff/mono-api-diff.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- WARNING: this file is autogenerated, don't modify it. Edit the .sources file of the corresponding assembly instead if you want to add/remove C# source files. -->
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
<ProjectGuid>{0424B3D8-DBDF-405B-A48C-DC27C6B97C90}</ProjectGuid>
<OutputType>Exe</OutputType>
<NoWarn>1699</NoWarn>
<LangVersion>latest</LangVersion>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</HostPlatform>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix'">linux</HostPlatform>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
<NoStdLib>False</NoStdLib>
<NoConfig>True</NoConfig>
<AssemblyName>mono-api-diff</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
<OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
</PropertyGroup>
<!-- @ALL_PROFILE_PROPERTIES@ -->
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<!-- TRACE is set only for Debug configuration, so inherit from platform-specific value -->
<DefineConstants>TRACE;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- @BUILT_SOURCES@ -->
<ItemGroup>
<Compile Include="mono-api-diff.cs" />
</ItemGroup>
<ItemGroup></ItemGroup>
<!-- @ALL_SOURCES@ -->
<!-- @COMMON_PROJECT_REFERENCES@ -->
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
<ProjectReference Include="../../class/System.XML/System.Xml.csproj" />
<ProjectReference Include="../../class/System.Core/System.Core.csproj" />
<ProjectReference Include="../../class/System/System.csproj" />
</ItemGroup>
<!-- @ALL_REFERENCES@ -->
<!-- @ALL_RESOURCES@ -->
</Project>
1 change: 1 addition & 0 deletions mcs/tools/mono-api-diff/mono-api-diff.exe.sources
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mono-api-diff.cs

0 comments on commit 5f11f0d

Please sign in to comment.