Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/31fce20bf6a0191e26e640d1c464deea00c8ac4d >--------------------------------------------------------------- commit 31fce20bf6a0191e26e640d1c464deea00c8ac4d Author: David Terei <[email protected]> Date: Fri Jun 17 23:05:58 2011 +0000 Add trust bool field to packages for SafeHaskell >--------------------------------------------------------------- Distribution/InstalledPackageInfo.hs | 4 ++++ Distribution/Simple/GHC/IPI641.hs | 1 + Distribution/Simple/GHC/IPI642.hs | 1 + Distribution/Simple/Register.hs | 1 + 4 files changed, 7 insertions(+), 0 deletions(-) diff --git a/Distribution/InstalledPackageInfo.hs b/Distribution/InstalledPackageInfo.hs index c5cd1b8..db3a3e6 100644 --- a/Distribution/InstalledPackageInfo.hs +++ b/Distribution/InstalledPackageInfo.hs @@ -106,6 +106,7 @@ data InstalledPackageInfo_ m exposed :: Bool, exposedModules :: [m], hiddenModules :: [m], + trusted :: Bool, importDirs :: [FilePath], -- contain sources in case of Hugs libraryDirs :: [FilePath], hsLibraries :: [String], @@ -147,6 +148,7 @@ emptyInstalledPackageInfo exposed = False, exposedModules = [], hiddenModules = [], + trusted = False, importDirs = [], libraryDirs = [], hsLibraries = [], @@ -242,6 +244,8 @@ installedFieldDescrs = [ , listField "hidden-modules" disp parseModuleNameQ hiddenModules (\xs pkg -> pkg{hiddenModules=xs}) + , boolField "trusted" + trusted (\val pkg -> pkg{trusted=val}) , listField "import-dirs" showFilePath parseFilePathQ importDirs (\xs pkg -> pkg{importDirs=xs}) diff --git a/Distribution/Simple/GHC/IPI641.hs b/Distribution/Simple/GHC/IPI641.hs index f3f33b5..dbfadf4 100644 --- a/Distribution/Simple/GHC/IPI641.hs +++ b/Distribution/Simple/GHC/IPI641.hs @@ -110,6 +110,7 @@ toCurrent ipi@InstalledPackageInfo{} = Current.InstalledPackageInfo { Current.exposed = exposed ipi, Current.exposedModules = map convertModuleName (exposedModules ipi), Current.hiddenModules = map convertModuleName (hiddenModules ipi), + Current.trusted = False, Current.importDirs = importDirs ipi, Current.libraryDirs = libraryDirs ipi, Current.hsLibraries = hsLibraries ipi, diff --git a/Distribution/Simple/GHC/IPI642.hs b/Distribution/Simple/GHC/IPI642.hs index 20b52cd..e2ac1c0 100644 --- a/Distribution/Simple/GHC/IPI642.hs +++ b/Distribution/Simple/GHC/IPI642.hs @@ -145,6 +145,7 @@ toCurrent ipi@InstalledPackageInfo{} = Current.InstalledPackageInfo { Current.exposed = exposed ipi, Current.exposedModules = map convertModuleName (exposedModules ipi), Current.hiddenModules = map convertModuleName (hiddenModules ipi), + Current.trusted = False, Current.importDirs = importDirs ipi, Current.libraryDirs = libraryDirs ipi, Current.hsLibraries = hsLibraries ipi, diff --git a/Distribution/Simple/Register.hs b/Distribution/Simple/Register.hs index 721ba86..f8c9dca 100644 --- a/Distribution/Simple/Register.hs +++ b/Distribution/Simple/Register.hs @@ -275,6 +275,7 @@ generalInstalledPackageInfo adjustRelIncDirs pkg lib clbi installDirs = IPI.exposed = libExposed lib, IPI.exposedModules = exposedModules lib, IPI.hiddenModules = otherModules bi, + IPI.trusted = False, IPI.importDirs = [ libdir installDirs | hasModules ], IPI.libraryDirs = if hasLibrary then libdir installDirs : extraLibDirs bi _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
