Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Shayne Fletcher
Glasgow Haskell Compiler
Commits
5a5d36cd
Commit
5a5d36cd
authored
Jan 12, 2005
by
simonmar
Browse files
[project @ 2005-01-12 13:44:20 by simonmar]
Track removal of Distribution.Compat.Error.
parent
4a4b87de
Changes
4
Hide whitespace changes
Inline
Side-by-side
ghc/lib/compat/Distribution/Compat/Error.hs
deleted
100644 → 0
View file @
4a4b87de
{-# OPTIONS -cpp #-}
#
include
"Cabal/Distribution/Compat/Error.hs"
-- dummy comment
ghc/lib/compat/Makefile
View file @
5a5d36cd
...
...
@@ -22,7 +22,6 @@ ifeq "$(ghc_603_plus)" "YES"
# These modules are all provided in GHC 6.3+
EXCLUDED_SRCS
+=
\
System/FilePath.hs
\
Distribution/Compat/Error.hs
\
Distribution/Compat/ReadP.hs
\
Distribution/Extension.hs
\
Distribution/GetOpt.hs
\
...
...
@@ -36,7 +35,6 @@ endif
# Some explicit dependencies
System/FilePath.$(way_)o
:
$(FPTOOLS_TOP)/libraries/base/System/FilePath.hs
Distribution/Compat/Error.$(way_)o
:
$(FPTOOLS_TOP)/libraries/Cabal/Distribution/Compat/Error.hs
Distribution/Compat/ReadP.$(way_)
:
$(FPTOOLS_TOP)/libraries/Cabal/Distribution/Compat/ReadP.hs
Distribution/Extension.$(way_)o
:
$(FPTOOLS_TOP)/libraries/Cabal/Distribution/Extension.hs
Distribution/GetOpt.$(way_)o
:
$(FPTOOLS_TOP)/libraries/Cabal/Distribution/GetOpt.hs
...
...
ghc/utils/ghc-pkg/Main.hs
View file @
5a5d36cd
...
...
@@ -9,7 +9,6 @@
-- TODO:
-- - validate modules
-- - expose/hide
-- - expanding of variables in new-style package conf
-- - version manipulation (checking whether old version exists,
-- hiding old version?)
...
...
@@ -19,7 +18,7 @@ module Main (main) where
import
Version
(
version
,
targetOS
,
targetARCH
)
import
Distribution.InstalledPackageInfo
import
Distribution.Compat.ReadP
import
Distribution.ParseUtils
(
showError
)
import
Distribution.ParseUtils
(
showError
,
ParseResult
(
..
)
)
import
Distribution.Package
import
Distribution.Version
import
Compat.Directory
(
getAppUserDataDirectory
,
createDirectoryIfMissing
)
...
...
@@ -338,8 +337,8 @@ parsePackageInfo
->
IO
InstalledPackageInfo
parsePackageInfo
str
defines
force
=
case
parseInstalledPackageInfo
str
of
Right
ok
->
return
ok
Left
err
->
die
(
showError
err
)
ParseOk
ok
->
return
ok
ParseFailed
err
->
die
(
showError
err
)
-- Used for converting versionless package names to new
-- PackageIdentifiers. "Version [] []" is special: it means "no
...
...
ghc/utils/ghc-pkg/Makefile
View file @
5a5d36cd
...
...
@@ -47,7 +47,6 @@ endif
SRC_MKDEPENDHS_OPTS
+=
\
-optdep--exclude-module
=
Compat.RawSystem
\
-optdep--exclude-module
=
Compat.Directory
\
-optdep--exclude-module
=
Distribution.Compat.Error
\
-optdep--exclude-module
=
Distribution.Compat.ReadP
\
-optdep--exclude-module
=
Distribution.Extension
\
-optdep--exclude-module
=
Distribution.GetOpt
\
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment