Commit bdd2d286 authored by Tamar Christina's avatar Tamar Christina Committed by Ben Gamari
Browse files

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
parent 10ff3e31
......@@ -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.*
......
......@@ -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.
......@@ -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.*
......
Subproject commit 082cf2066b7206d3b12a9f92d832236e2484b4c1
Subproject commit 46c79e1d8d0ed76b20e8494b697f3057b64aafd5
Subproject commit 147a0af92ac74ec58b209e16aeb1cf03bddf9482
Subproject commit ca5fbc12851b98a52f96a43ea19c54c9ecf0f9e3
Subproject commit 7e7b3c2ae34c52c525270094b625f21829c83576
Subproject commit 6f3a1823b56f47cc17a9d39897965d47d6b2cbb4
Subproject commit 4f6e0a336cb9a3517415c7279888667b9284d88f
Subproject commit 2fb7e739771f4a899a12b45f8b392e4874616b89
......@@ -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:
......
......@@ -39,8 +39,6 @@ expectedGhcOnlyExtensions :: [String]
expectedGhcOnlyExtensions = ["RelaxedLayout",
"AlternativeLayoutRule",
"AlternativeLayoutRuleTransitional",
"UnboxedSums",
"DerivingStrategies",
"EmptyDataDeriving",
"HexFloatLiterals"]
......
......@@ -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)
......
......@@ -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
......@@ -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
......@@ -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
......
......@@ -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
......@@ -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
......
......@@ -18,6 +18,6 @@ Executable ghctags
Build-Depends: base >= 4 && < 5,
containers,
Cabal >= 2.0 && <2.1,
Cabal >= 2.1 && <2.2,
ghc
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