[Add --help and --version to all executables, and bump the version to 1.20.2.
Malcolm.Wallace@cs.york.ac.uk**20100114162524
 Ignore-this: c48b6eaf67e73b3ca014fce72140ebff
] {
hunk ./HaXml.cabal 2
-version:	1.20.1
+version:	1.20.2
hunk ./HaXml.cabal 65
-  cpp-options: -DVERSION=1.20.1
+  cpp-options: -DMYVERSION="1.20.2"
hunk ./HaXml.cabal 72
+  cpp-options: -DMYVERSION="1.20.2"
hunk ./HaXml.cabal 79
+  cpp-options: -DMYVERSION="1.20.2"
hunk ./HaXml.cabal 86
+  cpp-options: -DMYVERSION="1.20.2"
hunk ./HaXml.cabal 93
+  cpp-options: -DMYVERSION="1.20.2"
hunk ./HaXml.cabal 100
+  cpp-options: -DMYVERSION="1.20.2"
hunk ./HaXml.cabal 107
+  cpp-options: -DMYVERSION="1.20.2"
hunk ./HaXml.cabal 114
+  cpp-options: -DMYVERSION="1.20.2"
hunk ./Makefile 2
-VERSION  = 1.20.1
+VERSION  = 1.20.2
hunk ./Makefile 93
-		do $(CPP) -D__NHC__=120 $$file >$$file.uncpp.hs; \
+		do $(CPP) -D__NHC__=120 -DMYVERSION="\"$(VERSION)\"" $$file >$$file.uncpp.hs; \
hunk ./configure 5
-VERSION="1.20.1"
+VERSION="1.20.2"
hunk ./docs/changelog.html 16
-<h3>Changes in 1.20.1</h3>
-<p>
-<ul>
-<li> Fixes a stack-overflow in code generated by DtdToHaskell.
-</ul>
-
hunk ./docs/changelog.html 23
+<li> 1.20.1 fixes a stack-overflow in code generated by DtdToHaskell.
+<li> 1.20.2 adds a --version and --help argument to all executables.
hunk ./docs/index.html 134
-HaXml-1.20.1, release date 2010.01.13<br>
+HaXml-1.20.2, release date 2010.01.14<br>
hunk ./docs/index.html 137
-<a href="HaXml-1.20.1.tar.gz">.tar.gz</a>,
-<a href="HaXml-1.20.1.zip">.zip</a>.
+<a href="HaXml-1.20.2.tar.gz">.tar.gz</a>,
+<a href="HaXml-1.20.2.zip">.zip</a>.
hunk ./docs/index.html 161
-    cabal install HaXml-1.20.1
+    cabal install HaXml
+</pre>
+or
+<pre>
+    cabal install HaXml-1.20.2
hunk ./docs/index.html 199
+Version 1.20.2 adds --version and --help arguments to all executables.<br>
hunk ./src/Makefile 2
-VERSION = 1.20.1
+VERSION = 1.20.2
hunk ./src/Text/XML/HaXml.hs 1
+{-# LANGUAGE CPP #-}
hunk ./src/Text/XML/HaXml.hs 36
-version  = "VERSION"
+version  = MYVERSION
hunk ./src/Text/XML/HaXml/Wrappers.hs 1
+{-# LANGUAGE CPP #-}
+#define dummy		-- just to ensure that cpp gets called on this file
hunk ./src/Text/XML/HaXml/Wrappers.hs 14
+import Control.Monad (when)
hunk ./src/Text/XML/HaXml/Wrappers.hs 32
+  when ("--version" `elem` args) $ do
+      putStrLn $ "part of HaXml-"++MYVERSION
+      exitWith ExitSuccess
+  when ("--help" `elem` args) $ do
+      putStrLn $ "See http://haskell.org/HaXml"
+      exitWith ExitSuccess
hunk ./src/tools/DtdToHaskell.hs 12
+import Control.Monad
hunk ./src/tools/DtdToHaskell.hs 15
+import Text.XML.HaXml            (version)
hunk ./src/tools/DtdToHaskell.hs 27
+  when ("--version" `elem` args) $ do
+      putStrLn $ "part of HaXml-"++version
+      exitWith ExitSuccess
+  when ("--help" `elem` args) $ do
+      putStrLn $ "See http://haskell.org/HaXml"
+      exitWith ExitSuccess
hunk ./src/tools/MkOneOf.hs 4
-import System (getArgs)
+import System (getArgs,exitWith,ExitCode(..))
hunk ./src/tools/MkOneOf.hs 7
+import Control.Monad  (when)
+import Text.XML.HaXml (version)
hunk ./src/tools/MkOneOf.hs 13
+    when ("--version" `elem` args) $ do
+        putStrLn $ "part of HaXml-"++version
+        exitWith ExitSuccess
+    when ("--help" `elem` args) $ do
+        putStrLn $ "See http://haskell.org/HaXml"
+        exitWith ExitSuccess
hunk ./src/tools/Xtract.hs 9
+import Control.Monad(when)
hunk ./src/tools/Xtract.hs 11
+import Text.XML.HaXml               (version)
hunk ./src/tools/Xtract.hs 27
-main =
-  getArgs >>= \args->
-  if length args < 1 then
-    putStrLn "Usage: Xtract [-n] <pattern> [xmlfile ...]" >>
-    exitWith (ExitFailure 1)
-  else
-    let (pattern,files,esc) =
+main = do
+  args <- getArgs
+  when ("--version" `elem` args) $ do
+      putStrLn $ "part of HaXml-"++version
+      exitWith ExitSuccess
+  when ("--help" `elem` args) $ do
+      putStrLn $ "See http://haskell.org/HaXml"
+      exitWith ExitSuccess
+  when (length args < 1) $ do
+      putStrLn "Usage: Xtract [-n] <pattern> [xmlfile ...]"
+      exitWith (ExitFailure 1)
+  let (pattern,files,esc) =
hunk ./src/tools/Xtract.hs 48
-    in
hunk ./src/tools/Xtract.hs 51
-    mapM_ (\x-> do c <- (if x=="-" then getContents else readFile x)
+  mapM_ (\x->   do c <- (if x=="-" then getContents else readFile x)
hunk ./src/tools/XtractLazy.hs 9
+import Control.Monad(when)
hunk ./src/tools/XtractLazy.hs 11
+import Text.XML.HaXml               (version)
hunk ./src/tools/XtractLazy.hs 26
-main =
-  getArgs >>= \args->
-  if length args < 1 then
-    putStrLn "Usage: Xtract [-n] <pattern> [xmlfile ...]" >>
-    exitWith (ExitFailure 1)
-  else
-    let (pattern,files,esc) =
+main = do
+  args <- getArgs
+  when ("--version" `elem` args) $ do
+      putStrLn $ "part of HaXml-"++version
+      exitWith ExitSuccess
+  when ("--help" `elem` args) $ do
+      putStrLn $ "See http://haskell.org/HaXml"
+      exitWith ExitSuccess
+
+  when (length args < 1) $ do
+      putStrLn "Usage: Xtract [-n] <pattern> [xmlfile ...]"
+      exitWith (ExitFailure 1)
+
+  let (pattern,files,esc) =
hunk ./src/tools/XtractLazy.hs 49
-    in
hunk ./src/tools/XtractLazy.hs 52
-    mapM_ (\x-> do c <- (if x=="-" then getContents else readFile x)
+  mapM_ (\x->   do c <- (if x=="-" then getContents else readFile x)
hunk ./src/tools/flattenXMLtoCSV.hs 23
+  when ("--version" `elem` args) $ do
+      putStrLn $ "part of HaXml-"++version
+      exitWith ExitSuccess
+  when ("--help" `elem` args) $ do
+      putStrLn $ "See http://haskell.org/HaXml"
+      exitWith ExitSuccess
+
}