summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolmWallace <>2011-08-11 15:04:35 (GMT)
committerLuite Stegeman <luite@luite.com>2011-08-11 15:04:35 (GMT)
commitcab8c6a409f7d29584cc3bf7be54abceb844f0f0 (patch)
tree8ebc678f41e864053de882e53be7c7742593cbc9
parentf3b29941d1590e4a8bba8772b8d421b5fc46f2e3 (diff)
version 1.22.41.22.4
-rw-r--r--HaXml.cabal18
-rw-r--r--src/Text/XML/HaXml.hs2
-rw-r--r--src/Text/XML/HaXml/Schema/Schema.hs2
-rw-r--r--src/Text/XML/HaXml/Wrappers.hs2
4 files changed, 12 insertions, 12 deletions
diff --git a/HaXml.cabal b/HaXml.cabal
index a20e02e..4eb5e60 100644
--- a/HaXml.cabal
+++ b/HaXml.cabal
@@ -1,5 +1,5 @@
name: HaXml
-version: 1.22.3
+version: 1.22.4
license: LGPL
license-file: COPYRIGHT
author: Malcolm Wallace <Malcolm.Wallace@me.com>
@@ -75,54 +75,54 @@ library
else
build-depends: base < 2 || >= 3, bytestring
extensions: CPP, ExistentialQuantification
- cpp-options: -DMYVERSION="\"1.22\""
+ cpp-options: -DMAJOR=1 -DMINOR=22
nhc98-options: -K10M
Executable Canonicalise
GHC-Options: -Wall
Extensions: CPP
Hs-Source-Dirs: src/tools, src
- cpp-options: -DMYVERSION="\"1.22\""
+ cpp-options: -DMAJOR=1 -DMINOR=22
Main-Is: Canonicalise.hs
Executable CanonicaliseLazy
GHC-Options: -Wall
Extensions: CPP
Hs-Source-Dirs: src/tools, src
- cpp-options: -DMYVERSION="\"1.22\""
+ cpp-options: -DMAJOR=1 -DMINOR=22
Main-Is: CanonicaliseLazy.hs
Executable Xtract
GHC-Options: -Wall
Extensions: CPP
Hs-Source-Dirs: src/tools, src
- cpp-options: -DMYVERSION="\"1.22\""
+ cpp-options: -DMAJOR=1 -DMINOR=22
Main-Is: Xtract.hs
Executable Validate
GHC-Options: -Wall
Extensions: CPP
Hs-Source-Dirs: src/tools, src
- cpp-options: -DMYVERSION="\"1.22\""
+ cpp-options: -DMAJOR=1 -DMINOR=22
Main-Is: Validate.hs
Executable MkOneOf
GHC-Options: -Wall
Extensions: CPP
Hs-Source-Dirs: src/tools, src
- cpp-options: -DMYVERSION="\"1.22\""
+ cpp-options: -DMAJOR=1 -DMINOR=22
Main-Is: MkOneOf.hs
Executable DtdToHaskell
GHC-Options: -Wall
Extensions: CPP
Hs-Source-Dirs: src/tools, src
- cpp-options: -DMYVERSION="\"1.22\""
+ cpp-options: -DMAJOR=1 -DMINOR=22
Main-Is: DtdToHaskell.hs
Executable XsdToHaskell
GHC-Options: -Wall
Extensions: CPP
Hs-Source-Dirs: src/tools, src
- cpp-options: -DMYVERSION="\"1.22\""
+ cpp-options: -DMAJOR=1 -DMINOR=22
Main-Is: XsdToHaskell.hs
diff --git a/src/Text/XML/HaXml.hs b/src/Text/XML/HaXml.hs
index 542b637..fd80a32 100644
--- a/src/Text/XML/HaXml.hs
+++ b/src/Text/XML/HaXml.hs
@@ -33,5 +33,5 @@ import Text.PrettyPrint.HughesPJ (render)
-- | The version of the library.
version :: String
-version = "1.22"
+version = show MAJOR.MINOR
-- expect cpp to fill in value
diff --git a/src/Text/XML/HaXml/Schema/Schema.hs b/src/Text/XML/HaXml/Schema/Schema.hs
index 0c53210..14cb546 100644
--- a/src/Text/XML/HaXml/Schema/Schema.hs
+++ b/src/Text/XML/HaXml/Schema/Schema.hs
@@ -47,7 +47,7 @@ class SchemaType a where
-- | A type t can extend another type s by the addition of extra elements
-- and/or attributes. s is therefore the supertype of t.
-class Extension t s {- - | t -> s -} where -- fundep ill-advised.
+class Extension t s {- | t -> s -} where -- fundep ill-advised.
supertype :: t -> s
-- | A type t can restrict another type s, that is, t admits fewer values
diff --git a/src/Text/XML/HaXml/Wrappers.hs b/src/Text/XML/HaXml/Wrappers.hs
index d44e004..ead7b71 100644
--- a/src/Text/XML/HaXml/Wrappers.hs
+++ b/src/Text/XML/HaXml/Wrappers.hs
@@ -31,7 +31,7 @@ fix2Args :: IO (String,String)
fix2Args = do
args <- getArgs
when ("--version" `elem` args) $ do
- putStrLn $ "part of HaXml-"++show MYVERSION
+ putStrLn $ "part of HaXml-"++show MAJOR.MINOR
exitWith ExitSuccess
when ("--help" `elem` args) $ do
putStrLn $ "See http://haskell.org/HaXml"