From f5a94f38941fdcd2857d2030912833dd040f26e4 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Mon, 5 Oct 2015 19:25:08 +0200
Subject: [PATCH] Move Compat.TempFile to Internal.* module and expose from
Cabal
This is required for the reworking of integration tests
to use shell scripts.
---
Cabal/Cabal.cabal | 2 +-
Cabal/Distribution/Compat/CopyFile.hs | 2 +-
Cabal/Distribution/Compat/{ => Internal}/TempFile.hs | 2 +-
Cabal/Distribution/Simple/Test/LibV09.hs | 2 +-
Cabal/Distribution/Simple/Utils.hs | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
rename Cabal/Distribution/Compat/{ => Internal}/TempFile.hs (98%)
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
index d3bc18615c..a0ddc690df 100644
--- a/Cabal/Cabal.cabal
+++ b/Cabal/Cabal.cabal
@@ -173,6 +173,7 @@ library
Distribution.Compat.CreatePipe
Distribution.Compat.Environment
Distribution.Compat.Exception
+ Distribution.Compat.Internal.TempFile
Distribution.Compat.ReadP
Distribution.Compiler
Distribution.InstalledPackageInfo
@@ -247,7 +248,6 @@ library
other-modules:
Distribution.Compat.Binary
Distribution.Compat.CopyFile
- Distribution.Compat.TempFile
Distribution.GetOpt
Distribution.Lex
Distribution.Simple.GHC.Internal
diff --git a/Cabal/Distribution/Compat/CopyFile.hs b/Cabal/Distribution/Compat/CopyFile.hs
index f8a183b770..0f2e551d84 100644
--- a/Cabal/Distribution/Compat/CopyFile.hs
+++ b/Cabal/Distribution/Compat/CopyFile.hs
@@ -23,7 +23,7 @@ import System.IO.Error
( ioeSetLocation )
import System.Directory
( doesFileExist, renameFile, removeFile )
-import Distribution.Compat.TempFile
+import Distribution.Compat.Internal.TempFile
( openBinaryTempFile )
import System.FilePath
( takeDirectory )
diff --git a/Cabal/Distribution/Compat/TempFile.hs b/Cabal/Distribution/Compat/Internal/TempFile.hs
similarity index 98%
rename from Cabal/Distribution/Compat/TempFile.hs
rename to Cabal/Distribution/Compat/Internal/TempFile.hs
index 5892340b4e..4d94f92bd9 100644
--- a/Cabal/Distribution/Compat/TempFile.hs
+++ b/Cabal/Distribution/Compat/Internal/TempFile.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE CPP #-}
{-# OPTIONS_HADDOCK hide #-}
-module Distribution.Compat.TempFile (
+module Distribution.Compat.Internal.TempFile (
openTempFile,
openBinaryTempFile,
openNewBinaryFile,
diff --git a/Cabal/Distribution/Simple/Test/LibV09.hs b/Cabal/Distribution/Simple/Test/LibV09.hs
index 51f6131571..34d2f72250 100644
--- a/Cabal/Distribution/Simple/Test/LibV09.hs
+++ b/Cabal/Distribution/Simple/Test/LibV09.hs
@@ -8,7 +8,7 @@ module Distribution.Simple.Test.LibV09
import Distribution.Compat.CreatePipe ( createPipe )
import Distribution.Compat.Environment ( getEnvironment )
-import Distribution.Compat.TempFile ( openTempFile )
+import Distribution.Compat.Internal.TempFile ( openTempFile )
import Distribution.ModuleName ( ModuleName )
import qualified Distribution.PackageDescription as PD
import Distribution.Simple.Build.PathsModule ( pkgPathEnvVar )
diff --git a/Cabal/Distribution/Simple/Utils.hs b/Cabal/Distribution/Simple/Utils.hs
index 6560ac7290..c299d8c087 100644
--- a/Cabal/Distribution/Simple/Utils.hs
+++ b/Cabal/Distribution/Simple/Utils.hs
@@ -203,7 +203,7 @@ import System.Process
import Distribution.Compat.CopyFile
( copyFile, copyOrdinaryFile, copyExecutableFile
, setFileOrdinary, setFileExecutable, setDirOrdinary )
-import Distribution.Compat.TempFile
+import Distribution.Compat.Internal.TempFile
( openTempFile, createTempDirectory )
import Distribution.Compat.Exception
( tryIO, catchIO, catchExit )
--
GitLab