Skip to content
Snippets Groups Projects
Commit 76d508d7 authored by Isaac Potoczny-Jones's avatar Isaac Potoczny-Jones
Browse files

fixed test suite, added backward-compat checker for other-files

parent 2e6af48d
No related branches found
No related tags found
No related merge requests found
...@@ -686,7 +686,8 @@ testPkgDesc = unlines [ ...@@ -686,7 +686,8 @@ testPkgDesc = unlines [
"Build-Depends: haskell-src, HUnit>=1.0.0-rain", "Build-Depends: haskell-src, HUnit>=1.0.0-rain",
"Other-Modules: Distribution.Package, Distribution.Version,", "Other-Modules: Distribution.Package, Distribution.Version,",
" Distribution.Simple.GHCPackageConfig", " Distribution.Simple.GHCPackageConfig",
"Extra-Source-Files: file1, file2", "Other-files: file1, file2",
"Extra-Tmp-Files: file1, file2",
"C-Sources: not/even/rain.c, such/small/hands", "C-Sources: not/even/rain.c, such/small/hands",
"HS-Source-Dirs: src, src2", "HS-Source-Dirs: src, src2",
"Exposed-Modules: Distribution.Void, Foo.Bar", "Exposed-Modules: Distribution.Void, Foo.Bar",
...@@ -724,7 +725,6 @@ testPkgDescAnswer = ...@@ -724,7 +725,6 @@ testPkgDescAnswer =
synopsis = "a nice package!", synopsis = "a nice package!",
description = "a really nice package!", description = "a really nice package!",
category = "tools", category = "tools",
extraSrcFiles=["file1", "file2"],
buildDepends = [Dependency "haskell-src" AnyVersion, buildDepends = [Dependency "haskell-src" AnyVersion,
Dependency "HUnit" Dependency "HUnit"
(UnionVersionRanges (ThisVersion (Version [1,0,0] ["rain"])) (UnionVersionRanges (ThisVersion (Version [1,0,0] ["rain"]))
...@@ -732,6 +732,8 @@ testPkgDescAnswer = ...@@ -732,6 +732,8 @@ testPkgDescAnswer =
testedWith=[(GHC, AnyVersion)], testedWith=[(GHC, AnyVersion)],
maintainer = "", maintainer = "",
stability = "Free Text String", stability = "Free Text String",
extraTmpFiles=["file1", "file2"],
extraSrcFiles=["file1", "file2"],
library = Just $ Library { library = Just $ Library {
exposedModules = ["Distribution.Void", "Foo.Bar"], exposedModules = ["Distribution.Void", "Foo.Bar"],
......
...@@ -197,6 +197,8 @@ mkStanza ((n,xs):ys) = ...@@ -197,6 +197,8 @@ mkStanza ((n,xs):ys) =
let fld'' = map toLower fld' let fld'' = map toLower fld'
fld | fld'' == "hs-source-dir" fld | fld'' == "hs-source-dir"
= trace "The field \"hs-source-dir\" is deprecated, please use hs-source-dirs." "hs-source-dirs" = trace "The field \"hs-source-dir\" is deprecated, please use hs-source-dirs." "hs-source-dirs"
| fld'' == "other-files"
= trace "The field \"other-files\" is deprecated, please use extra-source-files." "extra-source-files"
| otherwise = fld'' | otherwise = fld''
ss <- mkStanza ys ss <- mkStanza ys
checkDuplField fld ss checkDuplField fld ss
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment