From e1e0bf1a22583794a4e792d0a993124d773a22f3 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Tue, 21 Dec 2010 09:58:12 +0000
Subject: [PATCH] remove -src from Setup; simplified str2numeral; bug fix in
 Finnish ordinal inflection

---
 Setup.hs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Setup.hs b/Setup.hs
index fb61988b8..5852eae0f 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -60,7 +60,7 @@ rglCommands =
        mapM_ (gfc mode pkg lbi . compat) (optl langsCompat args)
   , RGLCommand "api"     True  $ \mode args pkg lbi -> do
        mapM_ (gfc mode pkg lbi . try) (optl langsAPI args)
-       mapM_ (gfc mode pkg lbi . symbolic) (optl langsAPI args)
+       mapM_ (gfc mode pkg lbi . symbolic) (optl langsSymbolic args)
   , RGLCommand "pgf"     False $ \mode args pkg lbi -> do
        let dir = getRGLBuildDir lbi mode
        createDirectoryIfMissing True dir
@@ -208,7 +208,10 @@ langs = map fst langsCoding
 langsLang = langs `except` ["Amh","Ara","Lat","Hin","Tha","Tur","Urd"]
 
 -- languages for which to compile Try 
-langsAPI  = langsLang `except` ["Hin","Ina","Rus","Tha"]
+langsAPI  = langsLang `except` ["Hin","Ina","Tha"]
+
+-- languages for which to compile Symbolic 
+langsSymbolic  = langsAPI `except` ["Rus"]
 
 -- languages for which to run demo test
 langsDemo = langsLang `except` ["Ara","Hin","Ina","Tha"]
@@ -310,7 +313,7 @@ unlexer abstr ls =
 -- | Runs the gf executable in compile mode with the given arguments.
 run_gfc :: PackageDescription -> LocalBuildInfo -> [String] -> IO ()
 run_gfc pkg lbi args = 
-    do let args' = ["-batch","-src","-gf-lib-path="++rgl_src_dir,"+RTS","-K32M","-RTS"] ++ filter (not . null) args
+    do let args' = ["-batch","-gf-lib-path="++rgl_src_dir,"+RTS","-K32M","-RTS"] ++ filter (not . null) args
            gf = default_gf pkg lbi
        putStrLn $ "Running: " ++ gf ++ " " ++ unwords (map showArg args')
        e <- rawSystem gf args'