diff options
Diffstat (limited to 'org/config_make.org')
| -rw-r--r-- | org/config_make.org | 48 |
1 files changed, 7 insertions, 41 deletions
diff --git a/org/config_make.org b/org/config_make.org index ba19a4c..ccf2614 100644 --- a/org/config_make.org +++ b/org/config_make.org @@ -48,7 +48,7 @@ #+HEADER: :tangle ../makefile #+HEADER: :noweb yes #+BEGIN_SRC makefile -include .envrc-local +#include .envrc-local PROG_VER_GIT :=$(shell echo `git describe --long --tags | sed -e "s/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g"`) PROG_VER_DECLARED :=$(shell echo `cat ./views/version.txt | grep --color=never "enum" | sed 's/.\+(\([0-9]\+\),[ \t]\+\([0-9]\+\),[ \t]\+\([0-9]\+\)[ \t]*).\+/\1.\2.\3/g'`) DUB=dub @@ -481,44 +481,6 @@ spineWWWrsyncLinode: rsync -v /var/www/sqlite/spine.search.db linode:./stage/. ; \ echo "tar -xf ../spine_output.$${Date}.tar.bz2" -# get project external dependencies -depends_get: - dub upgrade; \ - cd $${gwd} && \ - echo "$${dirs_loc}" && \ - for dir in $${dirs_loc}; do \ - if [[ -d $${dir} ]]; then \ - echo $${gwd}/$${dir} && \ - if [[ "imageformats" == $${dir} ]]; then \ - echo $${gwd}/$${dir} && \ - rm -rvf $${gwd}/$${dir} && \ - git clone --depth=1 https://github.com/tjhann/$${dir} && \ - cd $${dir} && \ - echo $$PWD && \ - echo "$${dir} `git rev-parse HEAD | cut -c 1-8`" > ../$${dir}.meta && \ - echo "https://github.com/tjhann/$${dir}" >> ../$${dir}.meta && \ - echo "Boost Software License 1.0 (BSL-1.0)" >> ../$${dir}.meta && \ - cd $${gwd} && \ - rm -rf $${gwd}/$${dir}/.git; \ - elif [[ "d2sqlite3" == $${dir} || "D-YAML" == $${dir} || "tinyendian" == $${dir} ]]; then \ - echo $${gwd}/$${dir} && \ - rm -rvf $${gwd}/$${dir} && \ - git clone --depth=1 https://github.com/dlang-community/$${dir} && \ - cd $${gwd}/$${dir} && \ - echo "$${dir} `git rev-parse HEAD | cut -c 1-8`" > ../$${dir}.meta && \ - echo "https://github.com/dlang-community/$${dir}" >> ../$${dir}.meta && \ - echo "Boost Software License 1.0 (BSL-1.0)" >> ../$${dir}.meta && \ - cd $${gwd} && \ - rm -rf $${gwd}/$${dir}/.git; \ - fi; \ - fi; \ - done; \ - cd $${hwd} - -# get and set project external dependencies -depends_set: depends_get - dub describe | sed 's~$(shell echo `pwd | sed 's_/_\\/_g'`)~.~g' > dub_describe.json - changelog_: git log --pretty=format:'---%+s %+as %ae%+h%d%+b' --no-merges | sed "/^\\s*$$/d" | sed "s/^---$$//" | sed "s/^\(\*\)\+/-/" | sed "s/ \+$$//" > CHANGELOG_ @@ -566,16 +528,19 @@ nixGitHEADtarballBuild: # clean create check & build test tarball nixGitHEADtarball: nixGitHEADtarballClean nixGitHEADtarballTar nixGitHEADtarballCheck nixGitHEADtarballBuild +# 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; \ + if [ ! -d $${gwd} ]; then \ + mkdir -p $${gwd}/{d2sqlite3,D-YAML,imageformats,tinyendian}; \ + fi; \ cd $${gwd} && \ + deps=`ls -gx '.'` && \ for dir in $${deps}; do \ if [ -d $${dir} ]; then \ echo $${dir} && \ @@ -605,6 +570,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 |