@@ -1,7 +1,5 @@ #!/usr/bin/env runghc import Distribution.Simple -import qualified Control.Exception as Ex -import qualified Tests.Properties as P import System.Directory import System.FilePath import Control.Monad @@ -10,22 +8,20 @@ import System.Exit import List inf = "infinity" +-- files to remove bins = [inf] ++ - ["util" </> "unlambda"] -- files to remove + ["util" </> "unlambda"] +-- directories to clean dirs = [ "." - , "Tests" - , "util" - , "Infinity" - , "Infinity" </> "Plugins"] -- directories to clean + , "util" ] ++ + map ("src" </>) [ "Infinity" + , "Infinity" </> "Plugins"] -main = defaultMainWithHooks $ defaultUserHooks { - runTests = tests, +main = defaultMainWithHooks $ simpleUserHooks { postBuild = copyInfinity, postClean = cleanInfinity } -tests _ _ _ _ = P.main - copyInfinity _ _ _ _ = do copyFile (joinPath ["dist","build","infinity",inf]) inf ignore (createDirectory "Log" >> createDirectory "State") @@ -41,4 +37,4 @@ cleanInfinity _ _ _ _ = do -- convenience -ignore a = Ex.catch a (\_ -> return ()) +ignore a = Prelude.catch a (\_ -> return ()) Setup.hs Tests/Properties.hs 37abc729b0069477c0dc0c6cd7bb39d3f05b0ff8 Austin Seipp mad.one@gmail.com http://github.com/thoughtpolice/infinity/commit/5fff14e43eaf3701e139cfc6e2b05d0cec80d592 5fff14e43eaf3701e139cfc6e2b05d0cec80d592 2008-11-05T09:08:42-08:00 2008-11-05T09:08:42-08:00 updated Setup.hs, removed tests due to complications e2adc46c41a2b68f89defd6ce322264c223e5850 Austin Seipp mad.one@gmail.com