diff options
| author | John J. Camilleri <john@digitalgrammars.com> | 2020-11-09 21:59:05 +0100 |
|---|---|---|
| committer | John J. Camilleri <john@digitalgrammars.com> | 2020-11-09 21:59:05 +0100 |
| commit | 359f1509fa70fc572351f425451360b2ec5336bb (patch) | |
| tree | 75239d009ba99068c1a589ed826d425e8288562f /bin/build-binary-dist.sh | |
| parent | b1b3bc3360c9b10ad6767ba13063f86757ab3162 (diff) | |
Blurt out cabal version in both action and build script
Diffstat (limited to 'bin/build-binary-dist.sh')
| -rwxr-xr-x | bin/build-binary-dist.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/build-binary-dist.sh b/bin/build-binary-dist.sh index 02751f40b..2c03a81a1 100755 --- a/bin/build-binary-dist.sh +++ b/bin/build-binary-dist.sh @@ -25,6 +25,8 @@ extra="--extra-lib-dirs=$extralib --extra-include-dirs=$extrainclude" set -e # Stop if an error occurs set -x # print commands before executing them +cabal --version + ## First configure & build the C run-time system pushd src/runtime/c bash setup.sh configure --prefix="$prefix" @@ -74,7 +76,7 @@ cabal install -w "$ghc" --only-dependencies -fserver -fc-runtime $extra cabal configure -w "$ghc" --prefix="$prefix" -fserver -fc-runtime $extra cabal build # Building the example grammars will fail, because the RGL is missing -cabal v1-copy --destdir="$destdir" # create www directory +cabal copy --destdir="$destdir" # create www directory ## Build the RGL and copy it to $destdir PATH=$PWD/dist/build/gf:$PATH @@ -89,7 +91,7 @@ popd cabal build ## Copy GF to $destdir -cabal v1-copy --destdir="$destdir" +cabal copy --destdir="$destdir" libdir=$(dirname $(find "$destdir" -name PGF.hi)) cabal register --gen-pkg-config=$libdir/gf-$ver.conf |