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

haskell · Aug 16, 2005 · e0ec810 · e0ec810
1 parent 68b6152
commit e0ec810
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Distribution/PackageDescription.hs b/Distribution/PackageDescription.hs
@@ -686,7 +686,8 @@ testPkgDesc = unlines [
         "Build-Depends: haskell-src, HUnit>=1.0.0-rain",
         "Other-Modules: Distribution.Package, Distribution.Version,",
         "                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",
         "HS-Source-Dirs: src, src2",
         "Exposed-Modules: Distribution.Void, Foo.Bar",
@@ -724,14 +725,15 @@ testPkgDescAnswer =
                     synopsis = "a nice package!",
                     description = "a really nice package!",
                     category = "tools",
-                    extraSrcFiles=["file1", "file2"],
                     buildDepends = [Dependency "haskell-src" AnyVersion,
                                      Dependency "HUnit"
                                      (UnionVersionRanges (ThisVersion (Version [1,0,0] ["rain"]))
                                       (LaterVersion (Version [1,0,0] ["rain"])))],
                     testedWith=[(GHC, AnyVersion)],
                     maintainer = "",
                     stability = "Free Text String",
+                    extraTmpFiles=["file1", "file2"],
+                    extraSrcFiles=["file1", "file2"],
 
                     library = Just $ Library {
                         exposedModules = ["Distribution.Void", "Foo.Bar"],

diff --git a/Distribution/ParseUtils.hs b/Distribution/ParseUtils.hs
@@ -197,6 +197,8 @@ mkStanza ((n,xs):ys) =
        let fld'' = map toLower fld'
            fld | fld'' == "hs-source-dir"
                            = 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''
        ss <- mkStanza ys
        checkDuplField fld ss