From 09b66fa7e61dad8168c30a78634142f45aa48955 Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Fri, 30 Mar 2018 14:36:41 +0900 Subject: [PATCH] Move a couple of soure build scripts from build-tools to src. https://github.com/xamarin/xamarin-android/pull/1489#issuecomment-377226800 complains that the additions of new sources to build-tools is wrong because they are not "build-tools", mentioning that the existing sources are wrong. Wait, then, why not fix it right now. Therefore, fixing this. `mono-runtimes`, `libzip` and `libzip-windows` are moved to src. --- Xamarin.Android.sln | 12 ++++++------ build-tools/bundle/bundle-path.targets | 4 ++-- build-tools/bundle/bundle.targets | 12 ++++++------ src/Mono.Android/Mono.Android.csproj | 2 +- .../Xamarin.ProjectTools.Darwin.projitems | 4 ++-- .../Xamarin.ProjectTools.Windows.projitems | 4 ++-- .../Xamarin.Android.Build.Tasks.targets | 2 +- .../Xamarin.Android.Tools.BootstrapTasks.csproj | 6 +++--- .../libzip-windows/libzip-windows.csproj | 0 .../libzip-windows/libzip-windows.projitems | 0 .../libzip-windows/libzip-windows.props | 0 .../libzip-windows/libzip-windows.targets | 0 {build-tools => src}/libzip/libzip.csproj | 0 {build-tools => src}/libzip/libzip.projitems | 0 {build-tools => src}/libzip/libzip.props | 0 {build-tools => src}/libzip/libzip.targets | 2 +- .../mono-runtimes/ProfileAssemblies.projitems | 0 .../mono-runtimes/mono-runtimes.csproj | 0 .../mono-runtimes/mono-runtimes.projitems | 0 .../mono-runtimes/mono-runtimes.props | 0 .../mono-runtimes/mono-runtimes.targets | 0 src/monodroid/monodroid.csproj | 2 +- .../Xamarin.Android.Bcl-Tests.targets | 2 +- 23 files changed, 26 insertions(+), 26 deletions(-) rename {build-tools => src}/libzip-windows/libzip-windows.csproj (100%) rename {build-tools => src}/libzip-windows/libzip-windows.projitems (100%) rename {build-tools => src}/libzip-windows/libzip-windows.props (100%) rename {build-tools => src}/libzip-windows/libzip-windows.targets (100%) rename {build-tools => src}/libzip/libzip.csproj (100%) rename {build-tools => src}/libzip/libzip.projitems (100%) rename {build-tools => src}/libzip/libzip.props (100%) rename {build-tools => src}/libzip/libzip.targets (97%) rename {build-tools => src}/mono-runtimes/ProfileAssemblies.projitems (100%) rename {build-tools => src}/mono-runtimes/mono-runtimes.csproj (100%) rename {build-tools => src}/mono-runtimes/mono-runtimes.projitems (100%) rename {build-tools => src}/mono-runtimes/mono-runtimes.props (100%) rename {build-tools => src}/mono-runtimes/mono-runtimes.targets (100%) diff --git a/Xamarin.Android.sln b/Xamarin.Android.sln index 42631f0b057..2c11a007e1f 100644 --- a/Xamarin.Android.sln +++ b/Xamarin.Android.sln @@ -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 @@ -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 @@ -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} @@ -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} diff --git a/build-tools/bundle/bundle-path.targets b/build-tools/bundle/bundle-path.targets index 15329019f4a..6d8b703d4af 100644 --- a/build-tools/bundle/bundle-path.targets +++ b/build-tools/bundle/bundle-path.targets @@ -23,8 +23,8 @@ - - + + - - - - - - + + + + + + diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj index 88560b42efd..2e805278a6a 100644 --- a/src/Mono.Android/Mono.Android.csproj +++ b/src/Mono.Android/Mono.Android.csproj @@ -361,7 +361,7 @@ jcw-gen False - + {C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2} mono-runtimes False diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Darwin.projitems b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Darwin.projitems index ee971969743..57a40ae6976 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Darwin.projitems +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Darwin.projitems @@ -6,10 +6,10 @@ - + {900A0F71-BAAD-417A-8D1A-8D330297CDD0} libzip False - \ No newline at end of file + diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Windows.projitems b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Windows.projitems index ebd1cfdbbe7..4b51b206e52 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Windows.projitems +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Windows.projitems @@ -1,10 +1,10 @@  - + {0DE278D6-000F-4001-BB98-187C0AF58A61} libzip-windows False - \ No newline at end of file + diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets index b05b2e5eafc..13b4f8d0a95 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets @@ -3,7 +3,7 @@ - + <_SharedRuntimeBuildPath Condition=" '$(_SharedRuntimeBuildPath)' == '' ">$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\ diff --git a/src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj b/src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj index da94fdcf3f0..b91354046a0 100644 --- a/src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj +++ b/src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj @@ -61,12 +61,12 @@ {E248B2CA-303B-4645-ADDC-9D4459D550FD} libZipSharp - + {900A0F71-BAAD-417A-8D1A-8D330297CDD0} libzip False - + {0DE278D6-000F-4001-BB98-187C0AF58A61} libzip-windows False @@ -77,4 +77,4 @@ - \ No newline at end of file + diff --git a/build-tools/libzip-windows/libzip-windows.csproj b/src/libzip-windows/libzip-windows.csproj similarity index 100% rename from build-tools/libzip-windows/libzip-windows.csproj rename to src/libzip-windows/libzip-windows.csproj diff --git a/build-tools/libzip-windows/libzip-windows.projitems b/src/libzip-windows/libzip-windows.projitems similarity index 100% rename from build-tools/libzip-windows/libzip-windows.projitems rename to src/libzip-windows/libzip-windows.projitems diff --git a/build-tools/libzip-windows/libzip-windows.props b/src/libzip-windows/libzip-windows.props similarity index 100% rename from build-tools/libzip-windows/libzip-windows.props rename to src/libzip-windows/libzip-windows.props diff --git a/build-tools/libzip-windows/libzip-windows.targets b/src/libzip-windows/libzip-windows.targets similarity index 100% rename from build-tools/libzip-windows/libzip-windows.targets rename to src/libzip-windows/libzip-windows.targets diff --git a/build-tools/libzip/libzip.csproj b/src/libzip/libzip.csproj similarity index 100% rename from build-tools/libzip/libzip.csproj rename to src/libzip/libzip.csproj diff --git a/build-tools/libzip/libzip.projitems b/src/libzip/libzip.projitems similarity index 100% rename from build-tools/libzip/libzip.projitems rename to src/libzip/libzip.projitems diff --git a/build-tools/libzip/libzip.props b/src/libzip/libzip.props similarity index 100% rename from build-tools/libzip/libzip.props rename to src/libzip/libzip.props diff --git a/build-tools/libzip/libzip.targets b/src/libzip/libzip.targets similarity index 97% rename from build-tools/libzip/libzip.targets rename to src/libzip/libzip.targets index 10660ec8083..39fdfdd726e 100644 --- a/build-tools/libzip/libzip.targets +++ b/src/libzip/libzip.targets @@ -1,6 +1,6 @@ - + _SetCMakeListsTxtTimeToLastCommitTimestamp; diff --git a/build-tools/mono-runtimes/ProfileAssemblies.projitems b/src/mono-runtimes/ProfileAssemblies.projitems similarity index 100% rename from build-tools/mono-runtimes/ProfileAssemblies.projitems rename to src/mono-runtimes/ProfileAssemblies.projitems diff --git a/build-tools/mono-runtimes/mono-runtimes.csproj b/src/mono-runtimes/mono-runtimes.csproj similarity index 100% rename from build-tools/mono-runtimes/mono-runtimes.csproj rename to src/mono-runtimes/mono-runtimes.csproj diff --git a/build-tools/mono-runtimes/mono-runtimes.projitems b/src/mono-runtimes/mono-runtimes.projitems similarity index 100% rename from build-tools/mono-runtimes/mono-runtimes.projitems rename to src/mono-runtimes/mono-runtimes.projitems diff --git a/build-tools/mono-runtimes/mono-runtimes.props b/src/mono-runtimes/mono-runtimes.props similarity index 100% rename from build-tools/mono-runtimes/mono-runtimes.props rename to src/mono-runtimes/mono-runtimes.props diff --git a/build-tools/mono-runtimes/mono-runtimes.targets b/src/mono-runtimes/mono-runtimes.targets similarity index 100% rename from build-tools/mono-runtimes/mono-runtimes.targets rename to src/mono-runtimes/mono-runtimes.targets diff --git a/src/monodroid/monodroid.csproj b/src/monodroid/monodroid.csproj index 607320a6e4e..1c179eb2fd5 100644 --- a/src/monodroid/monodroid.csproj +++ b/src/monodroid/monodroid.csproj @@ -32,7 +32,7 @@ dependencies False - + {C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2} mono-runtimes False diff --git a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets index 1b2115baaaf..1846b10dfbe 100644 --- a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets +++ b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets @@ -4,7 +4,7 @@ - +