shithub: MicroHs

Info  •  Files  •  Log  •  Branches

Tweaks for new hackage version

--- a/Makefile

+++ b/Makefile

@@ -206,6 +206,10 @@

 	@echo 'module Paths_MicroHs where {import Data.Version; version :: Version; version = makeVersion [0,9,15,0]; getDataDir :: IO FilePath; getDataDir = return "$(MDATA)" }' > $(MDIST)/Paths_MicroHs.hs

 	bin/mhs -z $(MHSINCNP) -i$(MDIST) MicroHs.Main -o$(MCABALBIN)/mhs

+$(MCABALBIN)/cpphs: bin/cpphs

+	@mkdir -p $(MCABALBIN)

+	cp bin/cpphs $(MCABALBIN)

+

 $(MCABALMHS)/packages/$(BASE).pkg: bin/mhs lib/*.hs

 	@mkdir -p $(MRUNTIME)

 	cp src/runtime/*.[ch] $(MRUNTIME)

@@ -214,4 +218,4 @@

 	bin/mhs -Q $(BASE).pkg $(MCABALMHS)

 	@rm $(BASE).pkg

-installmcabal: bin/mhs $(MCABAL)/bin/mhs $(MCABALMHS)/packages/$(BASE).pkg

+installmcabal: $(MCABALBIN)/mhs $(MCABALBIN)/cpphs $(MCABALMHS)/packages/$(BASE).pkg

--- a/MicroHs.cabal

+++ b/MicroHs.cabal

@@ -25,10 +25,11 @@

       Tools/Addcombs.hs

       Tools/Compress.hs

       generated/mhs.c

+      generated/cpphs.c

       ghc/**/*.hs

       lib/**/*.hs

       lib/**/*.hs-boot

-      mhs/*.hs

+      mhs/**/*.hs

       paths/Paths_MicroHs.hs

       src/runtime/*.c

       src/runtime/*.h

@@ -97,6 +98,7 @@

                        System.IO.TimeMilli

                        System.Compress

                        Paths_MicroHs

+  autogen-modules:     Paths_MicroHs

   if impl(ghc)

     hs-source-dirs:    ghc src

     build-depends:     base         >= 4.10 && < 4.22,

-- 

⑨