Commit e67b107b authored by simonmar's avatar simonmar
Browse files

[project @ 2005-02-18 15:06:38 by simonmar]

Rename fields in InstalledPackageInfo for consistency with
PackageDescription & buildInfo:

 extra-libs (extraLibraries) --> extra-libraries (extraLibraries)
 extra-cc-opts (extraCcOpts) --> cc-options (ccOptions)
 extra-ld-opts (extraLdOpts) --> ld-options (ldOptions)
 extra-hugs-opts (extraHugsOpts) --> hugs-options (hugsOptions)
 extra-frameworks (extraFrameworks) --> frameworks (frameworks)
parent a7f4060e
......@@ -423,7 +423,7 @@ findPackages db_stack pkgid
-- multiple packages. So eg. "Cabal-*" matches all Cabal packages,
-- but "Cabal" matches just one Cabal package - if there are more,
-- you get an error.
ps | versionTags (pkgVersion pkgid) == versionTags globVersion
ps | pkgVersion pkgid == globVersion
-> return ps
| otherwise
-> die ("package " ++ showPackageId pkgid ++
......@@ -460,10 +460,10 @@ toField "extra_libraries" = Just $ strList . extraLibraries
toField "include_dirs" = Just $ strList . includeDirs
toField "c_includes" = Just $ strList . includes
toField "package_deps" = Just $ strList . map showPackageId. depends
toField "extra_cc_opts" = Just $ strList . extraCcOpts
toField "extra_ld_opts" = Just $ strList . extraLdOpts
toField "extra_cc_opts" = Just $ strList . ccOptions
toField "extra_ld_opts" = Just $ strList . ldOptions
toField "framework_dirs" = Just $ strList . frameworkDirs
toField "extra_frameworks"= Just $ strList . extraFrameworks
toField "extra_frameworks"= Just $ strList . frameworks
toField s = showInstalledPackageInfoField s
strList :: [String] -> String
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment