Merge branch 'main' of github.com:augustss/MicroCabal

MicroCabal.cabal

@@ -1,6 +1,6 @@
 cabal-version:         3.0
 name:                  MicroCabal
-version:               0.4.0.0
+version:               0.4.1.0
 synopsis:              A partial Cabal replacement
 license:               Apache-2.0
 license-file:          LICENSE

src/MicroCabal/Main.hs

@@ -20,7 +20,7 @@ import MicroCabal.Unix
 --import MicroCabal.YAML
 
 version :: String
-version = "MicroCabal 0.4.0.0"
+version = "MicroCabal 0.4.1.0"
 
 main :: IO ()
 main = do
@@ -322,6 +322,7 @@ install env = do
       sect s@(Section "executable" _ _) | TgtExe `elem` targets env = installExe env glob s
       sect s@(Section "library"    _ _) | TgtLib `elem` targets env = installLib env glob s
       sect _ = return ()
+  message env 3 $ "Unnormalized Cabal file:\n" ++ show cbl
   message env 2 $ "Normalized Cabal file:\n" ++ show ncbl
   mapM_ sect $ addMissing sects
 

src/MicroCabal/Parse.hs

@@ -97,15 +97,12 @@ lower :: String -> String
 lower = map toLower
 
 -- Change lines with first non-space being '--' into just a newline
--- Remove '--MHS'.
--- Hackage does not recognize mhs as a valid compiler yet.
--- Work around this by having mhs stuff in comments that
--- MicroCabal ignores.
--- Also get rid of lines that end in '--NOT_MHS'
+-- Remove '--MCABAL'.  This is because cabal does not allow conditionals
+-- for the global section, and mhs needs that.
 dropCabalComments :: String -> String
 dropCabalComments = unlines . map cmt . lines
   where
-    cmt ('-':'-':'M':'H':'S':cs) = cmt cs
+    cmt ('-':'-':'M':'C':'A':'B':'A':'L':cs) = cmt cs
     cmt s | take 2 (dropWhile (== ' ') s) == "--" = ""
           | "--NOT_MHS" `isSuffixOf` s = ""
           | otherwise = s