refactor: turn utils/fs into a cabal package

Author: andreabedini

Build.hs

@@ -173,6 +173,7 @@ buildGhcStage booting opts cabal ghc0 dst = do
         , "  " ++ src </> "libraries/ghci"
         , "  " ++ src </> "libraries/os-string/"
         , "  " ++ src </> "libraries/process/"
+        , "  " ++ src </> "libraries/rts-fs/"
         , "  " ++ src </> "libraries/rts-includes/"
         , "  " ++ src </> "libraries/semaphore-compat"
         , "  " ++ src </> "libraries/time"
@@ -363,19 +364,14 @@ prepareGhcSources opts dst = do
   cp "./libraries"    dst
   cp "./compiler/*"   (dst </> "libraries/ghc/")
   cp "./rts"          (dst </> "libraries/")
+  cp "./rts-fs"       (dst </> "libraries/")
   cp "./rts-includes" (dst </> "libraries/")
   cp "./ghc"          (dst </> "ghc-bin")
   cp "./utils"        dst
 
   cp "./config.sub"   (dst </> "libraries/rts/")
   cp "./config.guess" (dst </> "libraries/rts/")
 
-  -- shared among ghc-internal rts and unlit
-  cp "utils/fs/fs.h" (dst </> "libraries/ghc-internal/include")
-  cp "utils/fs/fs.c" (dst </> "libraries/ghc-internal/cbits")
-  cp "utils/fs/fs.*" (dst </> "libraries/rts/")
-  cp "utils/fs/fs.*" (dst </> "utils/unlit/")
-
 buildBootLibraries :: Cabal -> Ghc -> GhcPkg -> DeriveConstants -> GenApply -> GenPrimop -> GhcBuildOptions -> FilePath -> IO ()
 buildBootLibraries cabal ghc ghcpkg derive_constants genapply genprimop opts dst = do
   src <- makeAbsolute (dst </> "src")
@@ -433,6 +429,7 @@ buildBootLibraries cabal ghc ghcpkg derive_constants genapply genprimop opts dst
         , ""
         , "packages:"
         , "  " ++ src </> "libraries/rts"
+        , "  " ++ src </> "libraries/rts-fs"
         , "  " ++ src </> "libraries/rts-includes"
         , ""
         , "benchmarks: False"

cabal.project.stage1

@@ -16,6 +16,7 @@ packages:
   ./libraries/ghci
   ./libraries/os-string
   ./libraries/process
+  ./libraries/rts-fs
   ./libraries/semaphore-compat
   ./libraries/time
   ./libraries/unix

compiler/ghc.cabal

@@ -79,8 +79,6 @@ Library
     Exposed: False
 
     Includes: Unique.h
-              -- CodeGen.Platform.h -- invalid as C, skip
-              -- shared with rts via symlink
 
     if flag(build-tool-depends)
       build-tool-depends: alex:alex >= 3.2.6, happy:happy >= 1.20.0, genprimopcode:genprimopcode, deriveConstants:deriveConstants

libraries/ghc-internal/ghc-internal.cabal

@@ -36,7 +36,6 @@ extra-source-files:
     include/HsBaseConfig.h.in
     include/ieee-flpt.h
     include/md5.h
-    include/fs.h
     include/winio_structs.h
     include/WordSize.h
     include/HsIntegerGmp.h.in
@@ -116,7 +115,8 @@ Library
         Unsafe
 
     build-depends:
-        rts == 1.0.*
+        rts == 1.0.*,
+        rts-fs == 1.0.*
 
     exposed-modules:
         GHC.Internal.ClosureTypes
@@ -431,7 +431,6 @@ Library
           cbits/md5.c
           cbits/primFloat.c
           cbits/sysconf.c
-          cbits/fs.c
           cbits/strerror.c
           cbits/atomic.c
           cbits/bswap.c

utils/fs/README renamed to libraries/rts-fs/README

@@ -1,4 +1,2 @@
 This "fs" library, used by various ghc utilities is used to share some common
 I/O filesystem functions with different packages.
-
-This file is copied across the build-system by configure.

utils/fs/fs.c renamed to libraries/rts-fs/fs.c

@@ -0,0 +1,13 @@
+cabal-version:   3.0
+name:            rts-fs
+version:         1.0.0.0
+license:         NONE
+author:          Andrea Bedini
+maintainer:      [email protected]
+build-type:      Simple
+extra-doc-files: README
+
+library
+    c-sources:        fs.c
+    install-includes: fs.h
+    default-language: Haskell2010

utils/fs/fs.h renamed to libraries/rts-fs/fs.h

@@ -55,7 +55,6 @@ extra-source-files:
     FileLock.h
     ForeignExports.h
     fs_rts.h
-    fs.h
     GetEnv.h
     GetTime.h
     Globals.h
@@ -743,7 +742,6 @@ library
                  sm/Scav_thr.c
                  sm/Storage.c
                  sm/Sweep.c
-                 fs.c
                  -- I wish we had wildcards..., this would be:
                  -- *.c hooks/**/*.c sm/**/*.c eventlog/**/*.c linker/**/*.c
 
@@ -788,7 +786,8 @@ library
                     -- from Ticker.c
 
     build-depends:
-      rts-includes
+      rts-includes,
+      rts-fs
 
 -- Note [Undefined symbols in the RTS]
 -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

libraries/rts-fs/rts-fs.cabal

@@ -1,18 +1,13 @@
-cabal-version: 2.4
+cabal-version: 3.0
 Name: unlit
 Version: 0.1
-Copyright: XXX
 License: BSD-3-Clause
-Author: XXX
-Maintainer: XXX
 Synopsis: Literate program filter
-Description: XXX
 Category: Development
 build-type: Simple
-extra-source-files: fs.h
 
 Executable unlit
     Default-Language: Haskell2010
     Main-Is: unlit.c
-    C-Sources: fs.c
-    Includes: fs.h
+    build-depends:
+        rts-fs