Simple.SrcDist cleanup (fixes #3656)

Cabal/Cabal.cabal

@@ -54,6 +54,21 @@ extra-source-files:
   tests/PackageTests/AutogenModules/SrcDist/MyLibrary.hs
   tests/PackageTests/AutogenModules/SrcDist/MyTestModule.hs
   tests/PackageTests/AutogenModules/SrcDist/my.cabal
+  tests/PackageTests/AutogenSources/Package/Dummy.hs
+  tests/PackageTests/AutogenSources/Package/MyBenchModule.hs
+  tests/PackageTests/AutogenSources/Package/MyExeModule.hs
+  tests/PackageTests/AutogenSources/Package/MyLibModule.hs
+  tests/PackageTests/AutogenSources/Package/MyLibrary.hs
+  tests/PackageTests/AutogenSources/Package/MyTestModule.hs
+  tests/PackageTests/AutogenSources/Package/my.cabal
+  tests/PackageTests/AutogenSources/SrcDist/Dummy.hs
+  tests/PackageTests/AutogenSources/SrcDist/MyBenchModule.hs
+  tests/PackageTests/AutogenSources/SrcDist/MyExeModule.hs
+  tests/PackageTests/AutogenSources/SrcDist/MyLibModule.hs
+  tests/PackageTests/AutogenSources/SrcDist/MyLibrary.hs
+  tests/PackageTests/AutogenSources/SrcDist/MyTestModule.hs
+  tests/PackageTests/AutogenSources/SrcDist/my.cabal
+  tests/PackageTests/AutogenSources/SrcDist/my_sources.c
   tests/PackageTests/BenchmarkExeV10/Foo.hs
   tests/PackageTests/BenchmarkExeV10/benchmarks/bench-Foo.hs
   tests/PackageTests/BenchmarkExeV10/my.cabal

Cabal/Distribution/PackageDescription/Check.hs

@@ -253,6 +253,18 @@ checkLibrary pkg lib =
            "An 'autogen-module' is neither on 'exposed-modules' or "
         ++ "'other-modules'."
 
+    -- check that all autogen-c-sources appear on c-sources
+  , check
+      (not $ and $ map (flip elem
+        (cSources $ libBuildInfo lib)) (autogenCSources $ libBuildInfo lib)) $
+      PackageBuildImpossible $ "An 'autogen-c-sources' is not on 'c-sources'"
+
+    -- check that all autogen-js-sources appear on js-sources
+  , check
+      (not $ and $ map (flip elem
+        (jsSources $ libBuildInfo lib)) (autogenJsSources $ libBuildInfo lib)) $
+      PackageBuildImpossible $ "An 'autogen-js-sources' is not on 'js-sources'"
+
   ]
 
   where
@@ -298,6 +310,22 @@ checkExecutable pkg exe =
            "On executable '" ++ exeName exe ++ "' an 'autogen-module' is not "
         ++ "on 'other-modules'"
 
+    -- check that all autogen-c-sources appear on c-sources
+  , check
+      (not $ and $ map (flip elem
+        (cSources $ buildInfo exe)) (autogenCSources $ buildInfo exe)) $
+      PackageBuildImpossible $
+           "On executable '" ++ exeName exe ++ "' an 'autogen-c-sources' is not "
+        ++ "on 'c-sources'"
+
+    -- check that all autogen-js-sources appear on js-sources
+  , check
+      (not $ and $ map (flip elem
+        (jsSources $ buildInfo exe)) (autogenJsSources $ buildInfo exe)) $
+      PackageBuildImpossible $
+           "On executable '" ++ exeName exe ++ "' an 'autogen-js-sources' is not "
+        ++ "on 'js-sources'"
+
   ]
   where
     moduleDuplicates = dups (exeModules exe)
@@ -343,8 +371,27 @@ checkTestSuite pkg test =
         (testModulesAutogen test)
       ) $
       PackageBuildImpossible $
-           "On test suite '" ++ testName test ++ "' an 'autogen-module' is not "
-        ++ "on 'other-modules'"
+           "On test suite '" ++ testName test ++ "' an 'autogen-module' is "
+        ++ "not on 'other-modules'"
+
+    -- check that all autogen-c-sources appear on c-sources
+  , check
+      (not $ and $ map (flip elem
+        (cSources $ testBuildInfo test))
+        (autogenCSources $ testBuildInfo test)) $
+      PackageBuildImpossible $
+           "On test suite '" ++ testName test ++ "' an 'autogen-c-sources' is "
+        ++ "not on 'c-sources'"
+
+    -- check that all autogen-js-sources appear on js-sources
+  , check
+      (not $ and $ map (flip elem
+        (jsSources $ testBuildInfo test))
+        (autogenJsSources $ testBuildInfo test)) $
+      PackageBuildImpossible $
+           "On test suite '" ++ testName test ++ "' an 'autogen-js-sources' is "
+        ++ "not on 'js-sources'"
+
   ]
   where
     moduleDuplicates = dups $ testModules test
@@ -394,6 +441,25 @@ checkBenchmark _pkg bm =
       PackageBuildImpossible $
              "On benchmark '" ++ benchmarkName bm ++ "' an 'autogen-module' is "
           ++ "not on 'other-modules'"
+
+    -- check that all autogen-c-sources appear on c-sources
+  , check
+      (not $ and $ map (flip elem
+        (cSources $ benchmarkBuildInfo bm))
+        (autogenCSources $ benchmarkBuildInfo bm)) $
+      PackageBuildImpossible $
+           "On benchmark '" ++ benchmarkName bm ++ "' an 'autogen-c-sources' "
+        ++ "is not on 'c-sources'"
+
+    -- check that all autogen-js-sources appear on js-sources
+  , check
+      (not $ and $ map (flip elem
+        (jsSources $ benchmarkBuildInfo bm))
+        (autogenJsSources $ benchmarkBuildInfo bm)) $
+      PackageBuildImpossible $
+           "On benchmark '" ++ benchmarkName bm ++ "' an 'autogen-js-sources' "
+        ++ "is not on 'js-sources'"
+
   ]
   where
     moduleDuplicates = dups $ benchmarkModules bm

Cabal/Distribution/PackageDescription/Parse.hs

@@ -403,6 +403,12 @@ binfoFieldDescrs =
  , listFieldWithSep vcat "js-sources"
            showFilePath       parseFilePathQ
            jsSources          (\paths binfo -> binfo{jsSources=paths})
+ , listFieldWithSep vcat "autogen-c-sources"
+           showFilePath       parseFilePathQ
+           autogenCSources    (\paths binfo -> binfo{autogenCSources=paths})
+ , listFieldWithSep vcat "autogen-js-sources"
+           showFilePath       parseFilePathQ
+           autogenJsSources   (\paths binfo -> binfo{autogenJsSources=paths})
  , simpleField "default-language"
            (maybe mempty disp) (option Nothing (fmap Just parseLanguageQ))
            defaultLanguage    (\lang  binfo -> binfo{defaultLanguage=lang})