Fix some release checks

Windows doesn’t allow »aux« directories, for example.
quchen · May 20, 2017 · 2ea5c40 · 2ea5c40
1 parent bc78400
commit 2ea5c40
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 14 deletions.
diff --git a/...rminal/aux/version-compatibility-macros.h → ...minal/misc/version-compatibility-macros.h b/...rminal/aux/version-compatibility-macros.h → ...minal/misc/version-compatibility-macros.h
diff --git a/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal.cabal b/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal.cabal
@@ -7,7 +7,7 @@ description:         See README.md
 license:             BSD2
 license-file:        LICENSE.md
 extra-source-files:  README.md
-                   , aux/version-compatibility-macros.h
+                   , misc/version-compatibility-macros.h
 author:              David Luposchainsky
 maintainer:          David Luposchainsky <dluposchainsky at google>
 bug-reports:         http://github.com/quchen/prettyprinter/issues
@@ -20,10 +20,10 @@ source-repository head
   location: git://github.com/quchen/prettyprinter.git
 
 library
-    exposed-modules: Data.Text.Prettyprint.Doc.Render.Terminal
-    ghc-options: -Wall
-    hs-source-dirs: src
-    include-dirs: aux
+    exposed-modules:  Data.Text.Prettyprint.Doc.Render.Terminal
+    ghc-options:      -Wall
+    hs-source-dirs:   src
+    include-dirs:     misc
     default-language: Haskell2010
     other-extensions:
           CPP

diff --git a/prettyprinter-ansi-terminal/test/Doctest/Main.hs b/prettyprinter-ansi-terminal/test/Doctest/Main.hs
@@ -3,4 +3,4 @@ module Main (main) where
 import Test.DocTest
 
 main :: IO ()
-main = doctest [ "src" , "-Iaux"]
+main = doctest [ "src" , "-Imisc"]
diff --git a/...pprint/aux/version-compatibility-macros.h → ...print/misc/version-compatibility-macros.h b/...pprint/aux/version-compatibility-macros.h → ...print/misc/version-compatibility-macros.h
diff --git a/prettyprinter-compat-annotated-wl-pprint/prettyprinter-compat-annotated-wl-pprint.cabal b/prettyprinter-compat-annotated-wl-pprint/prettyprinter-compat-annotated-wl-pprint.cabal
@@ -7,6 +7,7 @@ description:         See README.md
 license:             BSD2
 license-file:        LICENSE.md
 extra-source-files:  README.md
+                   , misc/version-compatibility-macros.h
 author:              Daan Leijen, David Raymond Christiansen, David Luposchainsky
 maintainer:          David Luposchainsky <dluposchainsky at google>
 bug-reports:         http://github.com/quchen/prettyprinter/issues
@@ -22,7 +23,7 @@ library
     exposed-modules:  Text.PrettyPrint.Annotated.Leijen
     ghc-options:      -Wall
     hs-source-dirs:   src
-    include-dirs:     aux
+    include-dirs:     misc
     default-language: Haskell2010
     other-extensions: CPP
 

diff --git a/...rinter/aux/version-compatibility-macros.h → ...inter/misc/version-compatibility-macros.h b/...rinter/aux/version-compatibility-macros.h → ...inter/misc/version-compatibility-macros.h
diff --git a/prettyprinter/prettyprinter.cabal b/prettyprinter/prettyprinter.cabal
@@ -7,7 +7,7 @@ description:         See README.md
 license:             BSD2
 license-file:        LICENSE.md
 extra-source-files:  README.md
-                   , aux/version-compatibility-macros.h
+                   , misc/version-compatibility-macros.h
 author:              Phil Wadler, Daan Leijen, Max Bolingbroke, Edward Kmett, David Luposchainsky
 maintainer:          David Luposchainsky <dluposchainsky at google>
 bug-reports:         http://github.com/quchen/prettyprinter/issues
@@ -40,7 +40,7 @@ library
         -- , Data.Text.Prettyprint.Doc.Unicode
     ghc-options: -Wall
     hs-source-dirs: src
-    include-dirs: aux
+    include-dirs: misc
     default-language: Haskell2010
     other-extensions:
           BangPatterns

diff --git a/prettyprinter/test/Doctest/Main.hs b/prettyprinter/test/Doctest/Main.hs
@@ -3,4 +3,4 @@ module Main (main) where
 import Test.DocTest
 
 main :: IO ()
-main = doctest [ "src" , "-Iaux"]
+main = doctest [ "src" , "-Imisc"]
diff --git a/scripts/benchmark b/scripts/benchmark
@@ -7,9 +7,9 @@ PROJECT_ROOT="$(stack path --project-root)"
 cd "$PROJECT_ROOT"
 pwd
 
-OUTDIR="${PROJECT_ROOT}/generated"
+OUTDIR="${PROJECT_ROOT}/generated/benchmarks"
 mkdir -p "$OUTDIR"
 stack bench prettyprinter:bench:fusion \
-    --benchmark-arguments "--output \"$OUTDIR/wl-pprint-benchmark.html\""
+    --benchmark-arguments "--output \"$OUTDIR/fusion.html\""
 stack bench prettyprinter:bench:faster-unsafe-text \
     --benchmark-arguments "--output \"$OUTDIR/faster-unsafe-text.html\""
diff --git a/scripts/find-language-extensions b/scripts/find-language-extensions
@@ -15,7 +15,7 @@ function separator() {
     echo
 }
 
-for dir in wl-pprint*; do
+for dir in prettyprinter*; do
     separator
     echo "Language extensions used in $dir:"
     for extension in $(find-language-extensions "$dir"); do

diff --git a/scripts/haddock b/scripts/haddock
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-stack haddock --open wl-pprint
+stack haddock --open prettyprinter