summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--propellor.cabal6
-rw-r--r--src/Propellor/DotDir.hs20
-rw-r--r--stack.yaml3
3 files changed, 7 insertions, 22 deletions
diff --git a/propellor.cabal b/propellor.cabal
index 3431d410..d97d4096 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -34,10 +34,6 @@ Description:
.
It is configured using haskell.
-Flag UseStack
- Description: Have propellor rebuild itself using Stack (default is Cabal)
- Default: False
-
Executable propellor
Main-Is: wrapper.hs
GHC-Options: -threaded -Wall -fno-warn-tabs -O0
@@ -50,8 +46,6 @@ Executable propellor
unix, unix-compat, ansi-terminal, containers (>= 0.5), network, async,
time, mtl, transformers, exceptions (>= 0.6), stm, text,
concurrent-output
- if flag(UseStack)
- CPP-Options: -DUSE_STACK
Executable propellor-config
Main-Is: config.hs
diff --git a/src/Propellor/DotDir.hs b/src/Propellor/DotDir.hs
index 43067417..21479cb1 100644
--- a/src/Propellor/DotDir.hs
+++ b/src/Propellor/DotDir.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
module Propellor.DotDir where
import Propellor.Message
@@ -53,14 +51,11 @@ dotPropellor = do
home <- myHomeDir
return (home </> ".propellor")
-data InitCfg = UseCabal | UseStack
-
-initCfg :: InitCfg
-#ifdef USE_STACK
-initCfg = UseStack
-#else
-initCfg = UseCabal
-#endif
+-- Detect if propellor was built using stack. This is somewhat of a hack.
+buildSystem :: IO String
+buildSystem = do
+ d <- Package.getLibDir
+ return $ if "stack-work" `isInfixOf` d then "stack" else "cabal"
interactiveInit :: IO ()
interactiveInit = ifM (doesDirectoryExist =<< dotPropellor)
@@ -125,12 +120,11 @@ setup = do
section
putStrLn "Let's try building the propellor configuration, to make sure it will work..."
putStrLn ""
+ b <- buildSystem
void $ boolSystem "git"
[ Param "config"
, Param "propellor.buildsystem"
- , Param $ case initCfg of
- UseCabal -> "cabal"
- UseStack -> "stack"
+ , Param b
]
buildPropellor Nothing
putStrLn ""
diff --git a/stack.yaml b/stack.yaml
index 6b5e859c..7b6bcef8 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,6 +1,3 @@
resolver: lts-5.10
packages:
- '.'
-flags:
- propellor:
- usestack: true