summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormschubert2019-01-03 14:13:34 +0100
committermschubert2019-01-03 14:13:34 +0100
commit88ceb6e446d7ad3be9156d2bf0e2fa1b775dde9b (patch)
tree2a839b6f1a8bb869795116dc8d0912675918736a
parentf82fb1efd5a44103f04b5e503fc555406988c6b5 (diff)
downloadaur-88ceb6e446d7ad3be9156d2bf0e2fa1b775dde9b.tar.gz
fix build; version bump 2.7.9.r17
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD29
-rw-r--r--package.patch40
3 files changed, 59 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3f31c65a831..e4e54020d5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
-# Generated by mksrcinfo v8
-# Thu Nov 9 14:32:27 UTC 2017
pkgbase = ironpython-git
pkgdesc = Python implementation for the .NET framework
- pkgver = r2315.ac72964d7
+ pkgver = 2.7.9.r17.g3071442ad
pkgrel = 1
url = http://ironpython.net
arch = any
license = Apache
makedepends = git
- depends = mono
- depends = msbuild-bin
+ makedepends = msbuild-stable
+ depends = mono>=5.18
options = !strip
options = emptydirs
options = libtool
source = ironpython-git::git+https://github.com/IronLanguages/ironpython2.git
- md5sums = SKIP
+ source = package.patch
+ sha256sums = SKIP
+ sha256sums = dac312b21732555742dbb4bf1b7225e98ad2c1ee260d684b3f259369d32b3cd7
pkgname = ironpython-git
diff --git a/PKGBUILD b/PKGBUILD
index 63e22c0a3fc..3c189b0c64e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,37 @@
# Maintainer: Michael Schubert <mschu.dev at gmail>
pkgname=ironpython-git
-pkgver=r2315.ac72964d7
+pkgver=2.7.9.r17.g3071442ad
pkgrel=1
pkgdesc="Python implementation for the .NET framework"
arch=("any")
url="http://ironpython.net"
license=("Apache")
-depends=('mono' 'msbuild-bin')
-makedepends=('git')
+depends=('mono>=5.18')
+makedepends=('git' 'msbuild-stable')
options=('!strip' 'emptydirs' 'libtool')
-source=($pkgname::git+https://github.com/IronLanguages/ironpython2.git)
-md5sums=('SKIP')
+source=($pkgname::git+https://github.com/IronLanguages/ironpython2.git
+ package.patch)
+sha256sums=('SKIP'
+ 'dac312b21732555742dbb4bf1b7225e98ad2c1ee260d684b3f259369d32b3cd7')
pkgver() {
cd "$srcdir/$pkgname"
- printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+ git describe --long --tags | sed 's/^ipy-//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {
cd "$srcdir/$pkgname"
- git checkout ac72964d7
git submodule update --init
+ patch -p0 < ../package.patch
+ sed -i "s:@pkgdir@:$pkgdir:" Package/deb/Deb.Packaging.targets
}
build() {
cd "$srcdir/$pkgname"
- git checkout ac72964d7
- msbuild.exe Build.proj /t:Build /p:Mono=true /p:BuildFlavour=Release \
- /p:Platform="Any CPU" /verbosity:minimal /nologo
+ msbuild Build.proj /t:Stage /p:Configuration=Release
}
package() {
- mkdir -p "$pkgdir/opt/ipy" "$pkgdir/usr/bin"
- cp -r $srcdir/$pkgname/bin/Release/* "$pkgdir/opt/ipy"
- for bin in ipy ipy64 ipyw ipyw64; do
- echo -e "#!/bin/sh\nmono /opt/ipy/$bin.exe $*" > "$pkgdir/usr/bin/$bin"
- chmod +x "$pkgdir/usr/bin/$bin"
- done
+ cd "$srcdir/$pkgname"
+ msbuild Build.proj /t:Package /p:Configuration=Release
}
diff --git a/package.patch b/package.patch
new file mode 100644
index 00000000000..0a539ed473b
--- /dev/null
+++ b/package.patch
@@ -0,0 +1,40 @@
+--- Package/deb/Deb.Packaging.targets.orig 2019-01-03 11:36:50.735435572 +0100
++++ Package/deb/Deb.Packaging.targets 2019-01-03 11:37:34.582821502 +0100
+@@ -4,7 +4,7 @@
+ <PropertyGroup>
+ <TempFolder>temp</TempFolder>
+ <PackageDebFolder>Package/deb</PackageDebFolder>
+- <PackageTempFolder>$(PackageDebFolder)/$(TempFolder)</PackageTempFolder>
++ <PackageTempFolder>@pkgdir@</PackageTempFolder>
+ </PropertyGroup>
+
+ <ItemGroup>
+@@ -23,29 +23,15 @@
+ <!-- Build the application deb -->
+ <Exec Command="chmod 777 $(StageDir)/net45/*.exe" />
+ <Exec Command="rm -rf $(PackageTempFolder)" />
+- <Exec Command="mkdir -p $(PackageTempFolder)/DEBIAN" />
+- <Exec Command="cp $(PackageDebFolder)/DEBIAN/* $(PackageTempFolder)/DEBIAN"/>
+-
+- <FileUpdate Files="$(PackageTempFolder)/DEBIAN/control"
+- Regex="{xxx}"
+- ReplacementText="$(PackageVersion)" />
+
+ <ItemGroup>
+ <StdLibOutputFiles Include="$(StageDir)/Lib/**/*.py" />
+ </ItemGroup>
+ <Exec Command="dos2unix %(StdLibOutputFiles.Identity)" />
+- <Exec Command="dos2unix $(PackageTempFolder)/DEBIAN/control"/>
+
+ <Copy SourceFiles="@(ScriptFiles)" DestinationFolder="$(PackageTempFolder)/usr/bin/"/>
+ <Copy SourceFiles="@(ApplicationFiles)" DestinationFolder="$(PackageTempFolder)/usr/share/ironpython2.7/%(ApplicationFiles.RecursiveDir)"/>
+ <Copy SourceFiles="@(StdLibFiles)" DestinationFolder="$(PackageTempFolder)/usr/lib/ironpython2.7/%(StdLibFiles.RecursiveDir)"/>
+
+- <Exec Command="fakeroot dpkg-deb -v --build $(PackageTempFolder)"/>
+- <Copy
+- SourceFiles="$(PackageDebFolder)/$(TempFolder).deb"
+- DestinationFiles="$(PackageDir)/ironpython_$(PackageVersion).deb"/>
+- <Delete Files="$(PackageDebFolder)/$(TempFolder).deb"/>
+-
+- <RemoveDir Directories="$(PackageTempFolder)" />
+ </Target>