[project @ 1996-11-27 18:43:03 by dnt]
authordnt <unknown>
Wed, 27 Nov 1996 18:43:40 +0000 (18:43 +0000)
committerdnt <unknown>
Wed, 27 Nov 1996 18:43:40 +0000 (18:43 +0000)
Got more directories working with new build system and Haskell 1.3

12 files changed:
Makefile
mk/nofib.mk
mk/site.mk
real/Makefile
real/ebnf2ps/Makefile
real/fem/tech-report.dvi [deleted file]
real/mkhprog/Jmakefile [deleted file]
real/mkhprog/Makefile [new file with mode: 0644]
real/veritas/Goals.hs
real/veritas/Jmakefile [deleted file]
real/veritas/Main.hs
real/veritas/Makefile [new file with mode: 0644]

index 1257885..6a0082c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,38 +1,39 @@
-# $Id: Makefile,v 1.2 1996/11/26 15:44:36 dnt Exp $
+# $Id: Makefile,v 1.3 1996/11/27 18:43:03 dnt Exp $
 
 TOP = ..
+include $(TOP)/nofib/mk/site.mk
 
 SUBDIRS =
 
-ifeq ($(IncludeImaginaryNoFibTests), YES)
+ifeq ($(ImaginaryNoFibTests), YES)
   SUBDIRS += imaginary
 endif
 
-ifeq ($(IncludeSpectralNoFibTests), YES)
+ifeq ($(SpectralNoFibTests), YES)
   SUBDIRS += spectral
 endif
 
-ifeq ($(IncludeRealNoFibTests), YES)
+ifeq ($(RealNoFibTests), YES)
   SUBDIRS += real
 endif
 
-ifeq ($(IncludePENDINGNoFibTests), YES)
+ifeq ($(PENDINGNoFibTests), YES)
   SUBDIRS += PENDING
 endif
 
-ifeq ($(IncludeUNUSEDNoFibTests), YES)
+ifeq ($(UNUSEDNoFibTests), YES)
   SUBDIRS += UNUSED
 endif
 
-ifeq ($(IncludeGHC_ONLYNoFibTests), YES)
+ifeq ($(GHC_ONLYNoFibTests), YES)
   SUBDIRS += GHC_ONLY
 endif
 
-ifeq ($(IncludePRIVATENoFibTests), YES)
+ifeq ($(PRIVATENoFibTests), YES)
   SUBDIRS += PRIVATE
 endif
 
-ifeq ($(IncludeParallelNoFibTests), YES)
+ifeq ($(ParallelNoFibTests), YES)
   SUBDIRS += parallel
 endif
 
index 647e9c4..91e77ab 100644 (file)
@@ -20,7 +20,7 @@ else
 endif
 
 #-----------------------------------------------------------------------------
-# The 'all' target prints out the corrent configuration and builds runtests.
+# The 'all' target prints out the current configuration and builds runtests.
 
 all ::
        @echo HC = $(HC)
index 8e48bc1..ed92df9 100644 (file)
@@ -1,5 +1,17 @@
 #-----------------------------------------------------------------------------
-# $Id: site.mk,v 1.2 1996/11/26 15:44:59 dnt Exp $
+# $Id: site.mk,v 1.3 1996/11/27 18:43:19 dnt Exp $
+
+#-----------------------------------------------------------------------------
+# Set these flags to YES or NO to determine which sets of tests wil be run
+
+ImaginaryNoFibTests = YES
+SpectralNoFibTests  = YES
+RealNoFibTests      = YES
+PENDINGNoFibTests   = YES
+UNUSEDNoFibTests    = YES
+GHC_ONLYNoFibTests  = YES
+PRIVATENoFibTests   = YES
+ParallelNoFibTests  = YES
 
 #-----------------------------------------------------------------------------
 # Haskell compiler
index 94cd7a4..b892172 100644 (file)
@@ -1,6 +1,6 @@
 TOP = ../..
 
-SUBDIRS = anna bspt compress compress2 ebnf2ps fluid fulsom gamteb gg \
+SUBDIRS = anna bspt compress compress2 ebnf2ps fem fluid fulsom gamteb gg \
   grep hidden HMMS hpg infer lift maillist mkhprog parser pic prolog \
   reptile rsa symalg veritas
 
index 08b4874..79ade59 100644 (file)
@@ -11,3 +11,6 @@ HappyParser.hs : HappyParser.ly
        $(RM) HappyParser.hs
        happy HappyParser.ly
        @chmod 444 HappyParser.hs
+
+clean ::
+       $(RM) HappyParser.hs
diff --git a/real/fem/tech-report.dvi b/real/fem/tech-report.dvi
deleted file mode 100644 (file)
index f05d858..0000000
Binary files a/real/fem/tech-report.dvi and /dev/null differ
diff --git a/real/mkhprog/Jmakefile b/real/mkhprog/Jmakefile
deleted file mode 100644 (file)
index f1f6069..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-SRCS_LHS= Main.lhs
-OBJS_O  = Main.o
-
-/* not really multi-module, but we need to give weird flags... */
-/* also: not the Main.hs file that *OneModule* expects. */
-
-NoFibMultiModuleCompileAndRun(mkhprog,-o1 mkhprog.stdout HaskellEndRTSFlags() -a Int -b Float -c Foo -d Bar -e Double -f String -g String -h Int -j Double -k Bool -n Basil -p Knob -q Wizzle -r Wissle -s Wibble -t Widdle -A Int -B Float -C Foo -D Bar -E Double -F String -G String -H Int -I Float -J Double -K Bool -L Bool -M Buzzle -N Basil -P Knob -Q Wizzle -R Wissle -S Wibble -T Widdle)
-
-NoFibHaskellCompile(mkhprog,Main,lhs)
-
-NoFibDependTarget(mkhprog, $(SRCS_LHS))
diff --git a/real/mkhprog/Makefile b/real/mkhprog/Makefile
new file mode 100644 (file)
index 0000000..71443ce
--- /dev/null
@@ -0,0 +1,8 @@
+TOP = ../../..
+PROG = mkhprog
+EXTRA_RUNTESTFLAGS = -RTS -a Int -b Float -c Foo -d Bar -e Double \
+  -f String -g String -h Int -j Double -k Bool -n Basil -p Knob -q Wizzle \
+  -r Wissle -s Wibble -t Widdle -A Int -B Float -C Foo -D Bar -E Double \
+  -F String -G String -H Int -I Float -J Double -K Bool -L Bool -M Buzzle \
+  -N Basil -P Knob -Q Wizzle -R Wissle -S Wibble -T Widdle
+include $(TOP)/nofib/mk/nofib.mk
index 26fddbb..a8cd7d5 100644 (file)
@@ -18,8 +18,6 @@ import Lookup -- stub
 
 import Parse
 
-import Tags
-
 import Kernel
 
 import Sub_Core1
diff --git a/real/veritas/Jmakefile b/real/veritas/Jmakefile
deleted file mode 100644 (file)
index a30b080..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-SRCS_HS = \
-       Core_datatype.hs \
-       Vtslib.hs \
-       Sub_Core1.hs \
-       Sub_Core2.hs \
-       Sub_Core3.hs \
-       Sub_Core4.hs \
-       Dcore.hs \
-       Core_database.hs \
-       Kernel.hs \
-       Lookup.hs \
-       Type_defs.lhs \
-       Token.lhs \
-       Edlib.lhs \
-       X_interface.hs \
-       Tree.hs \
-       Getops.hs \
-       Attributes.lhs \
-       Unparse.lhs \
-       Build_Tm.lhs \
-       Build_itrm.lhs \
-       Parse.lhs \
-       DerivedRules.hs \
-       Tags.hs \
-       Globals.hs \
-       Goals.hs \
-       Display.hs \
-       Tactics.hs \
-       Auto.hs \
-       Tacticals.hs \
-       Editor.hs \
-       ThmTactics.hs \
-       Main.hs 
-
-/*?Parse_sg.?
-?Simplify?*/
-
-OBJS_O = \
-       Core_datatype.o \
-       Vtslib.o \
-       Sub_Core1.o \
-       Sub_Core2.o \
-       Sub_Core3.o \
-       Sub_Core4.o \
-       Dcore.o \
-       Core_database.o \
-       Kernel.o \
-       Lookup.o \
-       Type_defs.o \
-       Token.o \
-       Edlib.o \
-       X_interface.o \
-       Tree.o \
-       Getops.o \
-       Attributes.o \
-       Unparse.o \
-       Build_Tm.o \
-       Build_itrm.o \
-       Parse.o \
-       DerivedRules.o \
-       Tags.o \
-       Globals.o \
-       Goals.o \
-       Display.o \
-       Tactics.o \
-       Auto.o \
-       Tacticals.o \
-       Editor.o \
-       ThmTactics.o \
-       Main.o 
-
-NoFibMultiModuleCompileAndRun(veritas,-i veritas.stdin -o1 veritas.stdout)
-
-NoFibHaskellCompile(veritas,Attributes,lhs)
-NoFibHaskellCompile(veritas,Auto,hs)
-NoFibHaskellCompile(veritas,Build_Tm,lhs)
-NoFibHaskellCompile(veritas,Build_itrm,lhs)
-NoFibHaskellCompile(veritas,Core_database,hs)
-NoFibHaskellCompile(veritas,Core_datatype,hs)
-NoFibHaskellCompile(veritas,Dcore,hs)
-NoFibHaskellCompile(veritas,DerivedRules,hs)
-NoFibHaskellCompile(veritas,Display,hs)
-NoFibHaskellCompile(veritas,Editor,hs)
-NoFibHaskellCompile(veritas,Edlib,lhs)
-NoFibHaskellCompile(veritas,Getops,hs)
-NoFibHaskellCompile(veritas,Globals,hs)
-NoFibHaskellCompile(veritas,Goals,hs)
-NoFibHaskellCompile(veritas,Kernel,hs)
-NoFibHaskellCompile(veritas,Lookup,hs)
-NoFibHaskellCompile(veritas,Main,hs)
-NoFibHaskellCompile(veritas,Parse,lhs)
-NoFibHaskellCompile(veritas,Sub_Core1,hs)
-NoFibHaskellCompile(veritas,Sub_Core2,hs)
-NoFibHaskellCompile(veritas,Sub_Core3,hs)
-NoFibHaskellCompile(veritas,Sub_Core4,hs)
-NoFibHaskellCompile(veritas,Tacticals,hs)
-NoFibHaskellCompile(veritas,Tactics,hs)
-NoFibHaskellCompile(veritas,Tags,hs)
-NoFibHaskellCompile(veritas,ThmTactics,hs)
-NoFibHaskellCompile(veritas,Token,lhs)
-NoFibHaskellCompile(veritas,Tree,hs)
-NoFibHaskellCompile(veritas,Type_defs,lhs)
-NoFibHaskellCompile(veritas,Unparse,lhs)
-NoFibHaskellCompile(veritas,Vtslib,hs)
-NoFibHaskellCompile(veritas,X_interface,hs)
-
-NoFibDependTarget(veritas, $(SRCS_HS))
index 267b9ee..59b40da 100644 (file)
@@ -40,14 +40,9 @@ import Parse
 
 --proof_edit : string list * string list -> unit 
 
-
-#ifdef PAR
-main = main'
-#else
 main = do
     ins <- getContents
     putStr (main' ins)
-#endif
 
 main' instr 
        = rqts 
@@ -192,21 +187,3 @@ proof_edit default_ds argL
                  err_handler
          err_handler mesg = x_error mesg /./ 
                             ( \ _ -> proof_edit default_ds argL )
-
-
-{-
-return ( error "TOP LEVEL ERROR" ) --temp only - should not be evaluated -- see def of main
--}
-{-
-         err_handler ( GetOpts s )
-                -> (s ++ "\n") ++ useage (cmd))
-                | Fail s    => (outputc std_out (s ^ "\n"); useage (cmd))
-                |      _    => useage (cmd)
-               
-    and useage (cmd) = 
-       outputc std_out ("Usage: " ^ cmd ^ 
-                                " [-d <dataset>] " ^ 
-                                " [-s <theory>] " ^
-                                " [-t Thm|Trm|Dec|Sgn] " ^
-                                " <spec>\n");
--}
diff --git a/real/veritas/Makefile b/real/veritas/Makefile
new file mode 100644 (file)
index 0000000..db1ca96
--- /dev/null
@@ -0,0 +1,10 @@
+TOP = ../../..
+PROG = veritas
+SRCS = Core_datatype.hs Vtslib.hs Sub_Core1.hs Sub_Core2.hs \
+       Sub_Core3.hs Sub_Core4.hs Dcore.hs Core_database.hs Kernel.hs \
+       Lookup.hs Type_defs.lhs Token.lhs Edlib.lhs X_interface.hs \
+       Tree.hs Getops.hs Attributes.lhs Unparse.lhs Build_Tm.lhs \
+       Build_itrm.lhs Parse.lhs DerivedRules.hs Tags.hs Globals.hs \
+       Goals.hs Display.hs Tactics.hs Auto.hs Tacticals.hs Editor.hs \
+       ThmTactics.hs Main.hs
+include $(TOP)/nofib/mk/nofib.mk