aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-10-09 22:29:59 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-10-09 22:30:35 -0700
commitfa18e3d7e1ba3c1d7ba3ec101a06b1c03aa40822 (patch)
treeb6efcc99705459c47ed73e5b871ccda145cd1f16
parentd62b1cf180281098c3093a817654d24563c4243d (diff)
downloadpandoc-fa18e3d7e1ba3c1d7ba3ec101a06b1c03aa40822.tar.gz
Use dist/setup/setup/sdist instead of cabal sdist.
This should help with older versions of cabal which can't handle custom preprocessors. See http://stackoverflow.com/questions/16256987/haskell-packaging-cabal-package-with-custom-preprocessors
-rw-r--r--.travis.yml2
-rw-r--r--make_travis_yml.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 6079e61c1..5c42a24a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,7 +74,7 @@ script:
- cabal build --ghc-options=$GHCOPTS # this builds all libraries and executables (including tests/benchmarks)
- cabal test
- cabal check
- - cabal sdist # tests that a source-distribution can be generated
+ - ./dist/setup/setup sdist # tests that a source-distribution can be generated
# Check that the resulting source distribution can be built & installed.
# If there are no other `.tar.gz` files in `dist`, this can be even simpler:
diff --git a/make_travis_yml.hs b/make_travis_yml.hs
index c01e8e0c9..82d328018 100644
--- a/make_travis_yml.hs
+++ b/make_travis_yml.hs
@@ -165,7 +165,7 @@ genTravisFromCabalFile fn xpkgs = do
, " - cabal build --ghc-options=$GHCOPTS # this builds all libraries and executables (including tests/benchmarks)"
, " - cabal test"
, " - cabal check"
- , " - cabal sdist # tests that a source-distribution can be generated"
+ , " - ./dist/setup/setup sdist # tests that a source-distribution can be generated"
, ""
, "# Check that the resulting source distribution can be built & installed."
, "# If there are no other `.tar.gz` files in `dist`, this can be even simpler:"