[arch-commits] Commit in mono-msbuild/repos/community-x86_64 (10 files)

Maxime Gauduin alucryd at archlinux.org
Fri Jul 3 17:45:36 UTC 2020


    Date: Friday, July 3, 2020 @ 17:45:35
  Author: alucryd
Revision: 657656

archrelease: copy trunk to community-x86_64

Added:
  mono-msbuild/repos/community-x86_64/PKGBUILD
    (from rev 657655, mono-msbuild/trunk/PKGBUILD)
  mono-msbuild/repos/community-x86_64/mono-msbuild-dotnetbits-case.patch
    (from rev 657655, mono-msbuild/trunk/mono-msbuild-dotnetbits-case.patch)
  mono-msbuild/repos/community-x86_64/mono-msbuild-license-case.patch
    (from rev 657655, mono-msbuild/trunk/mono-msbuild-license-case.patch)
  mono-msbuild/repos/community-x86_64/mono-msbuild-no-hostfxr.patch
    (from rev 657655, mono-msbuild/trunk/mono-msbuild-no-hostfxr.patch)
  mono-msbuild/repos/community-x86_64/mono-msbuild-use-bash.patch
    (from rev 657655, mono-msbuild/trunk/mono-msbuild-use-bash.patch)
Deleted:
  mono-msbuild/repos/community-x86_64/PKGBUILD
  mono-msbuild/repos/community-x86_64/mono-msbuild-dotnetbits-case.patch
  mono-msbuild/repos/community-x86_64/mono-msbuild-license-case.patch
  mono-msbuild/repos/community-x86_64/mono-msbuild-no-hostfxr.patch
  mono-msbuild/repos/community-x86_64/mono-msbuild-use-bash.patch

------------------------------------+
 PKGBUILD                           |  169 +++++++++++++++++------------------
 mono-msbuild-dotnetbits-case.patch |   46 ++++-----
 mono-msbuild-license-case.patch    |  116 ++++++++++++------------
 mono-msbuild-no-hostfxr.patch      |   22 ++--
 mono-msbuild-use-bash.patch        |   84 ++++++++---------
 5 files changed, 218 insertions(+), 219 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-03 17:45:26 UTC (rev 657655)
+++ PKGBUILD	2020-07-03 17:45:35 UTC (rev 657656)
@@ -1,85 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Florian Maunier <fmauneko at dissidence.ovh>
-# Contributor: jtmb <packaging at technologicalwizardry dot com>
-
-pkgbase=mono-msbuild
-pkgname=(
-  mono-msbuild
-  mono-msbuild-sdkresolver
-)
-pkgver=16.5.xamarinxplat.2020.02.20.11.54
-pkgrel=1
-pkgdesc='Xamarin implementation of the Microsoft build system'
-arch=(x86_64)
-url=https://github.com/mono/linux-packaging-msbuild
-license=(MIT)
-depends=(mono)
-makedepends=(
-  bash
-  git
-  dotnet-sdk
-  unzip
-)
-source=(
-  mono-msbuild::git+https://github.com/mono/linux-packaging-msbuild#tag=1eb8e8d57d312e1a875855c54b31672112eab5d9
-  mono-msbuild-dotnetbits-case.patch
-  mono-msbuild-license-case.patch
-  mono-msbuild-no-hostfxr.patch
-  mono-msbuild-use-bash.patch
-)
-sha256sums=(
-  SKIP
-  f2784ac003dc84c40e8a9532ff954e6d6c29778b3e80cad7f1f91d86a9b43811
-  3a12a9c33ad5938e8af24d2985241053602f4efc94a4818a00a17da32ce4aba5
-  041f536fbe5a36ba5bf7164460f07bd2becf4ecf2935594bf92676198b7becc2
-  a13ecb4125c673372d87a3b7d957fc8716a3c3e74cd08e9e354b5dcf170ed453
-)
-
-pkgver() {
-  cd mono-msbuild
-
-  git describe --tags | sed 's/.*\///; s/+/./'
-}
-
-prepare() {
-  cd mono-msbuild
-
-  patch -Np1 -i ../mono-msbuild-dotnetbits-case.patch
-  patch -Np1 -i ../mono-msbuild-license-case.patch
-  patch -Np1 -i ../mono-msbuild-no-hostfxr.patch
-  patch -Np1 -i ../mono-msbuild-use-bash.patch
-}
-
-build() {
-  cd mono-msbuild
-
-  export DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR=/opt/dotnet
-  ./eng/cibuild_bootstrapped_msbuild.sh --host_type mono --configuration Release --skip_tests /p:DisableNerdbankVersioning=true
-  ./stage1/mono-msbuild/msbuild mono/build/install.proj /p:MonoInstallPrefix="${srcdir}"/target/usr /p:Configuration=Release-MONO /p:IgnoreDiffFailure=true
-  sed "s@${srcdir}/target@@g" -i "${srcdir}"/target/usr/bin/msbuild
-  find "${srcdir}"/target/usr/lib/mono/ -name Microsoft.DiaSymReader.Native.*dll -delete
-  find "${srcdir}"/target/usr/lib/mono/ -name *.dylib -delete
-  find "${srcdir}"/target/usr/lib/mono/ -name *.so -delete
-}
-
-package_mono-msbuild() {
-  conflicts=(msbuild)
-  provides=(msbuild)
-
-  cp -dr --no-preserve=ownership target/usr "${pkgdir}"/
-  rm -rf "${pkgdir}"/usr/lib/mono/msbuild/Current/bin/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver
-}
-
-package_mono-msbuild-sdkresolver() {
-  depends=(
-    mono-msbuild
-    dotnet-host
-  )
-  conflicts=(msbuild-sdkresolver)
-  provides=(msbuild-sdkresolver)
-
-  install -dm 755 "${pkgdir}"/usr/lib/mono/msbuild/Current/bin/SdkResolvers
-  cp -dr --no-preserve=ownership target/usr/lib/mono/msbuild/Current/bin/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver "${pkgdir}"/usr/lib/mono/msbuild/Current/bin/SdkResolvers/
-}
-
-# vim: ts=2 sw=2 et:

Copied: mono-msbuild/repos/community-x86_64/PKGBUILD (from rev 657655, mono-msbuild/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-03 17:45:35 UTC (rev 657656)
@@ -0,0 +1,84 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Florian Maunier <fmauneko at dissidence.ovh>
+# Contributor: jtmb <packaging at technologicalwizardry dot com>
+
+pkgbase=mono-msbuild
+pkgname=(
+  mono-msbuild
+  mono-msbuild-sdkresolver
+)
+pkgver=16.6.xamarinxplat.2020.04.29.14.43
+pkgrel=1
+pkgdesc='Xamarin implementation of the Microsoft build system'
+arch=(x86_64)
+url=https://github.com/mono/linux-packaging-msbuild
+license=(MIT)
+depends=(mono)
+makedepends=(
+  bash
+  git
+  dotnet-sdk
+  unzip
+)
+_tag=6f16e6a30c3a6eaca819d291f2f458bc1503a9f0
+source=(
+  mono-msbuild::git+https://github.com/mono/linux-packaging-msbuild#tag=${_tag}
+  mono-msbuild-dotnetbits-case.patch
+  mono-msbuild-license-case.patch
+  mono-msbuild-no-hostfxr.patch
+  mono-msbuild-use-bash.patch
+)
+sha256sums=('SKIP'
+            'f2784ac003dc84c40e8a9532ff954e6d6c29778b3e80cad7f1f91d86a9b43811'
+            '3a12a9c33ad5938e8af24d2985241053602f4efc94a4818a00a17da32ce4aba5'
+            'ed93af9d333f9942437e7c7974628c662b304c088eda70589a4118290c25d032'
+            'a13ecb4125c673372d87a3b7d957fc8716a3c3e74cd08e9e354b5dcf170ed453')
+
+pkgver() {
+  cd mono-msbuild
+
+  git describe --tags | sed 's/.*\///; s/+/./'
+}
+
+prepare() {
+  cd mono-msbuild
+
+  patch -Np1 -i ../mono-msbuild-dotnetbits-case.patch
+  patch -Np1 -i ../mono-msbuild-license-case.patch
+  patch -Np1 -i ../mono-msbuild-no-hostfxr.patch
+  patch -Np1 -i ../mono-msbuild-use-bash.patch
+}
+
+build() {
+  cd mono-msbuild
+
+  export DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR=/opt/dotnet
+  ./eng/cibuild_bootstrapped_msbuild.sh --host_type mono --configuration Release --skip_tests /p:DisableNerdbankVersioning=true
+  ./stage1/mono-msbuild/msbuild mono/build/install.proj /p:MonoInstallPrefix="${srcdir}"/target/usr /p:Configuration=Release-MONO /p:IgnoreDiffFailure=true
+  sed "s@${srcdir}/target@@g" -i "${srcdir}"/target/usr/bin/msbuild
+  find "${srcdir}"/target/usr/lib/mono/ -name Microsoft.DiaSymReader.Native.*dll -delete
+  find "${srcdir}"/target/usr/lib/mono/ -name *.dylib -delete
+  find "${srcdir}"/target/usr/lib/mono/ -name *.so -delete
+}
+
+package_mono-msbuild() {
+  conflicts=(msbuild)
+  provides=(msbuild)
+
+  cp -dr --no-preserve=ownership target/usr "${pkgdir}"/
+  rm -rf "${pkgdir}"/usr/lib/mono/msbuild/Current/bin/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver
+}
+
+package_mono-msbuild-sdkresolver() {
+  depends=(
+    mono-msbuild
+    dotnet-host
+  )
+  conflicts=(msbuild-sdkresolver)
+  provides=(msbuild-sdkresolver)
+
+  install -dm 755 "${pkgdir}"/usr/lib/mono/msbuild/Current/bin/SdkResolvers
+  cp -dr --no-preserve=ownership target/usr/lib/mono/msbuild/Current/bin/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver "${pkgdir}"/usr/lib/mono/msbuild/Current/bin/SdkResolvers/
+}
+
+# vim: ts=2 sw=2 et:

Deleted: mono-msbuild-dotnetbits-case.patch
===================================================================
--- mono-msbuild-dotnetbits-case.patch	2020-07-03 17:45:26 UTC (rev 657655)
+++ mono-msbuild-dotnetbits-case.patch	2020-07-03 17:45:35 UTC (rev 657656)
@@ -1,23 +0,0 @@
-Index: xamarin-pkg-msbuild/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
-===================================================================
---- xamarin-pkg-msbuild.orig/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
-+++ xamarin-pkg-msbuild/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
-@@ -1,6 +1,6 @@
- <Project DefaultTargets="DeploySdksAndNuGets">
-     <Import Project="$(MSBuildThisFileDirectory)\..\common.props" />
--    <Import Project="$(MSBuildThisFileDirectory)\..\DotnetBitsVersions.props" />
-+    <Import Project="$(MSBuildThisFileDirectory)\..\DotNetBitsVersions.props" />
- 
-     <PropertyGroup>
-         <HostOSName Condition="'$(HostOSName)' == ''">osx</HostOSName>
-Index: xamarin-pkg-msbuild/mono/build/update_bundled_bits.proj
-===================================================================
---- xamarin-pkg-msbuild.orig/mono/build/update_bundled_bits.proj
-+++ xamarin-pkg-msbuild/mono/build/update_bundled_bits.proj
-@@ -1,5 +1,5 @@
- <Project DefaultTargets="FetchAndUpdateSdksAndNuGets">
--    <Import Project="$(MSBuildThisFileDirectory)\DotnetBitsVersions.props" />
-+    <Import Project="$(MSBuildThisFileDirectory)\DotNetBitsVersions.props" />
- 
-     <Target Name="Build" DependsOnTargets="FetchAndUpdateSdksAndNuGets" />
- 

Copied: mono-msbuild/repos/community-x86_64/mono-msbuild-dotnetbits-case.patch (from rev 657655, mono-msbuild/trunk/mono-msbuild-dotnetbits-case.patch)
===================================================================
--- mono-msbuild-dotnetbits-case.patch	                        (rev 0)
+++ mono-msbuild-dotnetbits-case.patch	2020-07-03 17:45:35 UTC (rev 657656)
@@ -0,0 +1,23 @@
+Index: xamarin-pkg-msbuild/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
+===================================================================
+--- xamarin-pkg-msbuild.orig/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
++++ xamarin-pkg-msbuild/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
+@@ -1,6 +1,6 @@
+ <Project DefaultTargets="DeploySdksAndNuGets">
+     <Import Project="$(MSBuildThisFileDirectory)\..\common.props" />
+-    <Import Project="$(MSBuildThisFileDirectory)\..\DotnetBitsVersions.props" />
++    <Import Project="$(MSBuildThisFileDirectory)\..\DotNetBitsVersions.props" />
+ 
+     <PropertyGroup>
+         <HostOSName Condition="'$(HostOSName)' == ''">osx</HostOSName>
+Index: xamarin-pkg-msbuild/mono/build/update_bundled_bits.proj
+===================================================================
+--- xamarin-pkg-msbuild.orig/mono/build/update_bundled_bits.proj
++++ xamarin-pkg-msbuild/mono/build/update_bundled_bits.proj
+@@ -1,5 +1,5 @@
+ <Project DefaultTargets="FetchAndUpdateSdksAndNuGets">
+-    <Import Project="$(MSBuildThisFileDirectory)\DotnetBitsVersions.props" />
++    <Import Project="$(MSBuildThisFileDirectory)\DotNetBitsVersions.props" />
+ 
+     <Target Name="Build" DependsOnTargets="FetchAndUpdateSdksAndNuGets" />
+ 

Deleted: mono-msbuild-license-case.patch
===================================================================
--- mono-msbuild-license-case.patch	2020-07-03 17:45:26 UTC (rev 657655)
+++ mono-msbuild-license-case.patch	2020-07-03 17:45:35 UTC (rev 657656)
@@ -1,58 +0,0 @@
-Index: xamarin-pkg-msbuild/LICENSE
-===================================================================
---- xamarin-pkg-msbuild.orig/LICENSE
-+++ /dev/null
-@@ -1,24 +0,0 @@
--The MIT License (MIT)
--
--Copyright (c) .NET Foundation and contributors
--
--All rights reserved.
--
--Permission is hereby granted, free of charge, to any person obtaining a copy
--of this software and associated documentation files (the "Software"), to deal
--in the Software without restriction, including without limitation the rights
--to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--copies of the Software, and to permit persons to whom the Software is
--furnished to do so, subject to the following conditions:
--
--The above copyright notice and this permission notice shall be included in all
--copies or substantial portions of the Software.
--
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--SOFTWARE.
--
-Index: xamarin-pkg-msbuild/license
-===================================================================
---- /dev/null
-+++ xamarin-pkg-msbuild/license
-@@ -0,0 +1,24 @@
-+The MIT License (MIT)
-+
-+Copyright (c) .NET Foundation and contributors
-+
-+All rights reserved.
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
-+

Copied: mono-msbuild/repos/community-x86_64/mono-msbuild-license-case.patch (from rev 657655, mono-msbuild/trunk/mono-msbuild-license-case.patch)
===================================================================
--- mono-msbuild-license-case.patch	                        (rev 0)
+++ mono-msbuild-license-case.patch	2020-07-03 17:45:35 UTC (rev 657656)
@@ -0,0 +1,58 @@
+Index: xamarin-pkg-msbuild/LICENSE
+===================================================================
+--- xamarin-pkg-msbuild.orig/LICENSE
++++ /dev/null
+@@ -1,24 +0,0 @@
+-The MIT License (MIT)
+-
+-Copyright (c) .NET Foundation and contributors
+-
+-All rights reserved.
+-
+-Permission is hereby granted, free of charge, to any person obtaining a copy
+-of this software and associated documentation files (the "Software"), to deal
+-in the Software without restriction, including without limitation the rights
+-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-copies of the Software, and to permit persons to whom the Software is
+-furnished to do so, subject to the following conditions:
+-
+-The above copyright notice and this permission notice shall be included in all
+-copies or substantial portions of the Software.
+-
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+-SOFTWARE.
+-
+Index: xamarin-pkg-msbuild/license
+===================================================================
+--- /dev/null
++++ xamarin-pkg-msbuild/license
+@@ -0,0 +1,24 @@
++The MIT License (MIT)
++
++Copyright (c) .NET Foundation and contributors
++
++All rights reserved.
++
++Permission is hereby granted, free of charge, to any person obtaining a copy
++of this software and associated documentation files (the "Software"), to deal
++in the Software without restriction, including without limitation the rights
++to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++copies of the Software, and to permit persons to whom the Software is
++furnished to do so, subject to the following conditions:
++
++The above copyright notice and this permission notice shall be included in all
++copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++SOFTWARE.
++

Deleted: mono-msbuild-no-hostfxr.patch
===================================================================
--- mono-msbuild-no-hostfxr.patch	2020-07-03 17:45:26 UTC (rev 657655)
+++ mono-msbuild-no-hostfxr.patch	2020-07-03 17:45:35 UTC (rev 657656)
@@ -1,11 +0,0 @@
-Index: xamarin-pkg-msbuild/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
-===================================================================
---- xamarin-pkg-msbuild.orig/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
-+++ xamarin-pkg-msbuild/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
-@@ -63,6 +63,5 @@
-             Targets="Restore;Build"
-             Properties="OutputDirectory=$(DotNetOverlayDirectory)\nuget-support\msbuild-bin"/>
-         
--        <Exec Command="$(MSBuildThisFileDirectory)/../extract_and_copy_hostfxr.sh $(DotNetSdkVersionForLibHostFxr) $(MSBuildSdkResolverOutDir)" />
-     </Target>
- </Project>

Copied: mono-msbuild/repos/community-x86_64/mono-msbuild-no-hostfxr.patch (from rev 657655, mono-msbuild/trunk/mono-msbuild-no-hostfxr.patch)
===================================================================
--- mono-msbuild-no-hostfxr.patch	                        (rev 0)
+++ mono-msbuild-no-hostfxr.patch	2020-07-03 17:45:35 UTC (rev 657656)
@@ -0,0 +1,11 @@
+diff -rupN mono-msbuild.orig/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj mono-msbuild/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
+--- mono-msbuild.orig/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj	2020-07-03 19:37:07.112979921 +0200
++++ mono-msbuild/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj	2020-07-03 19:37:59.966877151 +0200
+@@ -61,7 +61,6 @@
+             Targets="Restore;Build"
+             Properties="OutputDirectory=$(DotNetOverlayDirectory)\nuget-support\msbuild-bin"/>
+         
+-        <Exec Command="$(MSBuildThisFileDirectory)/../extract_and_copy_hostfxr.sh $(DotNetSdkVersionForLibHostFxr) $(MSBuildSdkResolverOutDir)" />
+         <Exec Command="$(MSBuildThisFileDirectory)/../get_sdk_files.sh $(DotNetOverlayDirectory)\msbuild-bin" />
+     </Target>
+ </Project>

Deleted: mono-msbuild-use-bash.patch
===================================================================
--- mono-msbuild-use-bash.patch	2020-07-03 17:45:26 UTC (rev 657655)
+++ mono-msbuild-use-bash.patch	2020-07-03 17:45:35 UTC (rev 657656)
@@ -1,42 +0,0 @@
-Index: xamarin-pkg-msbuild/gen_build_info.sh
-===================================================================
---- xamarin-pkg-msbuild.orig/gen_build_info.sh
-+++ xamarin-pkg-msbuild/gen_build_info.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- if [ $# -ne 1 ]; then
- 	echo "Usage: $0 <filename.cs>"
-Index: xamarin-pkg-msbuild/mono/create_bootstrap.sh
-===================================================================
---- xamarin-pkg-msbuild.orig/mono/create_bootstrap.sh
-+++ xamarin-pkg-msbuild/mono/create_bootstrap.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- # This creates a bootstrap from an exising mono installation
- # This is just to ensure that we have the correct "matched" Roslyn
-Index: xamarin-pkg-msbuild/msbuild-deploy.in
-===================================================================
---- xamarin-pkg-msbuild.orig/msbuild-deploy.in
-+++ xamarin-pkg-msbuild/msbuild-deploy.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- ABSOLUTE_PATH=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd)/`basename "${BASH_SOURCE[0]}"`
- MSBUILD_SRC_DIR=`dirname $ABSOLUTE_PATH`
- mono $MONO_OPTIONS $MSBUILD_SRC_DIR/MSBuild.exe $*
-Index: xamarin-pkg-msbuild/eng/cibuild_bootstrapped_msbuild.sh
-===================================================================
---- xamarin-pkg-msbuild.orig/eng/cibuild_bootstrapped_msbuild.sh
-+++ xamarin-pkg-msbuild/eng/cibuild_bootstrapped_msbuild.sh
-@@ -56,6 +56,7 @@ function DownloadMSBuildForMono {
-     unzip -q "$msbuild_zip" -d "$artifacts_dir"
-     # rename just to make it obvious when reading logs!
-     mv $artifacts_dir/msbuild $mono_msbuild_dir
-+    sed -i 's#/sh$#/bash#' $artifacts_dir/mono-msbuild/msbuild
-     chmod +x $artifacts_dir/mono-msbuild/MSBuild.dll
-     rm "$msbuild_zip"
-   fi

Copied: mono-msbuild/repos/community-x86_64/mono-msbuild-use-bash.patch (from rev 657655, mono-msbuild/trunk/mono-msbuild-use-bash.patch)
===================================================================
--- mono-msbuild-use-bash.patch	                        (rev 0)
+++ mono-msbuild-use-bash.patch	2020-07-03 17:45:35 UTC (rev 657656)
@@ -0,0 +1,42 @@
+Index: xamarin-pkg-msbuild/gen_build_info.sh
+===================================================================
+--- xamarin-pkg-msbuild.orig/gen_build_info.sh
++++ xamarin-pkg-msbuild/gen_build_info.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ if [ $# -ne 1 ]; then
+ 	echo "Usage: $0 <filename.cs>"
+Index: xamarin-pkg-msbuild/mono/create_bootstrap.sh
+===================================================================
+--- xamarin-pkg-msbuild.orig/mono/create_bootstrap.sh
++++ xamarin-pkg-msbuild/mono/create_bootstrap.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This creates a bootstrap from an exising mono installation
+ # This is just to ensure that we have the correct "matched" Roslyn
+Index: xamarin-pkg-msbuild/msbuild-deploy.in
+===================================================================
+--- xamarin-pkg-msbuild.orig/msbuild-deploy.in
++++ xamarin-pkg-msbuild/msbuild-deploy.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ ABSOLUTE_PATH=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd)/`basename "${BASH_SOURCE[0]}"`
+ MSBUILD_SRC_DIR=`dirname $ABSOLUTE_PATH`
+ mono $MONO_OPTIONS $MSBUILD_SRC_DIR/MSBuild.exe $*
+Index: xamarin-pkg-msbuild/eng/cibuild_bootstrapped_msbuild.sh
+===================================================================
+--- xamarin-pkg-msbuild.orig/eng/cibuild_bootstrapped_msbuild.sh
++++ xamarin-pkg-msbuild/eng/cibuild_bootstrapped_msbuild.sh
+@@ -56,6 +56,7 @@ function DownloadMSBuildForMono {
+     unzip -q "$msbuild_zip" -d "$artifacts_dir"
+     # rename just to make it obvious when reading logs!
+     mv $artifacts_dir/msbuild $mono_msbuild_dir
++    sed -i 's#/sh$#/bash#' $artifacts_dir/mono-msbuild/msbuild
+     chmod +x $artifacts_dir/mono-msbuild/MSBuild.dll
+     rm "$msbuild_zip"
+   fi


More information about the arch-commits mailing list