Skip to content

Commit 8e1bfc3

Browse files
authored
Merge pull request #24 from haskell-works/upgrade-hw-rankselect-to-0.13
Upgrade hw-rankselect to 0.13
2 parents ca5fef9 + 8d5e6e6 commit 8e1bfc3

File tree

3 files changed

+46
-30
lines changed

3 files changed

+46
-30
lines changed

hw-simd.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ common hw-bits { build-depends: hw-bits >= 0.7.0.2
5252
common hw-hedgehog { build-depends: hw-hedgehog >= 0.1.0.1 && < 0.2 }
5353
common hw-hspec-hedgehog { build-depends: hw-hspec-hedgehog >= 0.1.0.4 && < 0.2 }
5454
common hw-prim { build-depends: hw-prim >= 0.6.2.12 && < 0.7 }
55-
common hw-rankselect { build-depends: hw-rankselect >= 0.12.0.2 && < 0.13 }
55+
common hw-rankselect { build-depends: hw-rankselect >= 0.13 && < 0.14 }
5656
common hw-rankselect-base { build-depends: hw-rankselect-base >= 0.3.2.0 && < 0.4 }
5757
common lens { build-depends: lens }
5858
common mmap { build-depends: mmap >= 0.5.9 && < 0.6 }

project.sh

Lines changed: 45 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,59 @@
11
#!/usr/bin/env bash
22

3-
STACK_FLAGS="
4-
--flag bits-extra:bmi2
5-
--flag hw-rankselect-base:bmi2
6-
--flag hw-rankselect:bmi2
7-
--flag hw-simd:bmi2
8-
--flag hw-simd:avx2
9-
"
10-
11-
case $1 in
3+
CABAL_FLAGS=""
4+
5+
cmd="$1"
6+
7+
shift
8+
9+
case "$cmd" in
10+
install)
11+
cabal new-install \
12+
--symlink-bindir=$HOME/.local/bin \
13+
-j8 --overwrite-policy=always --disable-documentation \
14+
exe:hw-json
15+
$CABAL_FLAGS "$@"
16+
;;
17+
1218
build)
13-
stack build \
14-
--test --no-run-tests --bench --no-run-benchmarks \
15-
$STACK_FLAGS
19+
cabal new-build all -j8 \
20+
--disable-tests --disable-benchmarks \
21+
$CABAL_FLAGS "$@"
22+
;;
23+
24+
exec)
25+
cabal new-exec "$(echo *.cabal | cut -d . -f 1)" "$@"
1626
;;
1727

1828
test)
19-
stack test \
20-
$STACK_FLAGS
29+
cabal new-test -j8 --enable-tests --disable-documentation \
30+
$CABAL_FLAGS "$@"
2131
;;
2232

2333
bench)
24-
stack bench \
25-
$STACK_FLAGS
34+
cabal new-bench -j8 \
35+
$CABAL_FLAGS "$@"
2636
;;
2737

2838
repl)
29-
stack repl \
30-
$STACK_FLAGS
39+
cabal new-repl \
40+
$CABAL_FLAGS "$@"
41+
;;
42+
43+
clean)
44+
cabal new-clean
45+
;;
46+
47+
*)
48+
echo "Unrecognised command: $cmd"
49+
exit 1
3150
;;
3251
esac
52+
53+
# haskell-ide-engine work-around
54+
for x in $(find dist-newstyle -name setup-config | grep '/opt/setup-config$' | sed 's|/opt/setup-config$||g'); do
55+
( cd $x
56+
ln -fs opt/setup-config setup-config
57+
)
58+
done
59+

stack.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)