From d9ed84a67161cb0db71e96f66e44a49a0930c5c1 Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Thu, 30 Apr 2009 07:57:56 +0000
Subject: [PATCH] added new Makefile in the top directory which calls Cabal for
 compilation

---
 resource/Make.hs  | 22 ++++++++--------------
 resource/Makefile |  2 +-
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/resource/Make.hs b/resource/Make.hs
index 973e6def..eff24eb0 100644
--- a/resource/Make.hs
+++ b/resource/Make.hs
@@ -19,7 +19,7 @@ import System.Exit
 -- With no argument, lang and api are done, in this order.
 -- See 'make' below for what is done by which command.
 
-default_gfc = "../../bin/gfc"
+default_gf = "../../dist/build/gf/gf"
 
 presApiPath = "-path=api:present"
 
@@ -175,21 +175,15 @@ unlexer abstr ls =
     where
       unlex lla = maybe "" id $ lookup lla langsCoding
 
--- | Runs the gfc executable with the given arguments.
+-- | Runs the gf executable in compile mode with the given arguments.
 run_gfc :: [String] -> IO ()
 run_gfc args = 
-    do p <- liftM (fromMaybe default_gfc) $ findExecutable "gfc"
-       env <- getEnvironment
-       case lookup "GF_LIB_PATH" env of
-            Nothing -> putStrLn "$GF_LIB_PATH is not set."
-            Just _  -> 
-                do let args' = filter (not . null) args ++ ["+RTS"] ++ rts_flags ++ ["-RTS"]
-                       cmd = p ++ " " ++ unwords (map showArg args')
-                   putStrLn $ "Running: " ++ cmd
-                   e <- system cmd
-                   case e of
-                     ExitSuccess -> return ()
-                     ExitFailure i -> putStrLn $ "gfc exited with exit code: " ++ show i
+    do let args' = ["-batch","-gf-lib-path=../"] ++ filter (not . null) args ++ ["+RTS"] ++ rts_flags ++ ["-RTS"]
+       putStrLn $ "Running: " ++ default_gf ++ " " ++ unwords (map showArg args')
+       e <- rawSystem default_gf args'
+       case e of
+         ExitSuccess -> return ()
+         ExitFailure i -> putStrLn $ "gf exited with exit code: " ++ show i
   where rts_flags = ["-K100M"]
         showArg arg = "'" ++ arg ++ "'"
 
diff --git a/resource/Makefile b/resource/Makefile
index c5cd520d..7c7d1900 100644
--- a/resource/Makefile
+++ b/resource/Makefile
@@ -23,7 +23,7 @@ math:
 	$(RUNMAKE) math
 
 compat:
-	gfc */Compatibility*.gf
+	gf -batch */Compatibility*.gf
 	cp -p */Compatibility*.gfo ../alltenses/
 	cp -p */Compatibility*.gfo ../present/
 #	$(RUNMAKE) present compat