New installation script

Author: augustss

Makefile

@@ -312,8 +312,8 @@ nfibtest: bin/mhs bin/mhseval
 
 ######
 
-VERSION=0.15.10.0
-HVERSION=0,15,10,0
+VERSION=0.15.11.0
+HVERSION=0,15,11,0
 MCABAL=$(HOME)/.mcabal
 MCABALMHS=$(MCABAL)/mhs-$(VERSION)
 MDATA=$(MCABALMHS)/packages/mhs-$(VERSION)/data
@@ -357,7 +357,10 @@ installmsg:
 	@echo '***************************************************'
 	@echo ''
 
-minstall:	bin/mhs bin/cpphs bin/mcabal machdep
+minstall: bin/install
+	bin/install -i$(MCABAL) GMPFLAGS=$(MHSGMPCCFLAGS) GMPLIBS=$(MHSGMPCCLIBS)
+
+oldminstall:	bin/mhs bin/cpphs bin/mcabal machdep
 	@mkdir -p $(MCABALBIN)
 	@mkdir -p $(MRUNTIME)
 	cp bin/mhs bin/cpphs bin/mcabal $(MCABALBIN)
@@ -381,9 +384,6 @@ slowinstall:	bin/cpphs bin/mcabal bin/mhs machdep
 	cd lib; PATH=$(MCABALBIN):"$$PATH" mcabal $(MCABALGMP) install
 	@echo $$PATH | tr ':' '\012' | grep -q $(MCABALBIN) || echo '***' Add $(MCABALBIN) to the PATH
 
-newinstall: bin/install
-	bin/install -i$(MCABAL) GMPFLAGS=$(MHSGMPCCFLAGS) GMPLIBS=$(MHSGMPCCLIBS)
-
 #####
 # Hugs
 HUGS= runhugs

Makefile.windows

@@ -2,47 +2,40 @@
 # Use with nmake
 #
 HOME=$(USERPROFILE)
-RTS=src/runtime
 CCEVAL=cl -nologo -F"obuild\\" -O2 -I$(RTS) -I$(RTS)/windows $(RTS)/main.c $(RTS)/eval.c
 MKDIR=md
-
-VERSION=0.15.7.0
-HVERSION=0,15,7,0
-MCABAL=$(HOME)/.mcabal
-MCABALMHS=$(MCABAL)/mhs-$(VERSION)
-MDATA=$(MCABALMHS)/packages/mhs-$(VERSION)/data
-MRUNTIME=$(MDATA)/$(RTS)
-MCABALBIN=$(MCABAL)/bin
-BASE=base-$(VERSION)
+RTS=src/runtime
+RTSFILES=$(RTS)/*.c $(RTS)/*.h $(RTS)/windows/*
 
 all:    bin/mhs.exe bin/mhseval.exe
 
 # Compile mhs from distribution, with C compiler
-bin/mhs.exe:	$(RTS)/*.c  $(RTS)/*.h $(RTS)/windows/* generated/mhs.c
+bin/mhs.exe: $(RTSFILES) generated/mhs.c
 	@-$(MKDIR) bin
 	@-$(MKDIR) build
         $(CCEVAL) generated/mhs.c -Fe"bin\\mhs.exe"
 
-bin/cpphs.exe:	$(RTS)/*.c $(RTS)/*.h $(RTS)/windows/* generated/cpphs.c
+bin/cpphs.exe: $(RTSFILES) generated/cpphs.c
 	@-$(MKDIR) bin
 	@-$(MKDIR) build
 	$(CCEVAL) generated/cpphs.c $(CCLIBS) -Fe"bin\\cpphs.exe"
 
-bin/install.exe:	$(RTS)/*.c $(RTS)/*.h $(RTS)/windows/* generated/install.c
+bin/install.exe: $(RTSFILES) generated/install.c
 	@-$(MKDIR) bin
 	@-$(MKDIR) build
 	$(CCEVAL) generated/install.c $(CCLIBS) -Fe"bin\\install.exe"
 
-bin/mcabal.exe:	$(RTS)/*.c $(RTS)/*.h $(RTS)/windows/* generated/mcabal.c
+bin/mcabal.exe:  $(RTSFILES) generated/mcabal.c
 	@-$(MKDIR) bin
 	@-$(MKDIR) build
 	$(CCEVAL) generated/mcabal.c $(CCLIBS) -Fe"bin\\mcabal.exe"
 
 # Compile combinator evaluator
-bin/mhseval.exe:	$(RTS)/*.c $(RTS)/windows/* $(RTS)/comb.c
+bin/mhseval.exe: $(RTSFILES) $(RTS)/comb.c
 	@-$(MKDIR) bin
 	@-$(MKDIR) build
 	cl -nologo -F"obuild\\" -O2 -I$(RTS) -I$(RTS)/windows $(RTS)/main.c $(RTS)/eval.c $(RTS)/comb.c -Fe"bin\\mhseval.exe"
+
 mhs.conf: mhs.conf.in
 	sed -e "s,GMPFLAGS,$(MHSGMPCCFLAGS)," -e "s,GMPLIBS,$(MHSGMPCCLIBS)," mhs.conf.in > mhs.conf
 

MicroHs.cabal

@@ -1,6 +1,6 @@
 cabal-version:       3.0
 name:                MicroHs
-version:             0.15.10.0
+version:             0.15.11.0
                      -- *** When changing the version number, also
                      -- *** run 'sh updateversion.sh'
                      -- *** Yeah, it stinks.

generated/base.pkg

@@ -26,4 +26,4 @@ uname flag = unsafePerformIO $ do
   return $ map toLower $ filter (not . isSpace) res
 
 fullCompilerVersion :: Version
-fullCompilerVersion = makeVersion [0,15,10,0]
+fullCompilerVersion = makeVersion [0,15,11,0]

generated/cpphs.c

@@ -1,6 +1,6 @@
 cabal-version:  3.0
 name:           base
-version:        0.15.10.0
+version:        0.15.11.0
 license:        Apache-2.0
 license-file:   LICENSE
 maintainer:     lennart@augustsson.net