Add pcf to data-files

standardsemiconductor · Jun 12, 2024 · aee1314 · aee1314
1 parent 4a70de7
commit aee1314
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/bayeux.cabal b/bayeux.cabal
@@ -10,6 +10,7 @@ copyright:          David Cox
 category:           Language
 build-type:         Simple
 extra-doc-files:    CHANGELOG.md
+data-files:         data/**/*.pcf
 
 library
     ghc-options:      -Wall
@@ -20,8 +21,11 @@ library
                     , Bayeux.RgbCounter
                     , Bayeux.Rtlil
                     , Bayeux.Tableaux
+    other-modules:    Paths_bayeux
+    autogen-modules:  Paths_bayeux
     build-depends:    base
                     , containers
+                    , filepath
                     , megaparsec
                     , mtl
                     , parser-combinators

diff --git a/exe/FiatLux.pcf → data/FiatLux.pcf b/exe/FiatLux.pcf → data/FiatLux.pcf
diff --git a/exe/RgbCounter.pcf → data/RgbCounter.pcf b/exe/RgbCounter.pcf → data/RgbCounter.pcf
diff --git a/exe/RgbCycle.pcf → data/RgbCycle.pcf b/exe/RgbCycle.pcf → data/RgbCycle.pcf
diff --git a/lib/Bayeux.hs b/lib/Bayeux.hs
@@ -13,14 +13,16 @@ import Data.Maybe
 import qualified Data.Text    as T
 import qualified Data.Text.IO as TIO
 import qualified Data.Set     as S
+import Paths_bayeux
+import System.FilePath
 import Text.Megaparsec hiding (parse)
 
 app :: Cli -> IO ()
 app = \case
   CliDemo demo iceprog -> case demo of
-    FiatLux    -> flow iceprog "FiatLux" "exe/FiatLux.pcf" fiatLux
-    RgbCounter -> flow iceprog "RgbCounter" "exe/RgbCounter.pcf" rgbCounter
-    RgbCycle   -> flow iceprog "RgbCycle" "exe/RgbCycle.pcf" rgbCycle
+    FiatLux    -> flow iceprog "FiatLux" fiatLux =<< getDataFileName ("data" </> "FiatLux" <.> "pcf")
+    RgbCounter -> flow iceprog "RgbCounter" rgbCounter =<< getDataFileName ("data" </> "RgbCounter" <.> "pcf")
+    RgbCycle   -> flow iceprog "RgbCycle" rgbCycle =<< getDataFileName ("data" </> "RgbCycle" <.> "pcf")
   CliProve cli -> do
     lp <- fromJust <$> case input cli of
       FileInput f -> parseMaybe (parse <* eof) <$> TIO.readFile f

diff --git a/lib/Bayeux/Flow.hs b/lib/Bayeux/Flow.hs
@@ -10,8 +10,8 @@ import qualified Data.Text.IO as TIO
 import Prettyprinter
 import Prettyprinter.Render.Text
 
-flow :: Bool -> String -> FilePath -> File -> IO ()
-flow prog name pcfFile designFile = shake shakeOptions{ shakeFiles = "_build" </> name } $ do
+flow :: Bool -> String -> File -> FilePath -> IO ()
+flow prog name designFile pcfFile = shake shakeOptions{ shakeFiles = "_build" </> name } $ do
 
   want $ if prog
     then ["prog"]