{-# OPTIONS -#include "Linker.h" -#include "SchedAPI.h" #-}
-----------------------------------------------------------------------------
--- $Id: InteractiveUI.hs,v 1.125 2002/06/04 18:09:00 sof Exp $
+-- $Id: InteractiveUI.hs,v 1.126 2002/06/12 22:04:25 wolfgang Exp $
--
-- GHC Interactive User Interface
--
-- directories specified in v_Library_Paths before giving up.
data LibrarySpec = Object FilePath | DLL String
+#ifdef darwin_TARGET_OS
+ | Framework String
+#endif
-- Packages that don't need loading, because the compiler shares them with
-- the interpreted program.
showLS (Object nm) = "(static) " ++ nm
showLS (DLL nm) = "(dynamic) " ++ nm
+#ifdef darwin_TARGET_OS
+showLS (Framework nm) = "(framework) " ++ nm
+#endif
linkPackages :: DynFlags -> [LibrarySpec] -> [PackageConfig] -> IO ()
linkPackages dflags cmdline_lib_specs pkgs
-----------------------------------------------------------------------------
--- $Id: DriverFlags.hs,v 1.96 2002/06/03 23:36:40 sof Exp $
+-- $Id: DriverFlags.hs,v 1.97 2002/06/12 22:04:26 wolfgang Exp $
--
-- Driver flags
--
, ( "L" , Prefix (addToDirList v_Library_paths) )
, ( "l" , Prefix (add v_Cmdline_libraries) )
+#ifdef darwin_TARGET_OS
+ ------- Frameworks --------------------------------------------------
+ -- -framework-path should really be -F ...
+ , ( "framework-path" , HasArg (addToDirList v_Framework_paths) )
+ , ( "framework" , HasArg (add v_Cmdline_frameworks) )
+#endif
------- Packages ----------------------------------------------------
, ( "package-name" , HasArg (\s -> add v_Opt_C ("-inpackage="++s)) )
let lib_opts = map ("-l"++) (reverse libs)
-- reverse because they're added in reverse order from the cmd line
+#ifdef darwin_TARGET_OS
+ pkg_framework_paths <- getPackageFrameworkPath
+ let pkg_framework_path_opts = map ("-F"++) pkg_framework_paths
+
+ framework_paths <- readIORef v_Framework_paths
+ let framework_path_opts = map ("-F"++) framework_paths
+
+ pkg_frameworks <- getPackageFrameworks
+ let pkg_framework_opts = map ("-framework " ++) pkg_frameworks
+
+ frameworks <- readIORef v_Cmdline_frameworks
+ let framework_opts = map ("-framework "++) (reverse frameworks)
+ -- reverse because they're added in reverse order from the cmd line
+#endif
+
pkg_extra_ld_opts <- getPackageExtraLdOpts
-- probably _stub.o files
++ extra_ld_inputs
++ lib_path_opts
++ lib_opts
+#ifdef darwin_TARGET_OS
+ ++ framework_path_opts
+ ++ framework_opts
+#endif
++ pkg_lib_path_opts
++ pkg_lib_opts
+#ifdef darwin_TARGET_OS
+ ++ pkg_framework_path_opts
+ ++ pkg_framework_opts
+#endif
++ pkg_extra_ld_opts
++ extra_ld_opts
++ if static && not no_hs_main then
-----------------------------------------------------------------------------
--- $Id: DriverState.hs,v 1.79 2002/06/04 19:17:57 sof Exp $
+-- $Id: DriverState.hs,v 1.80 2002/06/12 22:04:26 wolfgang Exp $
--
-- Settings for the driver
--
GLOBAL_VAR(v_Cmdline_libraries, [], [String])
+#ifdef darwin_TARGET_OS
+GLOBAL_VAR(v_Framework_paths, [], [String])
+GLOBAL_VAR(v_Cmdline_frameworks, [], [String])
+#endif
+
addToDirList :: IORef [String] -> String -> IO ()
addToDirList ref path
= do paths <- readIORef ref
ps <- getPackageInfo
return (concatMap extra_ld_opts ps)
+#ifdef darwin_TARGET_OS
+getPackageFrameworkPath :: IO [String]
+getPackageFrameworkPath = do
+ ps <- getPackageInfo
+ return (nub (filter notNull (concatMap framework_dirs ps)))
+
+getPackageFrameworks :: IO [String]
+getPackageFrameworks = do
+ ps <- getPackageInfo
+ return (concatMap extra_frameworks ps)
+#endif
+
getPackageInfo :: IO [PackageConfig]
getPackageInfo = do
ps <- readIORef v_Packages
where
munge_pkg p = p{ import_dirs = munge_paths (import_dirs p),
include_dirs = munge_paths (include_dirs p),
- library_dirs = munge_paths (library_dirs p) }
+ library_dirs = munge_paths (library_dirs p),
+ framework_dirs = munge_paths (framework_dirs p) }
munge_paths = map munge_path
"extra_ghc_opts" -> p{extra_ghc_opts = $3}
"extra_cc_opts" -> p{extra_cc_opts = $3}
"extra_ld_opts" -> p{extra_ld_opts = $3}
+ "framework_dirs" -> p{framework_dirs = $3}
+ "extra_frameworks"-> p{extra_frameworks= $3}
_other -> p
}
-----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.24 2002/06/03 10:27:11 simonmar Exp $
+-- $Id: Main.hs,v 1.25 2002/06/12 22:04:27 wolfgang Exp $
--
-- Package management tool
-----------------------------------------------------------------------------
import IO
import List ( isPrefixOf )
+import ParsePkgConfLite
+
#include "../../includes/config.h"
#ifdef mingw32_HOST_OS
toField "extra_ghc_opts" = return extra_ghc_opts
toField "extra_cc_opts" = return extra_cc_opts
toField "extra_ld_opts" = return extra_ld_opts
+ toField "framework_dirs" = return framework_dirs
+ toField "extra_frameworks"= return extra_frameworks
toField s = die ("unknown field: `" ++ s ++ "'")
fields <- mapM toField [ f | Field f <- clis ]
s <- readFile conf_file
- let packages = read s :: [PackageConfig]
+ let packages = parsePackageConfig s
eval_catch packages (\_ -> die "parse error in package config file")
let auto_ghci_libs = any isAuto clis
f -> do
hPutStr stdout ("Reading package info from " ++ show f)
readFile f
- let new_pkg = read s :: PackageConfig
+ let new_pkg = parseOnePackageConfig s
eval_catch new_pkg (\_ -> die "parse error in package info")
hPutStrLn stdout "done."
hPutStr stdout "Expanding embedded variables..."
e_g_opts <- expandStrings (extra_ghc_opts pkg)
e_c_opts <- expandStrings (extra_cc_opts pkg)
e_l_opts <- expandStrings (extra_ld_opts pkg)
+ f_dirs <- expandStrings (framework_dirs pkg)
+ e_frames <- expandStrings (extra_frameworks pkg)
return (pkg { name = nm
, import_dirs = imp_dirs
, source_dirs = src_dirs
, extra_ghc_opts = e_g_opts
, extra_cc_opts = e_c_opts
, extra_ld_opts = e_l_opts
+ , framework_dirs = f_dirs
+ , extra_frameworks= e_frames
})
where
expandStrings = mapM expandString
-----------------------------------------------------------------------------
--- $Id: Package.hs,v 1.2 2001/03/27 14:10:34 simonmar Exp $
+-- $Id: Package.hs,v 1.3 2002/06/12 22:04:27 wolfgang Exp $
--
-- Package configuration defn.
-----------------------------------------------------------------------------
package_deps :: [String],
extra_ghc_opts :: [String],
extra_cc_opts :: [String],
- extra_ld_opts :: [String]
+ extra_ld_opts :: [String],
+ framework_dirs :: [String], -- ignored everywhere but on Darwin/MacOS X
+ extra_frameworks:: [String] -- ignored everywhere but on Darwin/MacOS X
}
-#ifdef PKG_TOOL
- deriving (Read)
-#endif
defaultPackageConfig
= Package {
package_deps = [],
extra_ghc_opts = [],
extra_cc_opts = [],
- extra_ld_opts = []
+ extra_ld_opts = [],
+ framework_dirs = [],
+ extra_frameworks= []
}
-----------------------------------------------------------------------------
dumpField "package_deps" (package_deps pkg),
dumpField "extra_ghc_opts" (extra_ghc_opts pkg),
dumpField "extra_cc_opts" (extra_cc_opts pkg),
- dumpField "extra_ld_opts" (extra_ld_opts pkg)
+ dumpField "extra_ld_opts" (extra_ld_opts pkg),
+ dumpField "framework_dirs" (framework_dirs pkg),
+ dumpField "extra_frameworks"(extra_frameworks pkg)
])))
dumpField :: String -> [String] -> Doc
--- /dev/null
+{
+-- This parser is based on ParsedPkgConf.y in compiler/main/
+-- It's supposed to do the same thing, but without depending on other GHC modules.
+-- The disadvantage is the less sophisticated error reporting, and it's probably
+-- slower because it doesn't use FastStrings.
+
+module ParsePkgConfLite{- ( parsePackageConfig, parseOnePackageConfig ) -}where
+
+import Package ( PackageConfig(..), defaultPackageConfig )
+import Char(isSpace, isAlpha, isAlphaNum, isUpper)
+import List(break)
+import Debug.Trace
+}
+
+%token
+ '{' { ITocurly }
+ '}' { ITccurly }
+ '[' { ITobrack }
+ ']' { ITcbrack }
+ ',' { ITcomma }
+ '=' { ITequal }
+ VARID { ITvarid $$ }
+ CONID { ITconid $$ }
+ STRING { ITstring $$ }
+
+%name parse pkgconf
+%name parseOne pkg
+%tokentype { Token }
+%%
+
+pkgconf :: { [ PackageConfig ] }
+ : '[' pkgs ']' { reverse $2 }
+
+pkgs :: { [ PackageConfig ] }
+ : pkg { [ $1 ] }
+ | pkgs ',' pkg { $3 : $1 }
+
+pkg :: { PackageConfig }
+ : CONID '{' fields '}' { $3 defaultPackageConfig }
+
+fields :: { PackageConfig -> PackageConfig }
+ : field { \p -> $1 p }
+ | fields ',' field { \p -> $1 ($3 p) }
+
+field :: { PackageConfig -> PackageConfig }
+ : VARID '=' STRING
+ {\p -> case $1 of
+ "name" -> p{name = $3}
+ _ -> error "unkown key in config file" }
+
+ | VARID '=' strlist
+ {\p -> case $1 of
+ "import_dirs" -> p{import_dirs = $3}
+ "library_dirs" -> p{library_dirs = $3}
+ "hs_libraries" -> p{hs_libraries = $3}
+ "extra_libraries" -> p{extra_libraries = $3}
+ "include_dirs" -> p{include_dirs = $3}
+ "c_includes" -> p{c_includes = $3}
+ "package_deps" -> p{package_deps = $3}
+ "extra_ghc_opts" -> p{extra_ghc_opts = $3}
+ "extra_cc_opts" -> p{extra_cc_opts = $3}
+ "extra_ld_opts" -> p{extra_ld_opts = $3}
+ "framework_dirs" -> p{framework_dirs = $3}
+ "extra_frameworks"-> p{extra_frameworks= $3}
+ _other -> p
+ }
+
+strlist :: { [String] }
+ : '[' ']' { [] }
+ | '[' strs ']' { reverse $2 }
+
+strs :: { [String] }
+ : STRING { [ $1 ] }
+ | strs ',' STRING { $3 : $1 }
+
+{
+data Token =
+ ITocurly
+ | ITccurly
+ | ITobrack
+ | ITcbrack
+ | ITcomma
+ | ITequal
+ | ITvarid String
+ | ITconid String
+ | ITstring String
+
+lexer :: String -> [Token]
+
+lexer [] = []
+lexer ('{':cs) = ITocurly : lexer cs
+lexer ('}':cs) = ITccurly : lexer cs
+lexer ('[':cs) = ITobrack : lexer cs
+lexer (']':cs) = ITcbrack : lexer cs
+lexer (',':cs) = ITcomma : lexer cs
+lexer ('=':cs) = ITequal : lexer cs
+lexer ('"':cs) = lexString cs ""
+lexer (c:cs)
+ | isSpace c = lexer cs
+ | isAlpha c = lexID (c:cs) where
+lexer _ = error "Unexpected token"
+
+lexID cs = (if isUpper (head cs) then ITconid else ITvarid) id : lexer rest
+ where
+ (id,rest) = break (\c -> c /= '_' && not (isAlphaNum c)) cs
+
+lexString ('"':cs) s = ITstring (reverse s) : lexer cs
+lexString ('\\':c:cs) s = lexString cs (c:s)
+lexString (c:cs) s = lexString cs (c:s)
+
+happyError _ = error "Couldn't parse package configuration."
+
+parsePackageConfig :: String -> [PackageConfig]
+parsePackageConfig = parse . lexer
+
+parseOnePackageConfig :: String -> PackageConfig
+parseOnePackageConfig = parseOne . lexer
+}
projects / ghc-hetmet.git / commitdiff