summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamar Christina <tamar@zhox.com>2017-11-08 01:21:16 -0500
committerBen Gamari <ben@smart-cactus.org>2017-11-09 17:49:22 -0500
commitbdd2d2862e248948efafa8ba4219e94825ddf21a (patch)
treeca7cbf97d125ed2d4900ef4e4a10181487010c67
parent10ff3e3180d1e808dbcff0f92afc5a3b3a8d4e83 (diff)
downloadhaskell-bdd2d2862e248948efafa8ba4219e94825ddf21a.tar.gz
Update Win32 version for GHC 8.4.
Update to Win32 2.6 which is the expected version release for 8.4 This involves moving Cabal forward which brings some backwards incompatible changes that needs various fixups. Bump a bunch of submodules Test Plan: ./validate Reviewers: austin, bgamari, angerman Reviewed By: bgamari, angerman Subscribers: angerman, thomie, rwbarton Differential Revision: https://phabricator.haskell.org/D4133
Diffstat
-rw-r--r--compiler/ghc.cabal.in2
-rw-r--r--docs/users_guide/8.4.1-notes.rst7
-rw-r--r--ghc/ghc-bin.cabal.in2
m---------libraries/Cabal0
m---------libraries/Win320
m---------libraries/directory0
m---------libraries/process0
-rw-r--r--testsuite/tests/cabal/ghcpkg01.stdout6
-rw-r--r--testsuite/tests/driver/T4437.hs2
-rw-r--r--testsuite/tests/perf/haddock/all.T3
-rw-r--r--utils/check-api-annotations/check-api-annotations.cabal2
-rw-r--r--utils/check-ppr/check-ppr.cabal2
-rw-r--r--utils/ghc-cabal/Main.hs7
-rw-r--r--utils/ghc-cabal/ghc-cabal.cabal2
-rw-r--r--utils/ghc-pkg/Main.hs8
-rw-r--r--utils/ghctags/ghctags.cabal2
16 files changed, 28 insertions, 17 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index acfaba9b73..dce96f459b 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -67,7 +67,7 @@ Library
ghci == @ProjectVersionMunged@
if os(windows)
- Build-Depends: Win32 >= 2.3 && < 2.6
+ Build-Depends: Win32 >= 2.3 && < 2.7
else
if flag(terminfo)
Build-Depends: terminfo == 0.4.*
diff --git a/docs/users_guide/8.4.1-notes.rst b/docs/users_guide/8.4.1-notes.rst
index 28e93b20ec..1e7a971989 100644
--- a/docs/users_guide/8.4.1-notes.rst
+++ b/docs/users_guide/8.4.1-notes.rst
@@ -368,3 +368,10 @@ Build system
There is currently no explicit dependency between the two in the build system and such there is no way
to notify ``base`` that the ``rts`` has been split, or vice versa.
(see :ghc-ticket:`5987`).
+
+Win32
+~~~~~
+
+- Version number 2.6.x.x (was 2.5.4.1)
+ NOTE: This release is a backwards incompatible release which corrects the type of certain APIs.
+ See issue https://github.com/haskell/win32/issues/24.
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index 5fe7c9dc5c..c94c6f8013 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -38,7 +38,7 @@ Executable ghc
ghc == @ProjectVersionMunged@
if os(windows)
- Build-Depends: Win32 >= 2.3 && < 2.6
+ Build-Depends: Win32 >= 2.3 && < 2.7
else
Build-Depends: unix == 2.7.*
diff --git a/libraries/Cabal b/libraries/Cabal
-Subproject 082cf2066b7206d3b12a9f92d832236e2484b4c
+Subproject 46c79e1d8d0ed76b20e8494b697f3057b64aafd
diff --git a/libraries/Win32 b/libraries/Win32
-Subproject 147a0af92ac74ec58b209e16aeb1cf03bddf948
+Subproject ca5fbc12851b98a52f96a43ea19c54c9ecf0f9e
diff --git a/libraries/directory b/libraries/directory
-Subproject 7e7b3c2ae34c52c525270094b625f21829c8357
+Subproject 6f3a1823b56f47cc17a9d39897965d47d6b2cbb
diff --git a/libraries/process b/libraries/process
-Subproject 4f6e0a336cb9a3517415c7279888667b9284d88
+Subproject 2fb7e739771f4a899a12b45f8b392e4874616b8
diff --git a/testsuite/tests/cabal/ghcpkg01.stdout b/testsuite/tests/cabal/ghcpkg01.stdout
index 7077b3507b..ef77814b4c 100644
--- a/testsuite/tests/cabal/ghcpkg01.stdout
+++ b/testsuite/tests/cabal/ghcpkg01.stdout
@@ -24,6 +24,7 @@ abi:
trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
+data-dir: ""
hs-libraries: testpkg-1.2.3.4-XXX
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
pkgroot:
@@ -51,6 +52,7 @@ abi:
trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
+data-dir: ""
hs-libraries: testpkg-1.2.3.4-XXX
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
pkgroot:
@@ -84,6 +86,7 @@ abi:
trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
+data-dir: ""
hs-libraries: testpkg-2.0-XXX
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
pkgroot:
@@ -111,6 +114,7 @@ abi:
trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
+data-dir: ""
hs-libraries: testpkg-2.0-XXX
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
pkgroot:
@@ -138,6 +142,7 @@ abi:
trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
+data-dir: ""
hs-libraries: testpkg-1.2.3.4-XXX
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
pkgroot:
@@ -172,6 +177,7 @@ abi:
trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
+data-dir: ""
hs-libraries: testpkg-1.2.3.4-XXX
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
pkgroot:
diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs
index 4e7ddd7482..e8dc8a415f 100644
--- a/testsuite/tests/driver/T4437.hs
+++ b/testsuite/tests/driver/T4437.hs
@@ -39,8 +39,6 @@ expectedGhcOnlyExtensions :: [String]
expectedGhcOnlyExtensions = ["RelaxedLayout",
"AlternativeLayoutRule",
"AlternativeLayoutRuleTransitional",
- "UnboxedSums",
- "DerivingStrategies",
"EmptyDataDeriving",
"HexFloatLiterals"]
diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T
index 7e55d494cf..bb6f5c02f6 100644
--- a/testsuite/tests/perf/haddock/all.T
+++ b/testsuite/tests/perf/haddock/all.T
@@ -69,7 +69,7 @@ test('haddock.Cabal',
[extra_files(['../../../../libraries/Cabal/Cabal/dist-install/haddock.t']),
unless(in_tree_compiler(), skip), req_haddock
,stats_num_field('bytes allocated',
- [(wordsize(64), 18936339648, 5)
+ [(wordsize(64), 20104611952, 5)
# 2012-08-14: 3255435248 (amd64/Linux)
# 2012-08-29: 3324606664 (amd64/Linux, new codegen)
# 2012-10-08: 3373401360 (amd64/Linux)
@@ -120,6 +120,7 @@ test('haddock.Cabal',
# 2017-08-22: 15857428040 (amd64/Linux) - Various Haddock optimizations
# 2017-11-02: 17133915848 (amd64/Linux) - Phabricator D4144
# 2017-11-06: 18936339648 (amd64/Linux) - Unknown
+ # 2017-11-09: 20104611952 (amd64/Linux) - Bump Cabal
,(platform('i386-unknown-mingw32'), 3293415576, 5)
# 2012-10-30: 1733638168 (x86/Windows)
diff --git a/utils/check-api-annotations/check-api-annotations.cabal b/utils/check-api-annotations/check-api-annotations.cabal
index 880f4d6603..f2b3d74e1c 100644
--- a/utils/check-api-annotations/check-api-annotations.cabal
+++ b/utils/check-api-annotations/check-api-annotations.cabal
@@ -24,6 +24,6 @@ Executable check-api-annotations
Build-Depends: base >= 4 && < 5,
containers,
- Cabal >= 2.0 && < 2.1,
+ Cabal >= 2.1 && < 2.2,
directory,
ghc
diff --git a/utils/check-ppr/check-ppr.cabal b/utils/check-ppr/check-ppr.cabal
index 584558b3ff..e788927196 100644
--- a/utils/check-ppr/check-ppr.cabal
+++ b/utils/check-ppr/check-ppr.cabal
@@ -25,7 +25,7 @@ Executable check-ppr
Build-Depends: base >= 4 && < 5,
bytestring,
containers,
- Cabal >= 2.0 && < 2.1,
+ Cabal >= 2.1 && < 2.2,
directory,
filepath,
ghc
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index e445520c80..2ba912a30f 100644
--- a/utils/ghc-cabal/Main.hs
+++ b/utils/ghc-cabal/Main.hs
@@ -15,7 +15,8 @@ import Distribution.Simple.GHC
import Distribution.Simple.Program
import Distribution.Simple.Program.HcPkg
import Distribution.Simple.Setup (ConfigFlags(configStripLibs), fromFlag, toFlag)
-import Distribution.Simple.Utils (defaultPackageDesc, writeFileAtomic, toUTF8)
+import Distribution.Simple.Utils (defaultPackageDesc, writeFileAtomic,
+ toUTF8LBS)
import Distribution.Simple.Build (writeAutogenFiles)
import Distribution.Simple.Register
import Distribution.Text
@@ -26,7 +27,6 @@ import qualified Distribution.Simple.PackageIndex as PackageIndex
import Control.Exception (bracket)
import Control.Monad
-import qualified Data.ByteString.Lazy.Char8 as BS
import Data.List
import Data.Maybe
import System.IO
@@ -307,7 +307,8 @@ generate directory distdir config_args
Installed.haddockHTMLs = []
}
content = Installed.showInstalledPackageInfo final_ipi ++ "\n"
- writeFileAtomic (distdir </> "inplace-pkg-config") (BS.pack $ toUTF8 content)
+ writeFileAtomic (distdir </> "inplace-pkg-config")
+ (toUTF8LBS content)
let
comp = compiler lbi
diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal
index 2c20432b5f..7f413b6fc8 100644
--- a/utils/ghc-cabal/ghc-cabal.cabal
+++ b/utils/ghc-cabal/ghc-cabal.cabal
@@ -21,7 +21,7 @@ Executable ghc-cabal
Build-Depends: base >= 3 && < 5,
bytestring >= 0.10 && < 0.11,
- Cabal >= 2.0 && < 2.1,
+ Cabal >= 2.1 && < 2.2,
directory >= 1.1 && < 1.4,
filepath >= 1.2 && < 1.5
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs
index 9074acfd4c..6420dd4f16 100644
--- a/utils/ghc-pkg/Main.hs
+++ b/utils/ghc-pkg/Main.hs
@@ -44,7 +44,7 @@ import Distribution.Backpack
import Distribution.Types.UnqualComponentName
import Distribution.Types.MungedPackageName
import Distribution.Types.MungedPackageId
-import Distribution.Simple.Utils (fromUTF8, toUTF8, writeUTF8File, readUTF8File)
+import Distribution.Simple.Utils (fromUTF8BS, toUTF8BS, writeUTF8File, readUTF8File)
import qualified Data.Version as Version
import System.FilePath as FilePath
import qualified System.FilePath.Posix as FilePath.Posix
@@ -75,8 +75,6 @@ import qualified Data.Traversable as F
import qualified Data.Set as Set
import qualified Data.Map as Map
-import qualified Data.ByteString.Char8 as BS
-
#if defined(mingw32_HOST_OS)
-- mingw32 needs these for getExecDir
import Foreign
@@ -1286,8 +1284,8 @@ instance GhcPkg.BinaryStringRep ModuleName where
toStringRep = toStringRep . display
instance GhcPkg.BinaryStringRep String where
- fromStringRep = fromUTF8 . BS.unpack
- toStringRep = BS.pack . toUTF8
+ fromStringRep = fromUTF8BS
+ toStringRep = toUTF8BS
instance GhcPkg.BinaryStringRep UnitId where
fromStringRep = mkUnitId . fromStringRep
diff --git a/utils/ghctags/ghctags.cabal b/utils/ghctags/ghctags.cabal
index 1bb658882c..0e2bc5252e 100644
--- a/utils/ghctags/ghctags.cabal
+++ b/utils/ghctags/ghctags.cabal
@@ -18,6 +18,6 @@ Executable ghctags
Build-Depends: base >= 4 && < 5,
containers,
- Cabal >= 2.0 && <2.1,
+ Cabal >= 2.1 && <2.2,
ghc
View Lorry Controller Status