Skip to content

Commit 0f0f783

Browse files
atsushienojonpryor
atsushieno
authored and
jonpryor
committed
[build] Cleanup; Move redistributables from build-tools to src (#1495)
General guideline for sanity (which we're breaking in a couple places, and should fix): * `build-tools` is for things which will *not* be redistributed, e.g. things which aren't part of the macOS `.pkg` or Windows `.vsix` * `src` and `tools` are for things which *will* be redistributed as part of the SDK. Fix some outliers: `build-tools/mono-runtimes`, `build-tools/libzip`, and `build-tools/libzip-windows` *do* produce artifacts which *are* redistributable and included in the SDK. Move these directories into `src`.
1 parent 7800139 commit 0f0f783

23 files changed

+26
-26
lines changed

‎Xamarin.Android.sln‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "android-toolchain", "build-
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.BootstrapTasks", "src\Xamarin.Android.Tools.BootstrapTasks\Xamarin.Android.Tools.BootstrapTasks.csproj", "{E8492EFB-D14A-4F32-AA28-88848322ECEA}"
99
EndProject
10-
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "mono-runtimes", "build-tools\mono-runtimes\mono-runtimes.csproj", "{C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2}"
10+
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "mono-runtimes", "src\mono-runtimes\mono-runtimes.csproj", "{C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2}"
1111
EndProject
12-
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "libzip", "build-tools\libzip\libzip.csproj", "{900A0F71-BAAD-417A-8D1A-8D330297CDD0}"
12+
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "libzip", "src\libzip\libzip.csproj", "{900A0F71-BAAD-417A-8D1A-8D330297CDD0}"
1313
EndProject
1414
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jnienv-gen", "build-tools\jnienv-gen\jnienv-gen.csproj", "{AFB8F6D1-6EA9-42C3-950B-98F34C669AD2}"
1515
EndProject
@@ -77,7 +77,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libZipSharp", "external\Lib
7777
EndProject
7878
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Drawing.Primitives", "src\System.Drawing.Primitives\System.Drawing.Primitives.csproj", "{C9FF2E4D-D927-479E-838B-647C16763F64}"
7979
EndProject
80-
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "libzip-windows", "build-tools\libzip-windows\libzip-windows.csproj", "{0DE278D6-000F-4001-BB98-187C0AF58A61}"
80+
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "libzip-windows", "src\libzip-windows\libzip-windows.csproj", "{0DE278D6-000F-4001-BB98-187C0AF58A61}"
8181
EndProject
8282
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "bundle", "build-tools\bundle\bundle.csproj", "{1640725C-4DB8-4D8D-BC96-74E688A06EEF}"
8383
EndProject
@@ -325,7 +325,7 @@ Global
325325
GlobalSection(NestedProjects) = preSolution
326326
{8FF78EB6-6FC8-46A7-8A15-EBBA9045C5FA} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
327327
{E8492EFB-D14A-4F32-AA28-88848322ECEA} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
328-
{C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
328+
{C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
329329
{AFB8F6D1-6EA9-42C3-950B-98F34C669AD2} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
330330
{3FC3E78B-F7D4-42EA-BBE8-4535DF42BFF8} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
331331
{94BD81F7-B06F-4295-9636-F8A3B6BDC762} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
@@ -352,10 +352,10 @@ Global
352352
{26781D3A-FF20-4F55-9824-C8A06AA9E484} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
353353
{B8F799C5-D7CE-4E09-9CE6-BAA4173E7EC8} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
354354
{5EB9E888-E357-417E-9F39-DDEC195CE47F} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
355-
{900A0F71-BAAD-417A-8D1A-8D330297CDD0} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
355+
{900A0F71-BAAD-417A-8D1A-8D330297CDD0} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
356356
{E248B2CA-303B-4645-ADDC-9D4459D550FD} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
357357
{C9FF2E4D-D927-479E-838B-647C16763F64} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
358-
{0DE278D6-000F-4001-BB98-187C0AF58A61} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
358+
{0DE278D6-000F-4001-BB98-187C0AF58A61} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
359359
{1640725C-4DB8-4D8D-BC96-74E688A06EEF} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
360360
{7CE69551-BD73-4726-ACAA-AAF89C84BAF8} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
361361
{15945D4B-FF56-4BCC-B598-2718D199DD08} = {864062D3-A415-4A6F-9324-5820237BA058}

‎build-tools/bundle/bundle-path.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
</GitCommitHash>
2424
<!-- Files which contribute to the bundle "version" -->
2525
<ItemGroup>
26-
<VersionFile Include="..\mono-runtimes\mono-runtimes.*" />
27-
<VersionFile Include="..\mono-runtimes\ProfileAssemblies.projitems" />
26+
<VersionFile Include="..\..\src\mono-runtimes\mono-runtimes.*" />
27+
<VersionFile Include="..\..\src\mono-runtimes\ProfileAssemblies.projitems" />
2828
<VersionFile Include="..\scripts\BuildEverything.mk" />
2929
</ItemGroup>
3030
<HashFileContents

‎build-tools/bundle/bundle.targets‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<UsingTask AssemblyFile="$(_SourceTopDir)\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.Zip" />
4-
<Import Project="..\mono-runtimes\mono-runtimes.targets" />
5-
<Import Project="..\libzip\libzip.props" />
6-
<Import Project="..\libzip-windows\libzip-windows.props" />
7-
<Import Project="..\libzip\libzip.projitems" />
8-
<Import Project="..\libzip-windows\libzip-windows.projitems" />
9-
<Import Project="..\libzip\libzip.targets" />
4+
<Import Project="..\..\src\mono-runtimes\mono-runtimes.targets" />
5+
<Import Project="..\..\src\libzip\libzip.props" />
6+
<Import Project="..\..\src\libzip-windows\libzip-windows.props" />
7+
<Import Project="..\..\src\libzip\libzip.projitems" />
8+
<Import Project="..\..\src\libzip-windows\libzip-windows.projitems" />
9+
<Import Project="..\..\src\libzip\libzip.targets" />
1010
<Import Project="bundle-path.targets" />
1111
<Target Name="Clean"
1212
DependsOnTargets="GetBundleFileName">

‎src/Mono.Android/Mono.Android.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@
361361
<Name>jcw-gen</Name>
362362
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
363363
</ProjectReference>
364-
<ProjectReference Include="..\..\build-tools\mono-runtimes\mono-runtimes.csproj">
364+
<ProjectReference Include="..\..\src\mono-runtimes\mono-runtimes.csproj">
365365
<Project>{C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2}</Project>
366366
<Name>mono-runtimes</Name>
367367
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Darwin.projitems‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
</Content>
77
</ItemGroup>
88
<ItemGroup>
9-
<ProjectReference Include="..\..\..\..\build-tools\libzip\libzip.csproj">
9+
<ProjectReference Include="..\..\..\..\src\libzip\libzip.csproj">
1010
<Project>{900A0F71-BAAD-417A-8D1A-8D330297CDD0}</Project>
1111
<Name>libzip</Name>
1212
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
1313
</ProjectReference>
1414
</ItemGroup>
15-
</Project>
15+
</Project>

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Windows.projitems‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<ProjectReference Include="..\..\..\..\build-tools\libzip-windows\libzip-windows.csproj">
4+
<ProjectReference Include="..\..\..\..\src\libzip-windows\libzip-windows.csproj">
55
<Project>{0DE278D6-000F-4001-BB98-187C0AF58A61}</Project>
66
<Name>libzip-windows</Name>
77
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
88
</ProjectReference>
99
</ItemGroup>
10-
</Project>
10+
</Project>

‎src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<UsingTask TaskName="Xamarin.Android.Tools.BootstrapTasks.GenerateProfile" AssemblyFile="..\..\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" />
44
<UsingTask TaskName="Xamarin.Android.Tools.BootstrapTasks.UnzipDirectoryChildren" AssemblyFile="..\..\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" />
55
<UsingTask AssemblyFile="..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" />
6-
<Import Project="..\..\build-tools\mono-runtimes\ProfileAssemblies.projitems" />
6+
<Import Project="..\..\src\mono-runtimes\ProfileAssemblies.projitems" />
77
<Import Project="..\..\build-tools\scripts\XAVersionInfo.targets" />
88
<PropertyGroup>
99
<_SharedRuntimeBuildPath Condition=" '$(_SharedRuntimeBuildPath)' == '' ">$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\</_SharedRuntimeBuildPath>

‎src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@
6161
<Project>{E248B2CA-303B-4645-ADDC-9D4459D550FD}</Project>
6262
<Name>libZipSharp</Name>
6363
</ProjectReference>
64-
<ProjectReference Include="..\..\build-tools\libzip\libzip.csproj" Condition=" '$(HostOS)' != 'Windows' ">
64+
<ProjectReference Include="..\..\src\libzip\libzip.csproj" Condition=" '$(HostOS)' != 'Windows' ">
6565
<Project>{900A0F71-BAAD-417A-8D1A-8D330297CDD0}</Project>
6666
<Name>libzip</Name>
6767
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
6868
</ProjectReference>
69-
<ProjectReference Include="..\..\build-tools\libzip-windows\libzip-windows.csproj" Condition=" '$(HostOS)' == 'Windows' ">
69+
<ProjectReference Include="..\..\src\libzip-windows\libzip-windows.csproj" Condition=" '$(HostOS)' == 'Windows' ">
7070
<Project>{0DE278D6-000F-4001-BB98-187C0AF58A61}</Project>
7171
<Name>libzip-windows</Name>
7272
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
@@ -77,4 +77,4 @@
7777
</ProjectReference>
7878
</ItemGroup>
7979
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
80-
</Project>
80+
</Project>

‎build-tools/libzip-windows/libzip-windows.csproj‎ renamed to ‎src/libzip-windows/libzip-windows.csproj‎

File renamed without changes.

‎build-tools/libzip-windows/libzip-windows.projitems‎ renamed to ‎src/libzip-windows/libzip-windows.projitems‎

File renamed without changes.

0 commit comments

Comments
 (0)