diff --git a/.gitignore b/.gitignore index 9c434adb7c6184cfe12a5c459b0d44fdec427849..350d7a7f065776c29c0954998cb233a9376ec5dc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,9 @@ build src/kpp boxmox*.tar.gz +# bc we create this automatically using build_dist.sh +Makefile.am + doc/boxmox_README.pdf **.DS_Store diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3920427cab679024c0d17d42a423a46d3214ace1..d9b773d65da73412e71949085279aa36ad063c26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ build: - DEBIAN_FRONTEND=noninteractive apt-get -qq install wget patch make gcc gfortran flex bison texlive autoconf autotools-dev - "[ -f ./version ] && export VERSION=$(cat ./version)" script: - - . build_dist.bash "$CI_PROJECT_DIR/build" + - . build_dist.sh "$CI_PROJECT_DIR/build" artifacts: name: boxmox-dist-$CI_COMMIT_SHORT_SHA paths: diff --git a/build_dist.bash b/build_dist.sh similarity index 99% rename from build_dist.bash rename to build_dist.sh index a66918d3995c30db84f16ec123b8650d7f45808e..546d39fc8fc4b723140c259daa793decb8cd47ea 100755 --- a/build_dist.bash +++ b/build_dist.sh @@ -7,7 +7,7 @@ set -x cp Makefile.am_BLUEPRINT Makefile.am # list all files in these subdirectories -distFiles=$(find drv examples case_studies int models util -type file) +distFiles=$(find drv examples case_studies int models util -type f) #pretty print them 45 char wide dd tab, backslash at end remove backslash last line remove tab first line printf 'nobase_dist_pkgdata_DATA = %s\n' "${distFiles[*]}" | fmt -w 45 | sed -e 's/\(.*\)$/\t\1 \\/g' | sed '$ s/\\//g' | sed '1 s/\t//g' >> Makefile.am