moving haskell dependency files out of the way

conjure-cp · Jul 10, 2016 · 41deacd · 41deacd
1 parent 63432e7
commit 41deacd
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/etc/build/clean.sh b/etc/build/clean.sh
@@ -10,7 +10,7 @@ rm -rf dist \
        cabal.sandbox.config .cabal-sandbox \
        src/RepositoryVersion.hs \
        cabal.config \
-       cabal.config-${GHC_VERSION}
+       etc/hs-deps/cabal.config-${GHC_VERSION}
 
 find . -name "*.prof" -delete
 find . -name "*.hi" -delete

diff --git a/etc/build/freeze-deps.sh b/etc/build/freeze-deps.sh
@@ -9,6 +9,6 @@ SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 source ${SCRIPT_DIR}/default_envvars.sh
 echo "Creating a cabal-freeze file for GHC ${GHC_VERSION}"
 cabal freeze --enable-tests
-cat cabal.config | grep -v '             base ==' > cabal.config-${GHC_VERSION}
+cat cabal.config | grep -v '             base ==' > etc/hs-deps/cabal.config-${GHC_VERSION}
 rm -f cabal.config
-git diff cabal.config-${GHC_VERSION}
+git diff etc/hs-deps/cabal.config-${GHC_VERSION}
diff --git a/etc/build/install.sh b/etc/build/install.sh
@@ -267,11 +267,11 @@ esac
 
 if [ ${GHC_VERSION} = "head" ] ; then
     rm -f cabal.config
-elif [ -f cabal.config-${GHC_VERSION} ]; then
-    cp cabal.config-${GHC_VERSION} cabal.config
-    echo "using a cabal freeze file: cabal.config-${GHC_VERSION}"
+elif [ -f etc/hs-deps/cabal.config-${GHC_VERSION} ]; then
+    cp etc/hs-deps/cabal.config-${GHC_VERSION} cabal.config
+    echo "using a cabal freeze file: etc/hs-deps/cabal.config-${GHC_VERSION}"
 else
-    echo "not using a cabal freeze file: cabal.config-${GHC_VERSION} not found"
+    echo "not using a cabal freeze file: etc/hs-deps/cabal.config-${GHC_VERSION} not found"
 fi
 
 # install conjure, finally

diff --git a/cabal.config-7.10.3 → etc/hs-deps/cabal.config-7.10.3 b/cabal.config-7.10.3 → etc/hs-deps/cabal.config-7.10.3
diff --git a/cabal.config-7.8.4 → etc/hs-deps/cabal.config-7.8.4 b/cabal.config-7.8.4 → etc/hs-deps/cabal.config-7.8.4
diff --git a/cabal.config-8.0.1 → etc/hs-deps/cabal.config-8.0.1 b/cabal.config-8.0.1 → etc/hs-deps/cabal.config-8.0.1
diff --git a/stack-7.10.yaml → etc/hs-deps/stack-7.10.yaml b/stack-7.10.yaml → etc/hs-deps/stack-7.10.yaml
diff --git a/stack-8.0.yaml → etc/hs-deps/stack-8.0.yaml b/stack-8.0.yaml → etc/hs-deps/stack-8.0.yaml