Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Distribution/Simple/I18N/GetText.hs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ import Distribution.Simple
import Distribution.Simple.InstallDirs as I
import Distribution.Simple.LocalBuildInfo
import Distribution.Simple.Setup
import Distribution.Simple.Utils
import Distribution.Simple.Utils (warn)
import Distribution.Verbosity

import Control.Arrow (second)
Expand All @@ -90,7 +90,7 @@ import System.Exit
import System.FilePath
import System.Process

import Internal
import Internal (fromPackageName, matchFileGlob)

-- | Default main function, same as
--
Expand Down
15 changes: 14 additions & 1 deletion src/Internal.hs
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
{-# LANGUAGE CPP #-}

module Internal where
module Internal (fromPackageName, matchFileGlob) where

import Distribution.Simple
#if MIN_VERSION_Cabal(2,4,0)
import Distribution.Simple.Glob (matchDirFileGlob)
import Distribution.Verbosity (silent)
#else
import Distribution.Simple.Utils (matchFileGlob)
#endif

fromPackageName :: PackageName -> String
#if MIN_VERSION_Cabal(2,0,0)
fromPackageName = unPackageName
#else
fromPackageName (PackageName s) = s
#endif

#if MIN_VERSION_Cabal(2,4,0)
-- | Newer versions of Cabal have removed this function in favour of more configurable implementation
-- We assume Cabal 2.0
matchFileGlob :: FilePath -> IO [FilePath]
matchFileGlob = matchDirFileGlob silent (mkVersion [2, 0]) "."
#endif