Date: Wednesday, November 25, 2020 @ 21:54:09 Author: wild Revision: 761300
archrelease: copy trunk to community-x86_64 Added: dtools/repos/community-x86_64/PKGBUILD (from rev 761299, dtools/trunk/PKGBUILD) dtools/repos/community-x86_64/autodetect.diff (from rev 761299, dtools/trunk/autodetect.diff) Deleted: dtools/repos/community-x86_64/PKGBUILD dtools/repos/community-x86_64/autodetect.diff -----------------+ PKGBUILD | 98 +++++++++++++++++++++++++++--------------------------- autodetect.diff | 94 +++++++++++++++++++++++++-------------------------- 2 files changed, 96 insertions(+), 96 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-11-25 21:54:03 UTC (rev 761299) +++ PKGBUILD 2020-11-25 21:54:09 UTC (rev 761300) @@ -1,49 +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.094.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" - 'autodetect.diff') -sha512sums=('7ca5641951c31e345b0965d52d4086eb6eb981ae9bf6e0db4489633c2c165e3b5d9c88b96c22578ab77641b52ab6005f12d65c1d7444a17880165fab4cf5bc69' - '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 -L--build-id $_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 -} Copied: dtools/repos/community-x86_64/PKGBUILD (from rev 761299, dtools/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-11-25 21:54:09 UTC (rev 761300) @@ -0,0 +1,49 @@ +# Maintainer: Dan Printzell <a...@vild.io> +# Maintainer: Filipe Laíns (FFY00) <la...@archlinux.org> +# Contributor: Mihails Strasunse <pub...@dicebot.lv> + +pkgname=dtools +pkgver=2.094.2 +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" + 'autodetect.diff') +sha512sums=('8fc9d95e77317afd0c73c8e2b85b01175d4d3494116ec6550f8c9d99d5ecfde9e8e4ff1aa8eb7477e4974faf6b66fb0dbc32bcb7d2facf7cec6cfadd8ea9ad81' + '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 -L--build-id $_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 +} Deleted: autodetect.diff =================================================================== --- autodetect.diff 2020-11-25 21:54:03 UTC (rev 761299) +++ autodetect.diff 2020-11-25 21:54:09 UTC (rev 761300) @@ -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 761299, dtools/trunk/autodetect.diff) =================================================================== --- autodetect.diff (rev 0) +++ autodetect.diff 2020-11-25 21:54:09 UTC (rev 761300) @@ -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