Major cleanup

jaspervdj · Mar 26, 2012 · 24b17ae · 24b17ae
1 parent 90bc6a5
commit 24b17ae
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,17 +25,17 @@ website/_cache
 website/docs
 website/hakyll
 
-Text/Blaze/Html4/FrameSet.hs
-Text/Blaze/Html4/FrameSet/Attributes.hs
-Text/Blaze/Html4/Strict.hs
-Text/Blaze/Html4/Strict/Attributes.hs
-Text/Blaze/Html4/Transitional.hs
-Text/Blaze/Html4/Transitional/Attributes.hs
-Text/Blaze/Html5.hs
-Text/Blaze/Html5/Attributes.hs
-Text/Blaze/XHtml1/FrameSet.hs
-Text/Blaze/XHtml1/FrameSet/Attributes.hs
-Text/Blaze/XHtml1/Strict.hs
-Text/Blaze/XHtml1/Strict/Attributes.hs
-Text/Blaze/XHtml1/Transitional.hs
-Text/Blaze/XHtml1/Transitional/Attributes.hs
+src/Text/Blaze/Html4/FrameSet.hs
+src/Text/Blaze/Html4/FrameSet/Attributes.hs
+src/Text/Blaze/Html4/Strict.hs
+src/Text/Blaze/Html4/Strict/Attributes.hs
+src/Text/Blaze/Html4/Transitional.hs
+src/Text/Blaze/Html4/Transitional/Attributes.hs
+src/Text/Blaze/Html5.hs
+src/Text/Blaze/Html5/Attributes.hs
+src/Text/Blaze/XHtml1/FrameSet.hs
+src/Text/Blaze/XHtml1/FrameSet/Attributes.hs
+src/Text/Blaze/XHtml1/Strict.hs
+src/Text/Blaze/XHtml1/Strict/Attributes.hs
+src/Text/Blaze/XHtml1/Transitional.hs
+src/Text/Blaze/XHtml1/Transitional/Attributes.hs
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,3 @@
+language: haskell
+before_script:
+  - "cabal install HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2"
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ BENCHMARK_FLAGS = --resamples 10000
 
 # Generate the actual HTML combinators
 combinators:
-	runghc Util/GenerateHtmlCombinators.hs
+	runghc -isrc src/Util/GenerateHtmlCombinators.hs
 
 # Copy the docs the website directory
 website-docs:

diff --git a/blaze-from-html.cabal.blaze-from-html b/blaze-from-html.cabal.blaze-from-html
@@ -15,8 +15,9 @@ Build-type:    Simple
 Cabal-version: >= 1.6
 
 Executable blaze-from-html
-  Ghc-Options: -Wall
-  Main-Is:     Util/BlazeFromHtml.hs
+  Ghc-Options:    -Wall
+  Hs-source-dirs: src
+  Main-Is:        Util/BlazeFromHtml.hs
 
   Other-Modules:
     Util.GenerateHtmlCombinators

diff --git a/blaze-html.cabal b/blaze-html.cabal
@@ -15,15 +15,16 @@ Description:
   starting point, as well as this tutorial:
   <http://jaspervdj.be/blaze/tutorial.html>.
 
-Build-type:          Simple
-Cabal-version:       >=1.6
+Build-type:    Simple
+Cabal-version: >=1.6
 
 Extra-source-files:  
-  Util/Sanitize.hs
-  Util/GenerateHtmlCombinators.hs
+  src/Util/Sanitize.hs
+  src/Util/GenerateHtmlCombinators.hs
 
 Library
-  Ghc-Options:       -Wall
+  Hs-source-dirs: src
+  Ghc-Options:    -Wall
 
   Exposed-modules:
     Text.Blaze
@@ -48,10 +49,29 @@ Library
     Text.Blaze.XHtml1.Transitional.Attributes
 
   Build-depends:
-    base          >= 4 && < 5,
-    blaze-builder >= 0.2 && < 0.4,
-    text          >= 0.10,
-    bytestring    >= 0.9
+    base          >= 4    && < 5,
+    blaze-builder >= 0.2  && < 0.4,
+    text          >= 0.10 && < 0.12,
+    bytestring    >= 0.9  && < 0.10
+
+Test-suite websockets-tests
+  Type:           exitcode-stdio-1.0
+  Hs-source-dirs: src tests
+  Main-is:        TestSuite.hs
+  Ghc-options:    -Wall
+
+  Build-depends:
+    HUnit                      >= 1.2 && < 1.3,
+    QuickCheck                 >= 2.4 && < 2.5,
+    containers                 >= 0.3 && < 0.5,
+    test-framework             >= 0.4 && < 0.7,
+    test-framework-hunit       >= 0.2 && < 0.3,
+    test-framework-quickcheck2 >= 0.2 && < 0.3,
+    -- Copied from regular dependencies...
+    base          >= 4    && < 5,
+    blaze-builder >= 0.2  && < 0.4,
+    text          >= 0.10 && < 0.12,
+    bytestring    >= 0.9  && < 0.10
 
 Source-repository head
   Type:     git

diff --git a/Util/format-benchmarks.awk → script/format-benchmarks.awk b/Util/format-benchmarks.awk → script/format-benchmarks.awk
diff --git a/Util/get-tags.sh → script/get-tags.sh b/Util/get-tags.sh → script/get-tags.sh
diff --git a/Text/Blaze.hs → src/Text/Blaze.hs b/Text/Blaze.hs → src/Text/Blaze.hs
diff --git a/Text/Blaze/Internal.hs → src/Text/Blaze/Internal.hs b/Text/Blaze/Internal.hs → src/Text/Blaze/Internal.hs
diff --git a/Text/Blaze/Renderer/Pretty.hs → src/Text/Blaze/Renderer/Pretty.hs b/Text/Blaze/Renderer/Pretty.hs → src/Text/Blaze/Renderer/Pretty.hs
diff --git a/Text/Blaze/Renderer/String.hs → src/Text/Blaze/Renderer/String.hs b/Text/Blaze/Renderer/String.hs → src/Text/Blaze/Renderer/String.hs
diff --git a/Text/Blaze/Renderer/Text.hs → src/Text/Blaze/Renderer/Text.hs b/Text/Blaze/Renderer/Text.hs → src/Text/Blaze/Renderer/Text.hs
diff --git a/Text/Blaze/Renderer/Utf8.hs → src/Text/Blaze/Renderer/Utf8.hs b/Text/Blaze/Renderer/Utf8.hs → src/Text/Blaze/Renderer/Utf8.hs
diff --git a/Util/BlazeFromHtml.hs → src/Util/BlazeFromHtml.hs b/Util/BlazeFromHtml.hs → src/Util/BlazeFromHtml.hs
diff --git a/Util/GenerateHtmlCombinators.hs → src/Util/GenerateHtmlCombinators.hs b/Util/GenerateHtmlCombinators.hs → src/Util/GenerateHtmlCombinators.hs
@@ -103,7 +103,7 @@ writeHtmlVariant htmlVariant = do
         , unlines (map makeAttribute sortedAttributes)
         ]
   where
-    basePath = "Text" </> "Blaze" </> foldl1 (</>) version'
+    basePath  = "src" </> "Text" </> "Blaze" </> foldl1 (</>) version'
     modulName = getModuleName htmlVariant
     attributeModuleName = getAttributeModuleName htmlVariant
     attributes' = attributes htmlVariant

diff --git a/Util/Sanitize.hs → src/Util/Sanitize.hs b/Util/Sanitize.hs → src/Util/Sanitize.hs
diff --git a/tests/TestSuite.hs b/tests/TestSuite.hs
@@ -1,6 +1,6 @@
 -- | Main module to run all tests.
 --
-module TestSuite where
+module Main where
 
 import Test.Framework (defaultMain, testGroup)