From 8d5e6e65c0c87f4f93752a79e737a1edfc292b4b Mon Sep 17 00:00:00 2001
From: John Ky <newhoggy@gmail.com>
Date: Wed, 3 Apr 2019 11:32:04 +1100
Subject: [PATCH] Upgrade hw-rankselect to 0.13

---
 hw-simd.cabal |  2 +-
 project.sh    | 63 ++++++++++++++++++++++++++++++++++++---------------
 stack.yaml    | 11 ---------
 3 files changed, 46 insertions(+), 30 deletions(-)
 delete mode 100644 stack.yaml

diff --git a/hw-simd.cabal b/hw-simd.cabal
index 1a3ac34..d881908 100644
--- a/hw-simd.cabal
+++ b/hw-simd.cabal
@@ -52,7 +52,7 @@ common hw-bits              { build-depends: hw-bits              >= 0.7.0.2
 common hw-hedgehog          { build-depends: hw-hedgehog          >= 0.1.0.1    && < 0.2    }
 common hw-hspec-hedgehog    { build-depends: hw-hspec-hedgehog    >= 0.1.0.4    && < 0.2    }
 common hw-prim              { build-depends: hw-prim              >= 0.6.2.12   && < 0.7    }
-common hw-rankselect        { build-depends: hw-rankselect        >= 0.12.0.2   && < 0.13   }
+common hw-rankselect        { build-depends: hw-rankselect        >= 0.13       && < 0.14   }
 common hw-rankselect-base   { build-depends: hw-rankselect-base   >= 0.3.2.0    && < 0.4    }
 common lens                 { build-depends: lens                                           }
 common mmap                 { build-depends: mmap                 >= 0.5.9      && < 0.6    }
diff --git a/project.sh b/project.sh
index 49aa889..d3168cc 100755
--- a/project.sh
+++ b/project.sh
@@ -1,32 +1,59 @@
 #!/usr/bin/env bash
 
-STACK_FLAGS="
-  --flag bits-extra:bmi2
-  --flag hw-rankselect-base:bmi2
-  --flag hw-rankselect:bmi2
-  --flag hw-simd:bmi2
-  --flag hw-simd:avx2
-"
-
-case $1 in
+CABAL_FLAGS=""
+
+cmd="$1"
+
+shift
+
+case "$cmd" in
+  install)
+    cabal new-install \
+      --symlink-bindir=$HOME/.local/bin \
+      -j8 --overwrite-policy=always --disable-documentation \
+      exe:hw-json
+      $CABAL_FLAGS "$@"
+    ;;
+
   build)
-    stack build \
-      --test --no-run-tests --bench --no-run-benchmarks \
-      $STACK_FLAGS
+    cabal new-build all -j8 \
+      --disable-tests --disable-benchmarks \
+      $CABAL_FLAGS "$@"
+    ;;
+  
+  exec)
+    cabal new-exec "$(echo *.cabal | cut -d . -f 1)" "$@"
     ;;
 
   test)
-    stack test \
-      $STACK_FLAGS
+    cabal new-test -j8 --enable-tests --disable-documentation \
+      $CABAL_FLAGS "$@"
     ;;
 
   bench)
-    stack bench \
-      $STACK_FLAGS
+    cabal new-bench -j8 \
+      $CABAL_FLAGS "$@"
     ;;
 
   repl)
-    stack repl \
-      $STACK_FLAGS
+    cabal new-repl \
+      $CABAL_FLAGS "$@"
+    ;;
+
+  clean)
+    cabal new-clean
+    ;;
+  
+  *)
+    echo "Unrecognised command: $cmd"
+    exit 1
     ;;
 esac
+
+# haskell-ide-engine work-around
+for x in $(find dist-newstyle -name setup-config | grep '/opt/setup-config$' | sed 's|/opt/setup-config$||g'); do
+  ( cd $x
+    ln -fs opt/setup-config setup-config
+  )
+done
+
diff --git a/stack.yaml b/stack.yaml
deleted file mode 100644
index 9b1e7f0..0000000
--- a/stack.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-resolver: lts-12.12
-
-packages:
-- .
-
-extra-deps:
-- hw-hedgehog-0.1.0.2
-- hw-prim-0.6.2.14
-- hw-rankselect-0.12.0.3
-- lazy-csv-0.5.1
-- sv-0.1