Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move a couple of soure build scripts from build-tools to src. #1495

Merged
merged 1 commit into from
Mar 30, 2018
Merged

Move a couple of soure build scripts from build-tools to src. #1495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Xamarin.Android.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "android-toolchain", "build-
EndProject
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}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "mono-runtimes", "build-tools\mono-runtimes\mono-runtimes.csproj", "{C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2}"
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "mono-runtimes", "src\mono-runtimes\mono-runtimes.csproj", "{C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "libzip", "build-tools\libzip\libzip.csproj", "{900A0F71-BAAD-417A-8D1A-8D330297CDD0}"
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "libzip", "src\libzip\libzip.csproj", "{900A0F71-BAAD-417A-8D1A-8D330297CDD0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jnienv-gen", "build-tools\jnienv-gen\jnienv-gen.csproj", "{AFB8F6D1-6EA9-42C3-950B-98F34C669AD2}"
EndProject
Expand Down Expand Up @@ -77,7 +77,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libZipSharp", "external\Lib
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Drawing.Primitives", "src\System.Drawing.Primitives\System.Drawing.Primitives.csproj", "{C9FF2E4D-D927-479E-838B-647C16763F64}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "libzip-windows", "build-tools\libzip-windows\libzip-windows.csproj", "{0DE278D6-000F-4001-BB98-187C0AF58A61}"
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "libzip-windows", "src\libzip-windows\libzip-windows.csproj", "{0DE278D6-000F-4001-BB98-187C0AF58A61}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "bundle", "build-tools\bundle\bundle.csproj", "{1640725C-4DB8-4D8D-BC96-74E688A06EEF}"
EndProject
Expand Down Expand Up @@ -325,7 +325,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{8FF78EB6-6FC8-46A7-8A15-EBBA9045C5FA} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
{E8492EFB-D14A-4F32-AA28-88848322ECEA} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
{C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
{C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{AFB8F6D1-6EA9-42C3-950B-98F34C669AD2} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
{3FC3E78B-F7D4-42EA-BBE8-4535DF42BFF8} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
{94BD81F7-B06F-4295-9636-F8A3B6BDC762} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
Expand All @@ -352,10 +352,10 @@ Global
{26781D3A-FF20-4F55-9824-C8A06AA9E484} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{B8F799C5-D7CE-4E09-9CE6-BAA4173E7EC8} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{5EB9E888-E357-417E-9F39-DDEC195CE47F} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{900A0F71-BAAD-417A-8D1A-8D330297CDD0} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
{900A0F71-BAAD-417A-8D1A-8D330297CDD0} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{E248B2CA-303B-4645-ADDC-9D4459D550FD} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{C9FF2E4D-D927-479E-838B-647C16763F64} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{0DE278D6-000F-4001-BB98-187C0AF58A61} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
{0DE278D6-000F-4001-BB98-187C0AF58A61} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{1640725C-4DB8-4D8D-BC96-74E688A06EEF} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
{7CE69551-BD73-4726-ACAA-AAF89C84BAF8} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
{15945D4B-FF56-4BCC-B598-2718D199DD08} = {864062D3-A415-4A6F-9324-5820237BA058}
Expand Down
4 changes: 2 additions & 2 deletions build-tools/bundle/bundle-path.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
</GitCommitHash>
<!-- Files which contribute to the bundle "version" -->
<ItemGroup>
<VersionFile Include="..\mono-runtimes\mono-runtimes.*" />
<VersionFile Include="..\mono-runtimes\ProfileAssemblies.projitems" />
<VersionFile Include="..\..\src\mono-runtimes\mono-runtimes.*" />
<VersionFile Include="..\..\src\mono-runtimes\ProfileAssemblies.projitems" />
<VersionFile Include="..\scripts\BuildEverything.mk" />
</ItemGroup>
<HashFileContents
Expand Down
12 changes: 6 additions & 6 deletions build-tools/bundle/bundle.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<UsingTask AssemblyFile="$(_SourceTopDir)\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.Zip" />
<Import Project="..\mono-runtimes\mono-runtimes.targets" />
<Import Project="..\libzip\libzip.props" />
<Import Project="..\libzip-windows\libzip-windows.props" />
<Import Project="..\libzip\libzip.projitems" />
<Import Project="..\libzip-windows\libzip-windows.projitems" />
<Import Project="..\libzip\libzip.targets" />
<Import Project="..\..\src\mono-runtimes\mono-runtimes.targets" />
<Import Project="..\..\src\libzip\libzip.props" />
<Import Project="..\..\src\libzip-windows\libzip-windows.props" />
<Import Project="..\..\src\libzip\libzip.projitems" />
<Import Project="..\..\src\libzip-windows\libzip-windows.projitems" />
<Import Project="..\..\src\libzip\libzip.targets" />
<Import Project="bundle-path.targets" />
<Target Name="Clean"
DependsOnTargets="GetBundleFileName">
Expand Down
2 changes: 1 addition & 1 deletion src/Mono.Android/Mono.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@
<Name>jcw-gen</Name>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\build-tools\mono-runtimes\mono-runtimes.csproj">
<ProjectReference Include="..\..\src\mono-runtimes\mono-runtimes.csproj">
<Project>{C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2}</Project>
<Name>mono-runtimes</Name>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
Expand Down
4 changes: 2 additions & 2 deletions ...arin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Darwin.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\build-tools\libzip\libzip.csproj">
<ProjectReference Include="..\..\..\..\src\libzip\libzip.csproj">
<Project>{900A0F71-BAAD-417A-8D1A-8D330297CDD0}</Project>
<Name>libzip</Name>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions ...rin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Windows.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ProjectReference Include="..\..\..\..\build-tools\libzip-windows\libzip-windows.csproj">
<ProjectReference Include="..\..\..\..\src\libzip-windows\libzip-windows.csproj">
<Project>{0DE278D6-000F-4001-BB98-187C0AF58A61}</Project>
<Name>libzip-windows</Name>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<UsingTask TaskName="Xamarin.Android.Tools.BootstrapTasks.GenerateProfile" AssemblyFile="..\..\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" />
<UsingTask TaskName="Xamarin.Android.Tools.BootstrapTasks.UnzipDirectoryChildren" AssemblyFile="..\..\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" />
<UsingTask AssemblyFile="..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" />
<Import Project="..\..\build-tools\mono-runtimes\ProfileAssemblies.projitems" />
<Import Project="..\..\src\mono-runtimes\ProfileAssemblies.projitems" />
<Import Project="..\..\build-tools\scripts\XAVersionInfo.targets" />
<PropertyGroup>
<_SharedRuntimeBuildPath Condition=" '$(_SharedRuntimeBuildPath)' == '' ">$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\</_SharedRuntimeBuildPath>
Expand Down
6 changes: 3 additions & 3 deletions src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@
<Project>{E248B2CA-303B-4645-ADDC-9D4459D550FD}</Project>
<Name>libZipSharp</Name>
</ProjectReference>
<ProjectReference Include="..\..\build-tools\libzip\libzip.csproj" Condition=" '$(HostOS)' != 'Windows' ">
<ProjectReference Include="..\..\src\libzip\libzip.csproj" Condition=" '$(HostOS)' != 'Windows' ">
<Project>{900A0F71-BAAD-417A-8D1A-8D330297CDD0}</Project>
<Name>libzip</Name>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\build-tools\libzip-windows\libzip-windows.csproj" Condition=" '$(HostOS)' == 'Windows' ">
<ProjectReference Include="..\..\src\libzip-windows\libzip-windows.csproj" Condition=" '$(HostOS)' == 'Windows' ">
<Project>{0DE278D6-000F-4001-BB98-187C0AF58A61}</Project>
<Name>libzip-windows</Name>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
Expand All @@ -77,4 +77,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
0 ...ools/libzip-windows/libzip-windows.csproj → src/libzip-windows/libzip-windows.csproj
View file
Open in desktop
File renamed without changes.
0 ...s/libzip-windows/libzip-windows.projitems → src/libzip-windows/libzip-windows.projitems
View file
Open in desktop
File renamed without changes.
0 ...tools/libzip-windows/libzip-windows.props → src/libzip-windows/libzip-windows.props
View file
Open in desktop
File renamed without changes.
0 ...ols/libzip-windows/libzip-windows.targets → src/libzip-windows/libzip-windows.targets
View file
Open in desktop
File renamed without changes.
0 build-tools/libzip/libzip.csproj → src/libzip/libzip.csproj
View file
Open in desktop
File renamed without changes.
0 build-tools/libzip/libzip.projitems → src/libzip/libzip.projitems
View file
Open in desktop
File renamed without changes.
0 build-tools/libzip/libzip.props → src/libzip/libzip.props
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion build-tools/libzip/libzip.targets → src/libzip/libzip.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\scripts\RequiredPrograms.targets" />
<Import Project="..\..\build-tools\scripts\RequiredPrograms.targets" />
<PropertyGroup>
<ForceBuildDependsOn>
_SetCMakeListsTxtTimeToLastCommitTimestamp;
Expand Down
0 ...mono-runtimes/ProfileAssemblies.projitems → ...mono-runtimes/ProfileAssemblies.projitems
View file
Open in desktop
File renamed without changes.
0 ...-tools/mono-runtimes/mono-runtimes.csproj → src/mono-runtimes/mono-runtimes.csproj
View file
Open in desktop
File renamed without changes.
0 ...ols/mono-runtimes/mono-runtimes.projitems → src/mono-runtimes/mono-runtimes.projitems
View file
Open in desktop
File renamed without changes.
0 ...d-tools/mono-runtimes/mono-runtimes.props → src/mono-runtimes/mono-runtimes.props
View file
Open in desktop
File renamed without changes.
0 ...tools/mono-runtimes/mono-runtimes.targets → src/mono-runtimes/mono-runtimes.targets
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/monodroid/monodroid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<Name>dependencies</Name>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\build-tools\mono-runtimes\mono-runtimes.csproj">
<ProjectReference Include="..\..\src\mono-runtimes\mono-runtimes.csproj">
<Project>{C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2}</Project>
<Name>mono-runtimes</Name>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
Expand Down
2 changes: 1 addition & 1 deletion tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<UsingTask AssemblyFile="..\..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.SystemUnzip" />
<Import Project="Xamarin.Android.Bcl-Tests.projitems" />
<Import Project="..\..\..\build-tools\scripts\TestApks.targets" />
<Import Project="..\..\..\build-tools\mono-runtimes\ProfileAssemblies.projitems" />
<Import Project="..\..\..\src\mono-runtimes\ProfileAssemblies.projitems" />
<Target Name="_AddTestAssemblies"
DependsOnTargets="_RemapAssemblies"
BeforeTargets="ResolveAssemblyReferences">
Expand Down