Date: Sunday, January 1, 2017 @ 01:08:53 Author: dicebot Revision: 203449
archrelease: copy trunk to community-i686, community-x86_64 Added: dtools/repos/community-i686/PKGBUILD (from rev 203448, dtools/trunk/PKGBUILD) dtools/repos/community-i686/autodetect.diff (from rev 203448, dtools/trunk/autodetect.diff) dtools/repos/community-x86_64/PKGBUILD (from rev 203448, dtools/trunk/PKGBUILD) dtools/repos/community-x86_64/autodetect.diff (from rev 203448, dtools/trunk/autodetect.diff) Deleted: dtools/repos/community-i686/PKGBUILD dtools/repos/community-i686/autodetect.diff dtools/repos/community-x86_64/PKGBUILD dtools/repos/community-x86_64/autodetect.diff ----------------------------------+ /PKGBUILD | 108 +++++++++++++++++++++++++++++++++++++ /autodetect.diff | 94 ++++++++++++++++++++++++++++++++ community-i686/PKGBUILD | 60 -------------------- community-i686/autodetect.diff | 47 ---------------- community-x86_64/PKGBUILD | 60 -------------------- community-x86_64/autodetect.diff | 47 ---------------- 6 files changed, 202 insertions(+), 214 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-01-01 01:08:39 UTC (rev 203448) +++ community-i686/PKGBUILD 2017-01-01 01:08:53 UTC (rev 203449) @@ -1,60 +0,0 @@ -# $Id$ -# Maintainer: Mihails Strasunse <pub...@dicebot.lv> - -pkgname=('dtools') -pkgver=2.072.1 -pkgrel=1 -pkgdesc="Ancilliary tools for the D programming language" -license=("custom") -groups=('dlang') -arch=('i686' 'x86_64') -url="http://www.dlang.org" -makedepends=('dmd' 'libphobos' 'git') -depends=('curl') - -source=( - "git+http://github.com/D-Programming-Language/tools#commit=3a32331303e2e62f429b8136ba0de0e9a9294722" - "http://www.boost.org/LICENSE_1_0.txt" - "autodetect.diff" -) -sha256sums=('SKIP' - 'c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566' - '283f6708499b62b0d2e1429f329f809dc6f2fd659c51e8d3cd0d16ce81efe70d') - -prepare() -{ - # rdmd is broken without https://github.com/dlang/tools/pull/185 - sed -i 's|std.syserror|std.windows.syserror|g' $srcdir/tools/rdmd.d -} - -build() -{ - # DMD=`$srcdir/Arch-PKGBUILDs/d-compiler.sh` - DMD=dmd - - cd $srcdir/tools - git apply $srcdir/autodetect.diff - - # rdmd is used to build others - $DMD -od. -ofdtools-rdmd rdmd.d - - for tool in DustMite/dustmite ddemangle catdoc detab tolf dget; do - ./dtools-rdmd --compiler=$DMD --build-only -od. -ofdtools-`basename $tool` $tool.d - done -} - -package() -{ - cd $srcdir/tools - - 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 - - install -Dm644 $srcdir/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE -} Copied: dtools/repos/community-i686/PKGBUILD (from rev 203448, dtools/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-01-01 01:08:53 UTC (rev 203449) @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Mihails Strasunse <pub...@dicebot.lv> + +pkgname=('dtools') +pkgver=2.072.2 +pkgrel=1 +pkgdesc="Ancilliary tools for the D programming language" +license=("custom") +groups=('dlang') +arch=('i686' 'x86_64') +url="http://www.dlang.org" +makedepends=('dmd' 'libphobos' 'git') +depends=('curl') + +source=( + "git+http://github.com/D-Programming-Language/tools#commit=3a32331303e2e62f429b8136ba0de0e9a9294722" + "http://www.boost.org/LICENSE_1_0.txt" + "autodetect.diff" +) +sha256sums=('SKIP' + 'c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566' + '283f6708499b62b0d2e1429f329f809dc6f2fd659c51e8d3cd0d16ce81efe70d') + +build() +{ + # DMD=`$srcdir/Arch-PKGBUILDs/d-compiler.sh` + DMD=dmd + + cd $srcdir/tools + git apply $srcdir/autodetect.diff + + # rdmd is used to build others + $DMD -od. -ofdtools-rdmd rdmd.d + + for tool in DustMite/dustmite ddemangle catdoc detab tolf dget; do + ./dtools-rdmd --compiler=$DMD --build-only -od. -ofdtools-`basename $tool` $tool.d + done +} + +package() +{ + cd $srcdir/tools + + 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 + + install -Dm644 $srcdir/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE +} Deleted: community-i686/autodetect.diff =================================================================== --- community-i686/autodetect.diff 2017-01-01 01:08:39 UTC (rev 203448) +++ community-i686/autodetect.diff 2017-01-01 01:08:53 UTC (rev 203449) @@ -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-i686/autodetect.diff (from rev 203448, dtools/trunk/autodetect.diff) =================================================================== --- community-i686/autodetect.diff (rev 0) +++ community-i686/autodetect.diff 2017-01-01 01:08:53 UTC (rev 203449) @@ -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 Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2017-01-01 01:08:39 UTC (rev 203448) +++ community-x86_64/PKGBUILD 2017-01-01 01:08:53 UTC (rev 203449) @@ -1,60 +0,0 @@ -# $Id$ -# Maintainer: Mihails Strasunse <pub...@dicebot.lv> - -pkgname=('dtools') -pkgver=2.072.1 -pkgrel=1 -pkgdesc="Ancilliary tools for the D programming language" -license=("custom") -groups=('dlang') -arch=('i686' 'x86_64') -url="http://www.dlang.org" -makedepends=('dmd' 'libphobos' 'git') -depends=('curl') - -source=( - "git+http://github.com/D-Programming-Language/tools#commit=3a32331303e2e62f429b8136ba0de0e9a9294722" - "http://www.boost.org/LICENSE_1_0.txt" - "autodetect.diff" -) -sha256sums=('SKIP' - 'c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566' - '283f6708499b62b0d2e1429f329f809dc6f2fd659c51e8d3cd0d16ce81efe70d') - -prepare() -{ - # rdmd is broken without https://github.com/dlang/tools/pull/185 - sed -i 's|std.syserror|std.windows.syserror|g' $srcdir/tools/rdmd.d -} - -build() -{ - # DMD=`$srcdir/Arch-PKGBUILDs/d-compiler.sh` - DMD=dmd - - cd $srcdir/tools - git apply $srcdir/autodetect.diff - - # rdmd is used to build others - $DMD -od. -ofdtools-rdmd rdmd.d - - for tool in DustMite/dustmite ddemangle catdoc detab tolf dget; do - ./dtools-rdmd --compiler=$DMD --build-only -od. -ofdtools-`basename $tool` $tool.d - done -} - -package() -{ - cd $srcdir/tools - - 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 - - install -Dm644 $srcdir/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE -} Copied: dtools/repos/community-x86_64/PKGBUILD (from rev 203448, dtools/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-01-01 01:08:53 UTC (rev 203449) @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Mihails Strasunse <pub...@dicebot.lv> + +pkgname=('dtools') +pkgver=2.072.2 +pkgrel=1 +pkgdesc="Ancilliary tools for the D programming language" +license=("custom") +groups=('dlang') +arch=('i686' 'x86_64') +url="http://www.dlang.org" +makedepends=('dmd' 'libphobos' 'git') +depends=('curl') + +source=( + "git+http://github.com/D-Programming-Language/tools#commit=3a32331303e2e62f429b8136ba0de0e9a9294722" + "http://www.boost.org/LICENSE_1_0.txt" + "autodetect.diff" +) +sha256sums=('SKIP' + 'c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566' + '283f6708499b62b0d2e1429f329f809dc6f2fd659c51e8d3cd0d16ce81efe70d') + +build() +{ + # DMD=`$srcdir/Arch-PKGBUILDs/d-compiler.sh` + DMD=dmd + + cd $srcdir/tools + git apply $srcdir/autodetect.diff + + # rdmd is used to build others + $DMD -od. -ofdtools-rdmd rdmd.d + + for tool in DustMite/dustmite ddemangle catdoc detab tolf dget; do + ./dtools-rdmd --compiler=$DMD --build-only -od. -ofdtools-`basename $tool` $tool.d + done +} + +package() +{ + cd $srcdir/tools + + 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 + + install -Dm644 $srcdir/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE +} Deleted: community-x86_64/autodetect.diff =================================================================== --- community-x86_64/autodetect.diff 2017-01-01 01:08:39 UTC (rev 203448) +++ community-x86_64/autodetect.diff 2017-01-01 01:08:53 UTC (rev 203449) @@ -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 203448, dtools/trunk/autodetect.diff) =================================================================== --- community-x86_64/autodetect.diff (rev 0) +++ community-x86_64/autodetect.diff 2017-01-01 01:08:53 UTC (rev 203449) @@ -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