+
+int main() {
+ // call a function in another file
+ myPrintHelloMake();
+
+ return(0);
+}
diff --git a/Examples/MakeTutor/hellomake.h b/Examples/MakeTutor/hellomake.h
new file mode 100644
--- /dev/null
+++ b/Examples/MakeTutor/hellomake.h
@@ -0,0 +1,5 @@
+/*
+example include file
+*/
+
+void myPrintHelloMake(void);
diff --git a/Examples/Self/Main.hs b/Examples/Self/Main.hs
--- a/Examples/Self/Main.hs
+++ b/Examples/Self/Main.hs
@@ -4,6 +4,7 @@
import Development.Shake
import Development.Shake.Classes
+import Development.Shake.Command
import Development.Shake.FilePath
import Examples.Util
@@ -25,7 +26,7 @@
let fixPaths x = if x == "Paths_shake.hs" then "Paths.hs" else x
ghcPkg <- addOracle $ \GhcPkg{} -> do
- (out,_) <- quietly $ systemOutput "ghc-pkg" ["list","--simple-output"]
+ Stdout out <- quietly $ cmd "ghc-pkg list --simple-output"
return $ words out
ghcFlags <- addOracle $ \GhcFlags{} -> do
@@ -36,7 +37,7 @@
-- since ghc-pkg includes the ghc package, it changes if the version does
ghcPkg $ GhcPkg ()
flags <- ghcFlags $ GhcFlags ()
- system' "ghc" $ args ++ flags
+ cmd "ghc" flags args
obj "/*.exe" *> \out -> do
src <- readFileLines $ replaceExtension out "deps"
diff --git a/Examples/Test/Command.hs b/Examples/Test/Command.hs
new file mode 100644
--- /dev/null
+++ b/Examples/Test/Command.hs
@@ -0,0 +1,61 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+
+module Examples.Test.Command(main) where
+
+import Control.Exception hiding (assert)
+import Control.Monad
+import Data.List
+import Development.Shake
+import Development.Shake.Command
+import Examples.Util
+
+
+main = shaken test $ \args obj -> do
+ want $ map obj args
+
+ let a !> b = obj a *> \out -> do alwaysRerun; res <- b; writeFile' out res
+
+ "ghc-version" !> do
+ Stdout stdout <- cmd "ghc --version"
+ return stdout
+
+ "ghc-random" !> do
+ (Stderr stderr, Exit _) <- cmd "ghc --random"
+ return stderr
+
+ "ghc-random2" !> do
+ () <- cmd (EchoStderr False) "ghc --random"
+ return ""
+
+ "pwd" !> do
+ writeFileLines (obj "pwd space.hs") ["import System.Directory","main = putStrLn =<< getCurrentDirectory"]
+ Stdout out <- cmd (Cwd $ obj "") "runhaskell" ["pwd space.hs"]
+ return out
+
+ "env" !> do
+ (Exit _, Stdout out1) <- cmd (Env [("FOO","HELLO SHAKE")]) Shell "echo %FOO%"
+ (Exit _, Stdout out2) <- cmd (Env [("FOO","HELLO SHAKE")]) Shell "echo $FOO"
+ return $ unlines [out1, out2]
+
+
+test build obj = do
+ let crash args parts = do
+ res <- try $ build $ "--quiet" : args
+ case res of
+ Left (err :: SomeException) -> let s = show err in forM_ parts $ \p ->
+ assert (p `isInfixOf` s) $ "Incorrect exception, missing part:\nGOT: " ++ s ++ "\nWANTED: " ++ p
+ Right _ -> error "Expected an exception but succeeded"
+
+ build ["ghc-version"]
+ assertContentsInfix (obj "ghc-version") "The Glorious Glasgow Haskell Compilation System"
+
+ build ["ghc-random"]
+ assertContentsInfix (obj "ghc-random") "unrecognised flags: --random"
+
+ crash ["ghc-random2"] ["unrecognised flags: --random"]
+
+ build ["pwd"]
+ assertContentsInfix (obj "pwd") "command"
+
+ build ["env"]
+ assertContentsInfix (obj "env") "HELLO SHAKE"
diff --git a/Examples/Test/Docs.hs b/Examples/Test/Docs.hs
new file mode 100644
--- /dev/null
+++ b/Examples/Test/Docs.hs
@@ -0,0 +1,154 @@
+{-# LANGUAGE PatternGuards #-}
+
+module Examples.Test.Docs(main) where
+
+import Development.Shake
+import Development.Shake.FilePath
+import Examples.Util
+import Data.Char
+import Data.List
+import Data.Maybe
+
+
+reps from to = map (\x -> if x == from then to else x)
+
+main = shaken noTest $ \args obj -> do
+ let index = "dist/doc/html/shake/index.html"
+ want [obj "Success.txt"]
+
+ want $ map (\x -> fromMaybe (obj x) $ stripPrefix "!" x) args
+
+ index *> \_ -> do
+ xs <- getDirectoryFiles "Development" ["//*.hs"]
+ need $ map ("Development" ) xs
+ system' "cabal" ["haddock"]
+
+ obj "Paths_shake.hs" *> \out -> do
+ copyFile' "Paths.hs" out
+
+ obj "Part_*.hs" *> \out -> do
+ need ["Examples/Test/Docs.hs"] -- so much of the generator is in this module
+ src <- readFile' $ "dist/doc/html/shake/" ++ reps '_' '-' (drop 5 $ takeBaseName out) ++ ".html"
+ let f i (Stmt x) = restmt i $ map undefDots x
+ f i (Expr x) | x `elem` types = ["type Expr_" ++ show i ++ " = " ++ x]
+ | otherwise = ["expr_" ++ show i ++ " = (" ++ undefDots x2 ++ ")" | let x2 = trim $ dropComment x, not $ whitelist x2]
+ code = concat $ zipWith f [1..] (nub $ findCode src)
+ (imports,rest) = partition ("import " `isPrefixOf`) code
+ writeFileLines out $
+ ["{-# LANGUAGE ConstraintKinds, DeriveDataTypeable, ExtendedDefaultRules, GeneralizedNewtypeDeriving, NoMonomorphismRestriction #-}"
+ ,"module " ++ takeBaseName out ++ "() where"
+ ,"import Control.Concurrent"
+ ,"import Data.Char"
+ ,"import Data.Data"
+ ,"import Data.List"
+ ,"import Data.Monoid"
+ ,"import Development.Shake"
+ ,"import Development.Shake.Classes"
+ ,"import System.Console.GetOpt"
+ ,"import System.Exit"
+ ,"import System.IO"
+ ,"import " ++ reps '_' '.' (drop 5 $ takeBaseName out)
+ ] ++
+ imports ++
+ ["(==>) :: Bool -> Bool -> Bool"
+ ,"(==>) = undefined"
+ ,"infix 1 ==>"
+ ,"forAll f = f undefined"
+ ,"remaining = 1.1"
+ ,"done = 1.1"
+ ,"time_elapsed = 1.1"
+ ,"old = \"\""
+ ,"new = \"\""
+ ,"myfile = \"\""
+ ,"opts = shakeOptions"
+ ,"result = undefined :: IO (Maybe (Rules ()))"
+ ,"instance Eq (OptDescr a)"
+ ,"inputs = [\"\"]"
+ ,"output = \"\""
+ ] ++
+ rest
+
+ obj "Main.hs" *> \out -> do
+ need [index,obj "Paths_shake.hs"]
+ files <- getDirectoryFiles "dist/doc/html/shake" ["Development-*.html"]
+ files <- return $ filter (not . isSuffixOf "-Classes.html") files
+ let mods = map ((++) "Part_" . reps '-' '_' . takeBaseName) files
+ need [obj m <.> "hs" | m <- mods]
+ writeFileLines out $ ["module Main(main) where"] ++ ["import " ++ m | m <- mods] ++ ["main = return ()"]
+
+ obj "Success.txt" *> \out -> do
+ need [obj "Main.hs"]
+ system' "runhaskell" ["-hide-package=hashmap","-i" ++ obj "",obj "Main.hs"]
+ writeFile' out ""
+
+
+data Code = Stmt [String] | Expr String deriving (Show,Eq)
+
+findCode :: String -> [Code]
+findCode x | Just x <- stripPrefix "" x = f (Stmt . shift . lines . strip) "
" x
+ | Just x <- stripPrefix "" x = f (Expr . strip) "" x
+ where
+ f ctor end x | Just x <- stripPrefix end x = ctor "" : findCode x
+ f ctor end (x:xs) = f (ctor . (x:)) end xs
+findCode (x:xs) = findCode xs
+findCode [] = []
+
+trim = reverse . dropWhile isSpace . reverse . dropWhile isSpace
+
+restmt i ("":xs) = restmt i xs
+restmt i (x:xs) | " ?== " `isInfixOf` x || " == " `isInfixOf` x =
+ zipWith (\j x -> "hack_" ++ show i ++ "_" ++ show j ++ " = " ++ x) [1..] (x:xs)
+restmt i (x:xs) | " = " `isInfixOf` x || " | " `isInfixOf` x ||
+ "import " `isPrefixOf` x || "infix" `isPrefixOf` x || "instance " `isPrefixOf` x = map f $ x:xs
+ where f x = if takeWhile (not . isSpace) x `elem` dupes then "_" ++ show i ++ "_" ++ x else x
+restmt i xs = ("stmt_" ++ show i ++ " = do") : map (" " ++) xs
+
+
+shift :: [String] -> [String]
+shift xs | all null xs = xs
+ | all (\x -> null x || " " `isPrefixOf` x) xs = shift $ map (drop 1) xs
+ | otherwise = xs
+
+
+dropComment ('-':'-':_) = []
+dropComment xs = onTail dropComment xs
+
+undefDots ('.':'.':'.':xs) = "undefined" ++ (if "..." `isSuffixOf` xs then "" else undefDots xs)
+undefDots xs = onTail undefDots xs
+
+strip :: String -> String
+strip ('<':xs) = strip $ drop 1 $ dropWhile (/= '>') xs
+strip ('&':xs)
+ | Just xs <- stripPrefix "quot;" xs = '\"' : strip xs
+ | Just xs <- stripPrefix "lt;" xs = '<' : strip xs
+ | Just xs <- stripPrefix "gt;" xs = '>' : strip xs
+ | Just xs <- stripPrefix "amp;" xs = '&' : strip xs
+strip xs = onTail strip xs
+
+onTail f (x:xs) = x : f xs
+onTail f [] = []
+
+
+whitelist :: String -> Bool
+whitelist x | takeExtension x `elem` words ".txt .hi .o .exe .tar .cpp" = True
+whitelist x | elem x $ words $
+ "newtype do MyFile.txt.digits excel a q value key gcc make contents tar ghc cabal clean _make distcc ghc " ++
+ ".. /./ /.. ./ // \\ ../ " ++
+ "ConstraintKinds GeneralizedNewtypeDeriving DeriveDataTypeable SetConsoleTitle " ++
+ ".make/i586-linux-gcc/output _make/.database foo/.. " ++
+ "-threaded Function extension $OUT $PATH xterm $TERM main opts result flagValues argValues "
+ = True
+whitelist x = x `elem`
+ ["[Foo.hi, Foo.o]"
+ ,"main -j6"
+ ,"main clean"
+ ,"1m25s (15%)"
+ ,"getPkgVersion $ GhcPkgVersion \"shake\""
+ ,"# command-name file-name"
+ ]
+
+types = words $
+ "MVar IO Monad Monoid String FilePath Data [String] Eq Typeable Char ExitCode " ++
+ "Action Resource Assume FilePattern Verbosity Rules Rule CmdOption CmdResult"
+
+dupes = words "main progressSimple rules"
diff --git a/Examples/Test/FilePath.hs b/Examples/Test/FilePath.hs
--- a/Examples/Test/FilePath.hs
+++ b/Examples/Test/FilePath.hs
@@ -15,3 +15,16 @@
normalise "../../foo" === "../../foo"
normalise "foo/bar/../../neil" === "neil"
normalise "foo/../bar/../neil" === "neil"
+
+ dropDirectory1 "aaa/bbb" === "bbb"
+ dropDirectory1 "aaa/" === ""
+ dropDirectory1 "aaa" === ""
+ dropDirectory1 "" === ""
+
+ takeDirectory1 "aaa/bbb" === "aaa"
+ takeDirectory1 "aaa/" === "aaa"
+ takeDirectory1 "aaa" === "aaa"
+
+ combine "aaa/bbb" "ccc" === "aaa/bbb/ccc"
+ combine "aaa/bbb" "./ccc" === "aaa/bbb/ccc"
+ combine "aaa/bbb" "../ccc" === "aaa/ccc"
diff --git a/Examples/Test/Makefile.hs b/Examples/Test/Makefile.hs
new file mode 100644
--- /dev/null
+++ b/Examples/Test/Makefile.hs
@@ -0,0 +1,31 @@
+
+module Examples.Test.Makefile(main) where
+
+import Development.Shake(action, liftIO)
+import Development.Shake.FilePath
+import qualified Development.Make.Main as Makefile
+import System.Environment
+import System.Directory
+import Examples.Util
+import Control.Monad
+import Data.List
+import Data.Maybe
+
+
+main = shaken test $ \args obj ->
+ action $ liftIO $ do
+ withArgs [fromMaybe x $ stripPrefix "@" x | x <- args] Makefile.main
+
+
+test build obj = do
+ let copyTo from to = do
+ xs <- getDirectoryContents from
+ createDirectoryIfMissing True (obj to)
+ forM_ xs $ \x ->
+ when (not $ all (== '.') x) $
+ copyFile (from x) (obj to x)
+
+ copyTo "Examples/MakeTutor" "MakeTutor"
+ build ["--directory=" ++ obj "MakeTutor","--no-report"]
+ build ["--directory=" ++ obj "MakeTutor","--no-report"]
+ build ["--directory=" ++ obj "MakeTutor","@clean","--no-report"]
diff --git a/Examples/Test/Progress.hs b/Examples/Test/Progress.hs
--- a/Examples/Test/Progress.hs
+++ b/Examples/Test/Progress.hs
@@ -16,10 +16,9 @@
progEx :: Double -> [Double] -> IO [Double]
progEx mxDone todo = do
- let scale = 100 -- Use scale so we can run the test faster
let resolution = 10000 -- Use resolution to get extra detail on the numbers
let done = scanl (+) 0 $ map (min mxDone . max 0) $ zipWith (-) todo (tail todo)
- pile <- newIORef $ zipWith (\t d -> mempty{timeBuilt=d,timeTodo=(t*scale*resolution,0)}) todo done
+ pile <- newIORef $ tail $ zipWith (\t d -> mempty{timeBuilt=d*resolution,timeTodo=(t*resolution,0)}) todo done
let get = do a <- readIORef pile
case a of
[] -> return mempty{isRunning=False}
@@ -29,7 +28,7 @@
let put x = do let (mins,secs) = break (== 'm') $ takeWhile (/= '(') x
let f x = let y = filter isDigit x in if null y then 0/0 else read y
modifyIORef out (++ [(if null secs then f mins else f mins * 60 + f secs) / resolution])
- progressDisplay (1/scale) put get
+ progressDisplayTester resolution put get
fmap (take $ length todo) $ readIORef out
@@ -43,11 +42,11 @@
let dp3 x = fromIntegral (round $ x * 1000 :: Int) / 1000
map dp3 (drop 2 xs) === [8,7..1]
- -- The properties below this line could be weakened
+ -- The properties below this line could be weakened
-- increasing functions can't match
xs <- prog [5,6,7]
- last xs === 700 -- because of the scale issues
+ last xs === 7
-- the first value must be plausible, or missing
xs <- prog [187]
@@ -59,3 +58,10 @@
xs <- progEx 1 $ [10,9,100,8,7,6,5,4,3,2,1]
assert (all (<= 1.5) $ map abs $ zipWith (-) (drop 5 xs) [6,5..1]) "Close"
+ -- if no progress is made, don't keep the time going up
+ xs <- prog [10,9,8,7,7,7,7,7]
+ drop 5 xs === [7,7,7]
+
+ -- if the work rate changes, should somewhat reflect that
+ xs <- prog [10,9,8,7,6.5,6,5.5,5]
+ assert (last xs > 7.1) "Some discounting (factor=0 would give 7)"
diff --git a/Examples/Util.hs b/Examples/Util.hs
--- a/Examples/Util.hs
+++ b/Examples/Util.hs
@@ -90,6 +90,11 @@
got <- readFile file
assert (want == got) $ "File contents are wrong: " ++ file ++ "\nWANT: " ++ want ++ "\nGOT: " ++ got
+assertContentsInfix :: FilePath -> String -> IO ()
+assertContentsInfix file want = do
+ got <- readFile file
+ assert (want `isInfixOf` got) $ "File contents are wrong: " ++ file ++ "\nWANT (anywhere): " ++ want ++ "\nGOT: " ++ got
+
noTest :: ([String] -> IO ()) -> (String -> String) -> IO ()
noTest build obj = do
diff --git a/Main.hs b/Main.hs
--- a/Main.hs
+++ b/Main.hs
@@ -1,93 +1,4 @@
-module Main(main) where
-import Control.Concurrent
-import Control.Exception
-import Control.Monad
-import Data.List
-import Data.Maybe
-import System.Environment
-
-import Examples.Util(sleepFileTime)
-import qualified Examples.Tar.Main as Tar
-import qualified Examples.Self.Main as Self
-import qualified Examples.C.Main as C
-import qualified Examples.Test.Assume as Assume
-import qualified Examples.Test.Basic as Basic
-import qualified Examples.Test.Benchmark as Benchmark
-import qualified Examples.Test.Cache as Cache
-import qualified Examples.Test.Directory as Directory
-import qualified Examples.Test.Errors as Errors
-import qualified Examples.Test.Files as Files
-import qualified Examples.Test.FilePath as FilePath
-import qualified Examples.Test.FilePattern as FilePattern
-import qualified Examples.Test.Journal as Journal
-import qualified Examples.Test.Lint as Lint
-import qualified Examples.Test.Oracle as Oracle
-import qualified Examples.Test.Pool as Pool
-import qualified Examples.Test.Progress as Progress
-import qualified Examples.Test.Random as Random
-import qualified Examples.Test.Resources as Resources
-
-import qualified Development.Make.Main as Makefile
-
-
-fakes = ["clean" * clean, "test" * test, "makefile" * makefile]
- where (*) = (,)
-
-mains = ["tar" * Tar.main, "self" * Self.main, "c" * C.main
- ,"basic" * Basic.main, "cache" * Cache.main, "directory" * Directory.main, "errors" * Errors.main
- ,"filepath" * FilePath.main, "filepattern" * FilePattern.main, "files" * Files.main
- ,"journal" * Journal.main, "lint" * Lint.main, "pool" * Pool.main, "random" * Random.main
- ,"resources" * Resources.main, "assume" * Assume.main, "benchmark" * Benchmark.main
- ,"oracle" * Oracle.main, "progress" * Progress.main]
- where (*) = (,)
-
-
-main :: IO ()
-main = do
- xs <- getArgs
- case flip lookup (fakes ++ mains) =<< listToMaybe xs of
- Nothing -> putStrLn $ unlines
- ["Welcome to the Shake demo"
- ,""
- ,unwords $ "Modes:" : map fst fakes
- ,unwords $ "Demos:" : map fst mains
- ,""
- ,"As an example, try:"
- ,""
- ," main self --threads2 --loud"
- ,""
- ,"Which will build Shake, using Shake, on 2 threads."]
- Just main -> main sleepFileTime
-
-
-makefile :: IO () -> IO ()
-makefile _ = do
- args <- getArgs
- withArgs (drop 1 args) Makefile.main
-
-
-clean :: IO () -> IO ()
-clean extra = sequence_ [withArgs [name,"clean"] $ main extra | (name,main) <- mains]
-
+module Main(main) where
-test :: IO () -> IO ()
-test _ = do
- args <- getArgs
- one <- newMVar () -- Only one may execute at a time
- let pause = do putMVar one (); sleepFileTime; takeMVar one
- let tests = filter ((/= "random") . fst) mains
- -- priority tests have more pauses in, so doing them sooner gets the whole tests done faster
- self <- myThreadId
- let (priority,normal) = partition (flip elem ["assume","journal"] . fst) tests
- (dones,threads) <- fmap unzip $ forM (priority ++ normal) $ \(name,main) -> do
- done <- newEmptyMVar
- thread <- forkIO $ handleJust (guard . (/=) ThreadKilled) (const $ killThread self) $ do
- takeMVar one
- withArgs (name:"test":drop 1 args) $ main pause
- putMVar one ()
- putMVar done ()
- return (done, thread)
- onException (mapM_ takeMVar dones) $ do
- mapM_ killThread threads
- putStrLn "TESTS FAILED"
+import Development.Make.Main(main)
diff --git a/Test.hs b/Test.hs
new file mode 100644
--- /dev/null
+++ b/Test.hs
@@ -0,0 +1,94 @@
+
+module Main(main) where
+
+import Control.Exception
+import Control.Monad
+import Data.List
+import Data.Maybe
+import System.Environment
+import Development.Shake.Pool
+
+import Examples.Util(sleepFileTime)
+import qualified Examples.Tar.Main as Tar
+import qualified Examples.Self.Main as Self
+import qualified Examples.C.Main as C
+import qualified Examples.Test.Assume as Assume
+import qualified Examples.Test.Basic as Basic
+import qualified Examples.Test.Benchmark as Benchmark
+import qualified Examples.Test.Cache as Cache
+import qualified Examples.Test.Command as Command
+import qualified Examples.Test.Directory as Directory
+import qualified Examples.Test.Docs as Docs
+import qualified Examples.Test.Errors as Errors
+import qualified Examples.Test.Files as Files
+import qualified Examples.Test.FilePath as FilePath
+import qualified Examples.Test.FilePattern as FilePattern
+import qualified Examples.Test.Journal as Journal
+import qualified Examples.Test.Lint as Lint
+import qualified Examples.Test.Makefile as Makefile
+import qualified Examples.Test.Oracle as Oracle
+import qualified Examples.Test.Pool as Pool
+import qualified Examples.Test.Progress as Progress
+import qualified Examples.Test.Random as Random
+import qualified Examples.Test.Resources as Resources
+
+import qualified Development.Make.Main as Make
+
+
+fakes = ["clean" * clean, "test" * test, "make" * makefile]
+ where (*) = (,)
+
+mains = ["tar" * Tar.main, "self" * Self.main, "c" * C.main
+ ,"basic" * Basic.main, "cache" * Cache.main, "command" * Command.main, "directory" * Directory.main
+ ,"docs" * Docs.main, "errors" * Errors.main
+ ,"filepath" * FilePath.main, "filepattern" * FilePattern.main, "files" * Files.main
+ ,"journal" * Journal.main, "lint" * Lint.main, "makefile" * Makefile.main
+ ,"pool" * Pool.main, "random" * Random.main
+ ,"resources" * Resources.main, "assume" * Assume.main, "benchmark" * Benchmark.main
+ ,"oracle" * Oracle.main, "progress" * Progress.main]
+ where (*) = (,)
+
+
+main :: IO ()
+main = do
+ xs <- getArgs
+ case flip lookup (fakes ++ mains) =<< listToMaybe xs of
+ Nothing -> putStrLn $ unlines
+ ["Welcome to the Shake demo"
+ ,""
+ ,unwords $ "Modes:" : map fst fakes
+ ,unwords $ "Demos:" : map fst mains
+ ,""
+ ,"As an example, try:"
+ ,""
+ ," main self --threads2 --loud"
+ ,""
+ ,"Which will build Shake, using Shake, on 2 threads."]
+ Just main -> main sleepFileTime
+
+
+makefile :: IO () -> IO ()
+makefile _ = do
+ args <- getArgs
+ withArgs (drop 1 args) Make.main
+
+
+clean :: IO () -> IO ()
+clean extra = sequence_ [withArgs [name,"clean"] $ main extra | (name,main) <- mains]
+
+
+test :: IO () -> IO ()
+test _ = do
+ args <- getArgs
+ let tests = filter ((/= "random") . fst) mains
+ let (priority,normal) = partition (flip elem ["assume","journal"] . fst) tests
+ flip onException (putStrLn "TESTS FAILED") $
+ execute sleepFileTime [\pause -> withArgs (name:"test":drop 1 args) $ test pause | (name,test) <- priority ++ normal]
+
+
+-- | Execute each item in the list. They may yield (call the first parameter) in which case
+-- you must execute yield for each one of them.
+execute :: IO () -> [IO () -> IO ()] -> IO ()
+execute yield acts = runPool True 1 $ \pool -> do
+ let pause = blockPool pool $ yield >> return (False,())
+ forM_ acts $ \act -> addPool pool $ act pause
diff --git a/html/shake-ui.js b/html/shake-ui.js
--- a/html/shake-ui.js
+++ b/html/shake-ui.js
@@ -218,13 +218,23 @@
data.push([j, x[j]]);
ys.push({label:s, values:x, data:data, color:xs[s].back, avg:sum(x) / x.length});
}
- ys.sort(function(a,b){return a.avg - b.avg;});
- showPlot(ys, {
- legend: {show:true, position:"nw"},
- series: {stack:true, lines:{lineWidth:0,fill:1}},
- yaxis: {min:0},
- xaxis: {tickFormatter: function (i){return showTime(shakeSummary.maxTraceStopLast * i / 100);}}
- });
+ if (ys.length === 0)
+ {
+ $("#output").html("No data found, " +
+ (shakeEx.summary.countTraceLast === 0
+ ? "there were no traced commands in the last run."
+ : "perhaps your filter is too restrictive?"));
+ }
+ else
+ {
+ ys.sort(function(a,b){return a.avg - b.avg;});
+ showPlot(ys, {
+ legend: {show:true, position:"nw", sorted:"reverse"},
+ series: {stack:true, lines:{lineWidth:0,fill:1}},
+ yaxis: {min:0},
+ xaxis: {tickFormatter: function (i){return showTime(shakeSummary.maxTraceStopLast * i / 100);}}
+ });
+ }
break;
case "cmd-table":
@@ -238,7 +248,7 @@
case "rule-graph":
var xs = ruleGraph(shakeEx, report.query);
if (xs.length > 250)
- $("#output").html("Cannot view graph with > 250 nodes, try grouping more aggressively");
+ $("#output").html("Viewing a graph with > 250 nodes is not supported, and you have " + xs.length + " nodes. Try grouping more aggressively");
else
{
var res = "digraph \"\"{";
diff --git a/shake.cabal b/shake.cabal
--- a/shake.cabal
+++ b/shake.cabal
@@ -1,7 +1,7 @@
cabal-version: >= 1.8
build-type: Simple
name: shake
-version: 0.10.1
+version: 0.10.2
license: BSD3
license-file: LICENSE
category: Development
@@ -43,6 +43,10 @@
Examples/C/constants.c
Examples/C/constants.h
Examples/C/main.c
+ Examples/MakeTutor/Makefile
+ Examples/MakeTutor/hellofunc.c
+ Examples/MakeTutor/hellomake.c
+ Examples/MakeTutor/hellomake.h
Examples/Tar/list.txt
Paths.hs
@@ -76,7 +80,7 @@
hashable >= 1.1.2.3 && < 1.3,
binary,
filepath,
- process,
+ process >= 1.1,
unordered-containers (>= 0.1.4.3 && < 0.2) || (>= 0.2.1 && < 0.3),
bytestring,
time,
@@ -93,6 +97,7 @@
exposed-modules:
Development.Shake
Development.Shake.Classes
+ Development.Shake.Command
Development.Shake.FilePath
Development.Shake.Sys
@@ -123,8 +128,7 @@
executable shake
- main-is: Development/Make/Main.hs
- ghc-options: -main-is Development.Make.Main
+ main-is: Main.hs
build-depends:
base == 4.*,
old-time,
@@ -148,13 +152,14 @@
other-modules:
Development.Make.Env
+ Development.Make.Main
Development.Make.Parse
Development.Make.Rules
Development.Make.Type
executable shake-test
- main-is: Main.hs
+ main-is: Test.hs
if flag(testprog)
buildable: True
else
@@ -194,13 +199,16 @@
Examples.Test.Basic
Examples.Test.Benchmark
Examples.Test.Cache
+ Examples.Test.Command
Examples.Test.Directory
+ Examples.Test.Docs
Examples.Test.Errors
Examples.Test.FilePath
Examples.Test.FilePattern
Examples.Test.Files
Examples.Test.Journal
Examples.Test.Lint
+ Examples.Test.Makefile
Examples.Test.Oracle
Examples.Test.Pool
Examples.Test.Progress