From 7419508a1d799c99aeb3051c8479a72f635ffe7a Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 9 Jun 2023 17:20:55 -0400 Subject: arsd/cgi.d updated now includes arsd/core.d ldc2 1.32.2 --- makefile | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'makefile') diff --git a/makefile b/makefile index 4d957a4..cf4b608 100644 --- a/makefile +++ b/makefile @@ -39,33 +39,40 @@ nix-build-ldc: nix-build-gdc: nix build ".#spine-search-gdc" --print-build-logs +# get project external dependencies get_depends: hwd=$$(echo `pwd`) && \ gwd="$${hwd}/src/ext_depends" && \ - dirs=$$(echo `ls -gx $${gwd}`) && \ license_bsl="Boost Software License 1.0 (BSL-1.0)" && \ echo $${hwd} && \ echo $${gwd} && \ - echo $${deps} && \ dub upgrade; \ + deps=`echo "d2sqlite3 arsd"` && \ + for dir in $${deps}; do \ + if [ ! -d $${gwd}/$${dir} ]; then \ + mkdir -p $${gwd}/$${dir}; \ + fi; \ + done; \ cd $${gwd} && \ for dir in $${deps}; do \ if [ -d $${dir} ]; then \ echo $${dir} && \ - if [[ "arsd" == $${dir} ]]; then \ + if [ "arsd" == $${dir} ]; then \ echo $${dir} && \ rm -rf $${dir} && \ - mkdir $${dir} && \ - aria2c -o "$${dir}/cgi.d" "https://raw.githubusercontent.com/adamdruppe/arsd/master/cgi.d" && \ + mkdir $${dir} && \ + cd $${dir} && \ + wget "$${dir}/cgi.d" "https://raw.githubusercontent.com/adamdruppe/arsd/master/core.d"; \ + wget "$${dir}/cgi.d" "https://raw.githubusercontent.com/adamdruppe/arsd/master/cgi.d" && \ cd $${gwd}; \ elif [[ "d2sqlite3" == $${dir} ]]; then \ echo $${dir} && \ rm -rf $${dir} && \ git clone --depth=1 https://github.com/dlang-community/$${dir} && \ cd $${dir} && \ - echo "$${dir} `git rev-parse HEAD | cut -c 1-8`" > ../$${dir}.meta && \ - echo "https://github.com/dlang-community/$${dir}" >> ../$${dir}.meta && \ - echo "$${license_bsl}" >> ../$${dir}.meta && \ + echo "$${dir} `git rev-parse HEAD | cut -c 1-8`" > ../$${dir}.meta && \ + echo "https://github.com/dlang-community/$${dir}" >> ../$${dir}.meta && \ + echo "$${license_bsl}" >> ../$${dir}.meta && \ cd $${gwd} && \ rm -rf $${dir}/.git; \ fi; \ @@ -73,6 +80,7 @@ get_depends: done; \ cd $${hwd} +# get and set project external dependencies set_depends: get_depends dub describe | sed 's~$(shell echo `pwd | sed 's_/_\\/_g'`)~.~g' > dub_describe.json -- cgit v1.2.3