Date: Sunday, September 15, 2019 @ 23:02:36 Author: wild Revision: 510812
archrelease: copy trunk to community-x86_64 Added: dtools/repos/community-x86_64/PKGBUILD (from rev 510811, dtools/trunk/PKGBUILD) dtools/repos/community-x86_64/autodetect.diff (from rev 510811, dtools/trunk/autodetect.diff) Deleted: dtools/repos/community-x86_64/PKGBUILD dtools/repos/community-x86_64/autodetect.diff -----------------+ PKGBUILD | 110 ++++++++++++++++++++++++++---------------------------- autodetect.diff | 94 +++++++++++++++++++++++----------------------- 2 files changed, 100 insertions(+), 104 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-09-15 23:02:29 UTC (rev 510811) +++ PKGBUILD 2019-09-15 23:02:36 UTC (rev 510812) @@ -1,57 +0,0 @@ -# Maintainer: Dan Printzell <a...@vild.io> -# Maintainer: Filipe Laíns (FFY00) <la...@archlinux.org> -# Contributor: Mihails Strasunse <pub...@dicebot.lv> - -pkgname=dtools -pkgver=2.087.1 -pkgrel=1 -pkgdesc='Ancilliary tools for the D programming language' -license=('Boost') -groups=('dlang') -arch=('x86_64') -url='https://www.dlang.org' -makedepends=('dmd' 'libphobos') -provides=('ddemangle' 'dustmite' 'rdmd') -conflicts=('ddemangle' 'dustmite' 'rdmd') -depends=('curl') -source=("$pkgname-$pkgver.tar.gz::https://github.com/dlang/tools/archive/v$pkgver.tar.gz" - 'http://www.boost.org/LICENSE_1_0.txt' - 'autodetect.diff') -sha512sums=('af5adf9971ed818ca93f7d0e462d7d3f91920caacc77c4b26cc828ef00ee28ee2bb56574c4c7f8692853af2e2d32495e49bf1fca4956652df4452eac099b52cd' - 'd6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8' - '3bce3c66cf24837fcb9bf244f2b07ed6116d8d67a75b2319010cf93956e93b43262b7d9613359503e6b0352b82684be8baeeb7b1f50e77accda334ce470bf5e3') - -build() { - DMD=dmd - - # Add $LDFLAGS and $CXXFLAGS to the compilation - _linkflags=$(echo -ne $LDFLAGS | cut -d\" -f2 | tail -c+4 | sed "s/,/ -L=/g") - - cd tools-$pkgver - - _builddate=$(date "+%b %d %Y" | tr -d '\n') - sed -i "s/__DATE__/\"$_builddate\"/" rdmd.d - - # rdmd is used to build others - $DMD -od. -ofdtools-rdmd $_linkflags rdmd.d - - for tool in DustMite/dustmite ddemangle catdoc detab tolf dget; do - ./dtools-rdmd --compiler=$DMD --build-only -od. -ofdtools-`basename $tool` $_linkflags $tool.d - done -} - -package() { - cd tools-$pkgver - - mkdir -p $pkgdir/usr/bin - for tool in rdmd ddemangle catdoc detab tolf dget dustmite; do - install -m755 -t $pkgdir/usr/bin $pkgname-$tool - done - - cd $pkgdir - ln -s dtools-rdmd usr/bin/rdmd - ln -s dtools-dustmite usr/bin/dustmite - ln -s dtools-ddemangle usr/bin/ddemangle - - install -Dm644 $srcdir/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE -} Copied: dtools/repos/community-x86_64/PKGBUILD (from rev 510811, dtools/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-09-15 23:02:36 UTC (rev 510812) @@ -0,0 +1,53 @@ +# Maintainer: Dan Printzell <a...@vild.io> +# Maintainer: Filipe Laíns (FFY00) <la...@archlinux.org> +# Contributor: Mihails Strasunse <pub...@dicebot.lv> + +pkgname=dtools +pkgver=2.088.0 +pkgrel=1 +pkgdesc='Ancilliary tools for the D programming language' +license=('Boost') +groups=('dlang') +arch=('x86_64') +url='https://www.dlang.org' +makedepends=('dmd' 'libphobos') +provides=('ddemangle' 'dustmite' 'rdmd') +conflicts=('ddemangle' 'dustmite' 'rdmd') +depends=('curl') +source=("$pkgname-$pkgver.tar.gz::https://github.com/dlang/tools/archive/v$pkgver.tar.gz" + 'https://www.boost.org/LICENSE_1_0.txt' + 'autodetect.diff') +sha512sums=('767fa0e7c66a5e1932d96c2fadc49846db623501c62a59c3679e1c76a21154a9e03fa5d4ca9acecf8ef0bcb4c7f4e252a271e9f474b34627a28a6e643b8aeb7d' + 'd6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8' + '3bce3c66cf24837fcb9bf244f2b07ed6116d8d67a75b2319010cf93956e93b43262b7d9613359503e6b0352b82684be8baeeb7b1f50e77accda334ce470bf5e3') + +build() { + DMD=dmd + + # Add $LDFLAGS and $CXXFLAGS to the compilation + _linkflags=$(echo -ne $LDFLAGS | cut -d\" -f2 | tail -c+4 | sed "s/,/ -L=/g") + + cd tools-$pkgver + # rdmd is used to build others + $DMD -od. -ofdtools-rdmd $_linkflags rdmd.d + + for tool in DustMite/dustmite ddemangle catdoc detab tolf dget; do + ./dtools-rdmd --compiler=$DMD --build-only -od. -ofdtools-`basename $tool` $_linkflags $tool.d + done +} + +package() { + cd tools-$pkgver + + mkdir -p $pkgdir/usr/bin + for tool in rdmd ddemangle catdoc detab tolf dget dustmite; do + install -m755 -t $pkgdir/usr/bin $pkgname-$tool + done + + cd $pkgdir + ln -s dtools-rdmd usr/bin/rdmd + ln -s dtools-dustmite usr/bin/dustmite + ln -s dtools-ddemangle usr/bin/ddemangle + + install -Dm644 $srcdir/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE +} Deleted: autodetect.diff =================================================================== --- autodetect.diff 2019-09-15 23:02:29 UTC (rev 510811) +++ autodetect.diff 2019-09-15 23:02:36 UTC (rev 510812) @@ -1,47 +0,0 @@ -diff --git a/rdmd.d b/rdmd.d -index bd82637..390d533 100644 ---- a/rdmd.d -+++ b/rdmd.d -@@ -52,7 +52,32 @@ else version (LDC) - else - static assert(false, "Unknown compiler"); - --private string compiler = defaultCompiler; -+private string compiler; -+ -+void chooseCompiler(ref string compiler) -+{ -+ import std.stdio; -+ -+ // if compiler is set explicitly, don't interefer -+ // otherwise find one that exists in PATH -+ if (!compiler.length) -+ { -+ import std.process : executeShell; -+ auto compilers = [ defaultCompiler, "dmd", "ldmd2", "gdmd2", "ldmd", "gdmd" ]; -+ -+ foreach (candidate; compilers) -+ { -+ // dirty hack, no-arg dmd invocation will return 1 -+ if (executeShell(candidate ~ "| grep Usage").status == 0) -+ { -+ compiler = candidate; -+ return; -+ } -+ } -+ -+ throw new Exception("Couldn't find any D compiler"); -+ } -+} - - version(unittest) {} else - int main(string[] args) -@@ -153,6 +178,8 @@ int main(string[] args) - if (bailout) return 0; - if (dryRun) chatty = true; // dry-run implies chatty - -+ chooseCompiler(compiler); -+ - /* Only -of is supported because Make is very susceptible to file names, and - * it doesn't do a good job resolving them. One option would be to use - * std.path.buildNormalizedPath(), but some corner cases will break, so it Copied: dtools/repos/community-x86_64/autodetect.diff (from rev 510811, dtools/trunk/autodetect.diff) =================================================================== --- autodetect.diff (rev 0) +++ autodetect.diff 2019-09-15 23:02:36 UTC (rev 510812) @@ -0,0 +1,47 @@ +diff --git a/rdmd.d b/rdmd.d +index bd82637..390d533 100644 +--- a/rdmd.d ++++ b/rdmd.d +@@ -52,7 +52,32 @@ else version (LDC) + else + static assert(false, "Unknown compiler"); + +-private string compiler = defaultCompiler; ++private string compiler; ++ ++void chooseCompiler(ref string compiler) ++{ ++ import std.stdio; ++ ++ // if compiler is set explicitly, don't interefer ++ // otherwise find one that exists in PATH ++ if (!compiler.length) ++ { ++ import std.process : executeShell; ++ auto compilers = [ defaultCompiler, "dmd", "ldmd2", "gdmd2", "ldmd", "gdmd" ]; ++ ++ foreach (candidate; compilers) ++ { ++ // dirty hack, no-arg dmd invocation will return 1 ++ if (executeShell(candidate ~ "| grep Usage").status == 0) ++ { ++ compiler = candidate; ++ return; ++ } ++ } ++ ++ throw new Exception("Couldn't find any D compiler"); ++ } ++} + + version(unittest) {} else + int main(string[] args) +@@ -153,6 +178,8 @@ int main(string[] args) + if (bailout) return 0; + if (dryRun) chatty = true; // dry-run implies chatty + ++ chooseCompiler(compiler); ++ + /* Only -of is supported because Make is very susceptible to file names, and + * it doesn't do a good job resolving them. One option would be to use + * std.path.buildNormalizedPath(), but some corner cases will break, so it