[Git][ghc/ghc][wip/ci-docs] Try 17

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/ci-docs at Glasgow Haskell Compiler / GHC


Commits:
b9d22885 by Matthew Pickering at 2024-02-28T12:12:41+00:00
Try 17

- - - - -


1 changed file:

- hadrian/src/Builder.hs


Changes:

=====================================
hadrian/src/Builder.hs
=====================================
@@ -382,7 +382,10 @@ instance H.Builder Builder where
                                 ++ quote "sphinx-build"  ++ " Did you skip configure?"
                   path <- unpack <$> lookupValue configFile "sphinx-build"
                   liftIO (lookupEnv "PYTHONPATH" >>= print)
-                  cmd' ["perl", path] buildArgs buildOptions
+                  mpp <- liftIO (lookupEnv "PYTHONPATH")
+                  liftIO (print (convertWindowsPath <$> mpp))
+
+                  cmd' ["perl", path] [AddEnv "PYTHONPATH" (convertWindowsPath pp) |  Just pp <- [mpp]] buildArgs buildOptions
 
                 -- RunTest produces a very large amount of (colorised) output;
                 -- Don't attempt to capture it.
@@ -393,6 +396,13 @@ instance H.Builder Builder where
 
                 _  -> cmd' [path] buildArgs buildOptions
 
+convertWindowsPath :: FilePath -> FilePath
+convertWindowsPath (';':fp) = ':' : convertWindowsPath fp
+convertWindowsPath ('\\':fp) = '/' : convertWindowsPath fp
+convertWindowsPath (c : ':' : '/':fp) = '/' : c : '/' : convertWindowsPath fp
+convertWindowsPath (c:fp) = c : convertWindowsPath fp
+convertWindowsPath [] = []
+
 -- | Invoke @haddock@ given a path to it and a list of arguments. The arguments
 -- are passed in a response file.
 runHaddock :: FilePath    -- ^ path to @haddock@



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b9d22885e6e554ae2d431acd8543f12fa83d1a0f

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b9d22885e6e554ae2d431acd8543f12fa83d1a0f
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240228/e90cbaf4/attachment-0001.html>