Commit 5dabca7f authored by Duncan Coutts's avatar Duncan Coutts
Browse files

reexport setFileOrdinary/Executable functions from Utils module

parent 0a6bcfdb
......@@ -89,7 +89,8 @@ import Distribution.Simple.BuildPaths
import Distribution.Simple.Setup
( CopyDest(..) )
import Distribution.Simple.Utils
( createDirectoryIfMissingVerbose, installOrdinaryFiles
( createDirectoryIfMissingVerbose
, installOrdinaryFiles, setFileExecutable
, withUTF8FileContents, writeFileAtomic, writeUTF8File
, copyFileVerbose, findFile, findFileWithExtension, findModuleFiles
, rawSystemStdInOut
......@@ -116,8 +117,6 @@ import System.Directory
, removeDirectoryRecursive, getHomeDirectory )
import System.Exit
( ExitCode(ExitSuccess) )
import Distribution.Compat.CopyFile
( setFileExecutable )
import Distribution.Compat.Exception
-- -----------------------------------------------------------------------------
......
......@@ -93,7 +93,7 @@ import Distribution.InstalledPackageInfo
, showInstalledPackageInfo )
import qualified Distribution.InstalledPackageInfo as IPI
import Distribution.Simple.Utils
( writeUTF8File, writeFileAtomic
( writeUTF8File, writeFileAtomic, setFileExecutable
, die, notice, setupMessage )
import Distribution.System
( OS(..), buildOS )
......@@ -102,8 +102,6 @@ import Distribution.Text
import Distribution.Version ( Version(..) )
import Distribution.Verbosity as Verbosity
( Verbosity, normal )
import Distribution.Compat.CopyFile
( setFileExecutable )
import Distribution.Compat.Exception
( tryIO )
......
......@@ -78,7 +78,7 @@ import Distribution.Version
( Version(versionBranch) )
import Distribution.Simple.Utils
( createDirectoryIfMissingVerbose, withUTF8FileContents, writeUTF8File
, installOrdinaryFile, installOrdinaryFiles
, installOrdinaryFile, installOrdinaryFiles, setFileExecutable
, findFile, findFileWithExtension, matchFileGlob
, withTempDirectory, defaultPackageDesc
, die, warn, notice, setupMessage )
......@@ -98,7 +98,6 @@ import Data.Maybe (isNothing, catMaybes)
import System.Time (getClockTime, toCalendarTime, CalendarTime(..))
import System.Directory
( doesFileExist, Permissions(executable), getPermissions )
import Distribution.Compat.CopyFile (setFileExecutable)
import Distribution.Verbosity (Verbosity)
import System.FilePath
( (</>), (<.>), takeDirectory, dropExtension, isAbsolute )
......
......@@ -79,6 +79,10 @@ module Distribution.Simple.Utils (
installOrdinaryFiles,
installDirectoryContents,
-- * File permissions
setFileOrdinary,
setFileExecutable,
-- * file names
currentDir,
......@@ -190,7 +194,8 @@ import System.Directory (getTemporaryDirectory)
#endif
import Distribution.Compat.CopyFile
( copyFile, copyOrdinaryFile, copyExecutableFile )
( copyFile, copyOrdinaryFile, copyExecutableFile
, setFileOrdinary, setFileExecutable )
import Distribution.Compat.TempFile
( openTempFile, openNewBinaryFile, createTempDirectory )
import Distribution.Compat.Exception
......
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