diff --git a/.gitignore b/.gitignore index f6d6b0bc9006..3acf42ec0e71 100644 --- a/.gitignore +++ b/.gitignore @@ -116,8 +116,6 @@ _darcs/ /compiler/MachRegs.h /compiler/MachRegs /compiler/GHC/CmmToLlvm/Version/Bounds.hs -/compiler/ghc.cabal -/compiler/ghc.cabal.old /distrib/configure.ac /distrib/ghc.iss /docs/index.html @@ -138,7 +136,6 @@ _darcs/ /docs/users_guide/utils.pyc /driver/ghci/ghc-pkg-inplace /driver/ghci/ghci-inplace -/driver/ghci/ghci-wrapper.cabal /driver/ghci/ghci.res /driver/ghci/cwrapper.c /driver/ghci/cwrapper.h @@ -150,7 +147,6 @@ _darcs/ /driver/package.conf.inplace.old /settings /ghc.spec -/ghc/ghc-bin.cabal /index.html /inplace/ /libffi/build/ @@ -165,29 +161,19 @@ _darcs/ /libraries/doc-index*.html /libraries/frames.html /libraries/ghc-boot/GNUmakefile -/libraries/ghc-boot/ghc-boot.cabal /libraries/ghc-boot-th/GNUmakefile -/libraries/ghc-boot-th/ghc-boot-th.cabal -/libraries/ghc-boot-th-next/ghc-boot-th-next.cabal /libraries/ghc-boot-th/ghc.mk -/libraries/ghc-heap/ghc-heap.cabal -/libraries/ghc-internal/ghc-internal.cabal -/libraries/ghc-experimental/ghc-experimental.cabal -/libraries/base/base.cabal /libraries/ghci/GNUmakefile -/libraries/ghci/ghci.cabal /libraries/ghci/ghc.mk /libraries/haddock-util.js /libraries/hslogo-16.png /libraries/index-frames.html /libraries/index.html -/libraries/libiserv/libiserv.cabal /libraries/minus.gif /libraries/ocean.css /libraries/plus.gif /libraries/synopsis.png /libraries/stamp/ -/libraries/template-haskell/template-haskell.cabal /linter.log /mk/are-validating.mk /mk/build.mk @@ -202,13 +188,6 @@ _darcs/ /testsuite_summary*.txt /testsuite*.xml /testlog* -/utils/iserv/iserv.cabal -/utils/iserv-proxy/iserv-proxy.cabal -/utils/remote-iserv/remote-iserv.cabal -/utils/mkUserGuidePart/mkUserGuidePart.cabal -/utils/runghc/runghc.cabal -/utils/gen-dll/gen-dll.cabal -/utils/ghc-pkg/ghc-pkg.cabal utils/unlit/fs.* libraries/ghc-internal/include/fs.h libraries/ghc-internal/cbits/fs.c diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal similarity index 98% rename from compiler/ghc.cabal.in rename to compiler/ghc.cabal index 32ddf3c0c3b5..88bd841238fb 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal @@ -3,7 +3,7 @@ Cabal-Version: 2.2 -- ./configure. Make sure you are editing ghc.cabal.in, not ghc.cabal. Name: ghc -Version: @ProjectVersionMunged@ +Version: 9.14 License: BSD-3-Clause License-File: LICENSE Author: The GHC Team @@ -112,17 +112,17 @@ Library stm, rts, rts-headers, - ghc-boot == @ProjectVersionMunged@, - ghc-heap == @ProjectVersionMunged@, - ghci == @ProjectVersionMunged@ + ghc-boot == 9.14, + ghc-heap == 9.14, + ghci == 9.14 if flag(bootstrap) Build-Depends: - ghc-boot-th-next == @ProjectVersionMunged@ + ghc-boot-th-next == 9.14 else Build-Depends: - ghc-boot-th == @ProjectVersionMunged@, - ghc-internal == @ProjectVersionForLib@.0, + ghc-boot-th == 9.14, + ghc-internal == 9.1400.0, if os(windows) Build-Depends: Win32 >= 2.3 && < 2.15 diff --git a/configure.ac b/configure.ac index 12056742ccdf..0d7c5346faaf 100644 --- a/configure.ac +++ b/configure.ac @@ -2,32 +2,7 @@ AC_PREREQ([2.69]) AC_INIT([ghc-builder], [0.1.0], [your-email@example.com]) AC_CONFIG_SRCDIR([.]) # A representative .in file -#AC_CONFIG_AUX_DIR([build-aux]) # Recommended place for config.guess, config.sub AC_CONFIG_MACRO_DIR([m4]) # For any custom m4 macros -# AM_INIT_AUTOMAKE([-Wall -Werror foreign]) # Using some automake conventions - -# --- Define GHC Build Options --- -# Usage: ./configure ProjectVersion=X.Y ... -AC_ARG_WITH([project-version], [AS_HELP_STRING([--with-project-version=VER], [GHC version (default: 9.14)])], [ProjectVersion="$withval"], [ProjectVersion="9.14"]) -AC_ARG_WITH([project-version-int], [AS_HELP_STRING([--with-project-version-int=VER], [GHC version as int (default: 913)])], [ProjectVersionInt="$withval"], [ProjectVersionInt="913"]) -AC_ARG_WITH([project-version-munged], [AS_HELP_STRING([--with-project-version-munged=VER], [GHC version "munged" (default: 9.14)])], [ProjectVersionMunged="$withval"], [ProjectVersionMunged="9.14"]) -AC_ARG_WITH([project-version-for-lib], [AS_HELP_STRING([--with-project-version-for-lib=VER], [GHC version for libraries (default: 9.1400)])], [ProjectVersionForLib="$withval"], [ProjectVersionForLib="9.1400"]) -AC_ARG_WITH([project-patch-level], [AS_HELP_STRING([--with-project-patch-level=VER], [GHC patchlevel version (default: 0)])], [ProjectPatchLevel="$withval"], [ProjectPatchLevel="0"]) -AC_ARG_WITH([project-patch-level1], [AS_HELP_STRING([--with-project-patch-level1=VER], [GHC patchlevel1 version (default: 0)])], [ProjectPatchLevel1="$withval"], [ProjectPatchLevel1="0"]) -AC_ARG_WITH([project-patch-level2], [AS_HELP_STRING([--with-project-patch-level2=VER], [GHC patchlevel2 version (default: 0)])], [ProjectPatchLevel2="$withval"], [ProjectPatchLevel2="0"]) - -# Export these variables for substitution by AC_SUBST -AC_SUBST([ProjectVersion]) -AC_SUBST([ProjectVersionInt]) -AC_SUBST([ProjectVersionMunged]) -AC_SUBST([ProjectVersionForLib]) -AC_SUBST([ProjectPatchLevel]) -AC_SUBST([ProjectPatchLevel1]) -AC_SUBST([ProjectPatchLevel2]) - -# For ghc-boot-th.cabal.in -AC_SUBST([Suffix],[""]) -AC_SUBST([SourceRoot],["."]) # --- Feature toggle (dynamic only) for imported project settings --- AC_ARG_ENABLE([dynamic], @@ -79,23 +54,8 @@ AC_SUBST([LlvmMaxVersion]) # --- Files to generate --- # config.status will create these files by substituting @VAR@ placeholders. AC_CONFIG_FILES([ - ghc/ghc-bin.cabal:ghc/ghc-bin.cabal.in - compiler/ghc.cabal:compiler/ghc.cabal.in - compiler/GHC/CmmToLlvm/Version/Bounds.hs:compiler/GHC/CmmToLlvm/Version/Bounds.hs.in - libraries/ghc-boot/ghc-boot.cabal:libraries/ghc-boot/ghc-boot.cabal.in - libraries/ghc-boot-th/ghc-boot-th.cabal:libraries/ghc-boot-th/ghc-boot-th.cabal.in - libraries/ghc-boot-th-next/ghc-boot-th-next.cabal:libraries/ghc-boot-th-next/ghc-boot-th-next.cabal.in - libraries/ghc-heap/ghc-heap.cabal:libraries/ghc-heap/ghc-heap.cabal.in - libraries/template-haskell/template-haskell.cabal:libraries/template-haskell/template-haskell.cabal.in - libraries/ghci/ghci.cabal:libraries/ghci/ghci.cabal.in - utils/ghc-pkg/ghc-pkg.cabal:utils/ghc-pkg/ghc-pkg.cabal.in - utils/ghc-iserv/ghc-iserv.cabal:utils/ghc-iserv/ghc-iserv.cabal.in - utils/runghc/runghc.cabal:utils/runghc/runghc.cabal.in - libraries/ghc-internal/ghc-internal.cabal:libraries/ghc-internal/ghc-internal.cabal.in - libraries/ghc-experimental/ghc-experimental.cabal:libraries/ghc-experimental/ghc-experimental.cabal.in - libraries/base/base.cabal:libraries/base/base.cabal.in - rts/include/ghcversion.h:rts/include/ghcversion.h.in - cabal.project.stage2.settings:cabal.project.stage2.settings.in + compiler/GHC/CmmToLlvm/Version/Bounds.hs + cabal.project.stage2.settings ]) AC_OUTPUT diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in index 3cdaa782e0fd..7a79b9c15318 100644 --- a/distrib/configure.ac.in +++ b/distrib/configure.ac.in @@ -4,7 +4,7 @@ dnl #!/bin/sh # -AC_INIT([The Glorious Glasgow Haskell Compilation System], [@ProjectVersion@], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION]) +AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.14], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION]) dnl See /configure.ac for rationale. AC_PREREQ([2.69]) diff --git a/docs/users_guide/ghc_config.py.in b/docs/users_guide/ghc_config.py.in index 655bcb6861b1..f2cb255a051c 100644 --- a/docs/users_guide/ghc_config.py.in +++ b/docs/users_guide/ghc_config.py.in @@ -27,7 +27,7 @@ lib_versions = { 'array': '@LIBRARY_array_UNIT_ID@', } -version = '@ProjectVersion@' +version = '9.14' llvm_version_min = '@LlvmMinVersion@' llvm_version_max = '@LlvmMaxVersion@' diff --git a/driver/ghci/ghci-wrapper.cabal.in b/driver/ghci/ghci-wrapper.cabal.in index 2857e47a9da5..f333c57387b4 100644 --- a/driver/ghci/ghci-wrapper.cabal.in +++ b/driver/ghci/ghci-wrapper.cabal.in @@ -2,7 +2,7 @@ -- ./configure. Make sure you are editing ghci-wrapper.cabal.in, not ghci-wrapper.cabal. Name: ghci-wrapper -Version: @ProjectVersion@ +Version: 9.14 Copyright: XXX License: BSD3 -- XXX License-File: LICENSE @@ -29,4 +29,4 @@ Executable ghci -- We need to call the versioned ghc executable because the unversioned -- GHC executable is a wrapper that doesn't call FreeConsole and so -- breaks an interactive process like GHCi. See #21889, #14150 and #13411 - cc-options: -DEXE_PATH="ghc-@ProjectVersion@" + cc-options: -DEXE_PATH="ghc-9.14" diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal similarity index 94% rename from ghc/ghc-bin.cabal.in rename to ghc/ghc-bin.cabal index fdcac3da9961..3d53830ee551 100644 --- a/ghc/ghc-bin.cabal.in +++ b/ghc/ghc-bin.cabal @@ -3,7 +3,7 @@ Cabal-Version: 3.0 -- ./configure. Make sure you are editing ghc-bin.cabal.in, not ghc-bin.cabal. Name: ghc-bin -Version: @ProjectVersion@ +Version: 9.14 Copyright: XXX -- License: XXX -- License-File: XXX @@ -42,8 +42,8 @@ Executable ghc filepath >= 1.5 && < 1.6, containers >= 0.5 && < 0.9, transformers >= 0.5 && < 0.7, - ghc-boot == @ProjectVersionMunged@, - ghc == @ProjectVersionMunged@ + ghc-boot == 9.14, + ghc == 9.14 if impl(ghc > 9.12) -- we need to depend on the specific rts we want to link our @@ -70,7 +70,7 @@ Executable ghc Build-depends: deepseq >= 1.4 && < 1.6, ghc-prim >= 0.5.0 && < 0.14, - ghci == @ProjectVersionMunged@, + ghci == 9.14, haskeline == 0.8.*, exceptions == 0.10.*, time >= 1.8 && < 1.16 diff --git a/hadrian/cfg/system.config.in b/hadrian/cfg/system.config.in index ad31f0617422..2c299fecfa2c 100644 --- a/hadrian/cfg/system.config.in +++ b/hadrian/cfg/system.config.in @@ -63,13 +63,13 @@ ghc-patch-level = @GhcPatchLevel@ bootstrap-threaded-rts = @GhcThreadedRts@ project-name = @ProjectName@ -project-version = @ProjectVersion@ -project-version-munged = @ProjectVersionMunged@ -project-version-for-lib = @ProjectVersionForLib@ -project-version-int = @ProjectVersionInt@ +project-version = 9.14 +project-version-munged = 9.14 +project-version-for-lib = 9.1400 +project-version-int = 914 project-patch-level = @ProjectPatchLevel@ -project-patch-level1 = @ProjectPatchLevel1@ -project-patch-level2 = @ProjectPatchLevel2@ +project-patch-level1 = 0 +project-patch-level2 = 0 project-git-commit-id = @ProjectGitCommitId@ # Settings: diff --git a/libraries/base/base.cabal.in b/libraries/base/base.cabal similarity index 99% rename from libraries/base/base.cabal.in rename to libraries/base/base.cabal index 5d677865b3e8..0dc2e8ed9acb 100644 --- a/libraries/base/base.cabal.in +++ b/libraries/base/base.cabal @@ -30,7 +30,7 @@ Library default-language: Haskell2010 default-extensions: NoImplicitPrelude build-depends: - ghc-internal == @ProjectVersionForLib@.*, + ghc-internal == 9.1400.*, ghc-prim, exposed-modules: diff --git a/libraries/ghc-boot-th/ghc-boot-th.cabal.in b/libraries/ghc-boot-th/ghc-boot-th.cabal similarity index 87% rename from libraries/ghc-boot-th/ghc-boot-th.cabal.in rename to libraries/ghc-boot-th/ghc-boot-th.cabal index 2c299ad6c06c..fbb8c96ff562 100644 --- a/libraries/ghc-boot-th/ghc-boot-th.cabal.in +++ b/libraries/ghc-boot-th/ghc-boot-th.cabal @@ -1,9 +1,9 @@ --- WARNING: ghc-boot-th@Suffix@.cabal is automatically generated from --- ghc-boot-th@Suffix@.cabal.in by ../../configure. Make sure you are editing --- ghc-boot-th@Suffix@.cabal.in, not ghc-boot-th@Suffix@.cabal. +-- WARNING: ghc-boot-th.cabal is automatically generated from +-- ghc-boot-th.cabal.in by ../../configure. Make sure you are editing +-- ghc-boot-th.cabal.in, not ghc-boot-th.cabal. -name: ghc-boot-th@Suffix@ -version: @ProjectVersionMunged@ +name: ghc-boot-th +version: 9.14 license: BSD3 license-file: LICENSE category: GHC @@ -67,7 +67,7 @@ Library GHC.Internal.LanguageExtensions GHC.Internal.Lexeme else - hs-source-dirs: @SourceRoot@ + hs-source-dirs: . build-depends: ghc-internal exposed-modules: diff --git a/libraries/ghc-boot/ghc-boot.cabal.in b/libraries/ghc-boot/ghc-boot.cabal similarity index 95% rename from libraries/ghc-boot/ghc-boot.cabal.in rename to libraries/ghc-boot/ghc-boot.cabal index 9ccbcc81c76d..0f95c852bee8 100644 --- a/libraries/ghc-boot/ghc-boot.cabal.in +++ b/libraries/ghc-boot/ghc-boot.cabal @@ -5,7 +5,7 @@ cabal-version: 3.0 -- ghc-boot.cabal. name: ghc-boot -version: @ProjectVersionMunged@ +version: 9.14 license: BSD-3-Clause license-file: LICENSE category: GHC @@ -94,10 +94,10 @@ Library if flag(bootstrap) build-depends: - ghc-boot-th-next == @ProjectVersionMunged@ + ghc-boot-th-next == 9.14 else build-depends: - ghc-boot-th == @ProjectVersionMunged@ + ghc-boot-th == 9.14 if !os(windows) build-depends: diff --git a/libraries/ghc-experimental/ghc-experimental.cabal.in b/libraries/ghc-experimental/ghc-experimental.cabal similarity index 93% rename from libraries/ghc-experimental/ghc-experimental.cabal.in rename to libraries/ghc-experimental/ghc-experimental.cabal index de5cfd8252c9..d99604a196b1 100644 --- a/libraries/ghc-experimental/ghc-experimental.cabal.in +++ b/libraries/ghc-experimental/ghc-experimental.cabal @@ -6,7 +6,7 @@ cabal-version: 3.0 name: ghc-experimental -- The project is ghc's version plus ghc-experimental's version suffix. -- For example, for ghc=9.10.1, ghc-experimental's version will be 9.1001.0. -version: @ProjectVersionForLib@.0 +version: 9.1400.0 synopsis: Experimental features of GHC's standard library description: This package is where experimental GHC standard library interfaces start @@ -43,6 +43,6 @@ library exposed-modules: GHC.Wasm.Prim other-extensions: build-depends: base >=4.20 && < 4.23, - ghc-internal == @ProjectVersionForLib@.* + ghc-internal == 9.1400.* hs-source-dirs: src default-language: Haskell2010 diff --git a/libraries/ghc-heap/ghc-heap.cabal.in b/libraries/ghc-heap/ghc-heap.cabal similarity index 94% rename from libraries/ghc-heap/ghc-heap.cabal.in rename to libraries/ghc-heap/ghc-heap.cabal index ab0ab0856e0c..90f472f0d83a 100644 --- a/libraries/ghc-heap/ghc-heap.cabal.in +++ b/libraries/ghc-heap/ghc-heap.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: ghc-heap -version: @ProjectVersionMunged@ +version: 9.14 license: BSD-3-Clause license-file: LICENSE maintainer: libraries@haskell.org @@ -27,7 +27,7 @@ library , containers >= 0.6.2.1 && < 0.9 if impl(ghc >= 9.9) - build-depends: ghc-internal >= 9.900 && < @ProjectVersionForLib@.99999 + build-depends: ghc-internal >= 9.900 && < 9.1400.99999 else build-depends: ghc-prim > 0.2 && < 0.14 diff --git a/libraries/ghc-internal/ghc-internal.cabal b/libraries/ghc-internal/ghc-internal.cabal new file mode 100644 index 000000000000..15c01343d71f --- /dev/null +++ b/libraries/ghc-internal/ghc-internal.cabal @@ -0,0 +1,576 @@ +cabal-version: 3.8 +-- WARNING: ghc-internal.cabal is automatically generated from ghc-internal.cabal.in by +-- the top-level ./configure script. Make sure you are editing ghc-internal.cabal.in, not ghc-internal.cabal. +name: ghc-internal +-- The project is ghc's version plus ghc-internal's version suffix. +-- For example, for ghc=9.10.1, ghc-internal's version will be 9.1001.0. +version: 9.1400.0 +license: BSD-3-Clause +license-file: LICENSE +maintainer: The GHC Developers +bug-reports: https://gitlab.haskell.org/ghc/ghc/-/issues/new +synopsis: Basic libraries +category: Prelude +build-type: Configure +description: + This package contains the implementation of GHC's standard libraries and is + not intended for use by end-users. + . + Users should instead use either the @base@ or @ghc-experimental@ packages + + +extra-tmp-files: + autom4te.cache + ghc-internal.buildinfo + config.log + config.status + include/EventConfig.h + include/HsBaseConfig.h + +extra-source-files: + aclocal.m4 + ghc-internal.buildinfo.in + CHANGELOG.md + cbits/gmp_wrappers.c + configure + configure.ac + include/CTypes.h + include/EventConfig.h.in + include/HsBaseConfig.h.in + include/ieee-flpt.h + include/md5.h + include/winio_structs.h + include/WordSize.h + include/HsIntegerGmp.h.in + install-sh + +source-repository head + type: git + location: https://gitlab.haskell.org/ghc/ghc.git + subdir: libraries/base + +Flag bignum-native + Description: Enable native Haskell bignum backend + Manual: True + Default: False + +Flag bignum-ffi + Description: Enable FFI bignum backend + Manual: True + Default: False + +Flag bignum-gmp + Description: Enable GMP bignum backend + Manual: True + Default: False + +Flag bignum-check + Description: Validate results of the enabled backend against native backend. + Manual: True + Default: False + +Flag need-atomic + Description: Enable linking with "atomic" library (for 64-bit atomic ops on armel, #20549) + Manual: True + Default: False + + +Library + default-language: Haskell2010 + default-extensions: + NoImplicitPrelude + other-extensions: + BangPatterns + CApiFFI + CPP + ConstraintKinds + DataKinds + DeriveDataTypeable + DeriveGeneric + ExistentialQuantification + ExplicitForAll + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + GeneralizedNewtypeDeriving + KindSignatures + MagicHash + MultiParamTypeClasses + NegativeLiterals + NondecreasingIndentation + OverloadedStrings + ParallelArrays + PolyKinds + RankNTypes + RecordWildCards + RoleAnnotations + Safe + ScopedTypeVariables + StandaloneDeriving + Trustworthy + TypeFamilies + TypeOperators + TypeSynonymInstances + UnboxedTuples + UndecidableInstances + UnliftedFFITypes + Unsafe + + build-depends: + rts == 1.0.*, + rts-fs == 1.0.* + + exposed-modules: + GHC.Internal.AllocationLimitHandler + GHC.Internal.ClosureTypes + GHC.Internal.Control.Arrow + GHC.Internal.Control.Category + GHC.Internal.Control.Concurrent.MVar + GHC.Internal.Control.Exception + GHC.Internal.Control.Exception.Base + GHC.Internal.Control.Monad + GHC.Internal.Control.Monad.Fail + GHC.Internal.Control.Monad.Fix + GHC.Internal.Control.Monad.IO.Class + GHC.Internal.Control.Monad.ST + GHC.Internal.Control.Monad.Zip + GHC.Internal.Control.Monad.ST.Lazy + GHC.Internal.Control.Monad.ST.Imp + GHC.Internal.Control.Monad.ST.Lazy.Imp + GHC.Internal.Data.Bits + GHC.Internal.Data.Bool + GHC.Internal.Data.Coerce + GHC.Internal.Data.Data + GHC.Internal.Data.Dynamic + GHC.Internal.Data.Either + GHC.Internal.Data.Eq + GHC.Internal.Data.Foldable + GHC.Internal.Data.Function + GHC.Internal.Data.Functor + GHC.Internal.Data.Functor.Const + GHC.Internal.Data.Functor.Identity + GHC.Internal.Data.Functor.Utils + GHC.Internal.Data.IORef + GHC.Internal.Data.Ix + GHC.Internal.Data.List + GHC.Internal.Data.List.NonEmpty + GHC.Internal.Data.Maybe + GHC.Internal.Data.Monoid + GHC.Internal.Data.NonEmpty + GHC.Internal.Data.OldList + GHC.Internal.Data.Ord + GHC.Internal.Data.Proxy + GHC.Internal.Data.Semigroup.Internal + GHC.Internal.Data.STRef + GHC.Internal.Data.STRef.Strict + GHC.Internal.Data.String + GHC.Internal.Data.Traversable + GHC.Internal.Data.Tuple + GHC.Internal.Data.Type.Bool + GHC.Internal.Data.Type.Coercion + GHC.Internal.Data.Type.Equality + GHC.Internal.Data.Type.Ord + GHC.Internal.Data.Typeable + GHC.Internal.Data.Unique + GHC.Internal.Data.Version + GHC.Internal.Data.Void + GHC.Internal.Debug.Trace + GHC.Internal.Foreign.C.ConstPtr + GHC.Internal.Foreign.C.Error + GHC.Internal.Foreign.C.String + GHC.Internal.Foreign.C.String.Encoding + GHC.Internal.Foreign.C.Types + GHC.Internal.Foreign.Concurrent + GHC.Internal.Foreign.ForeignPtr + GHC.Internal.Foreign.ForeignPtr.Imp + GHC.Internal.Foreign.ForeignPtr.Unsafe + GHC.Internal.Foreign.Marshal.Alloc + GHC.Internal.Foreign.Marshal.Array + GHC.Internal.Foreign.Marshal.Error + GHC.Internal.Foreign.Marshal.Pool + GHC.Internal.Foreign.Marshal.Safe + GHC.Internal.Foreign.Marshal.Unsafe + GHC.Internal.Foreign.Marshal.Utils + GHC.Internal.Foreign.Ptr + GHC.Internal.Foreign.StablePtr + GHC.Internal.Foreign.Storable + GHC.Internal.ForeignSrcLang + GHC.Internal.Arr + GHC.Internal.ArrayArray + GHC.Internal.Base + GHC.Internal.Bits + GHC.Internal.ByteOrder + GHC.Internal.Char + GHC.Internal.Clock + GHC.Internal.Conc.Bound + GHC.Internal.Conc.IO + GHC.Internal.Conc.Signal + GHC.Internal.Conc.Sync + GHC.Internal.ConsoleHandler + GHC.Internal.Desugar + GHC.Internal.Encoding.UTF8 + GHC.Internal.Enum + GHC.Internal.Environment + GHC.Internal.Err + GHC.Internal.Event.TimeOut + GHC.Internal.Exception + GHC.Internal.Exception.Backtrace + GHC.Internal.Exception.Context + GHC.Internal.Exception.Type + GHC.Internal.ExecutionStack + GHC.Internal.ExecutionStack.Internal + GHC.Internal.Exts + GHC.Internal.Fingerprint + GHC.Internal.Fingerprint.Type + GHC.Internal.Float + GHC.Internal.Float.ConversionUtils + GHC.Internal.Float.RealFracMethods + GHC.Internal.ForeignPtr + GHC.Internal.Functor.ZipList + GHC.Internal.GHCi + GHC.Internal.GHCi.Helpers + GHC.Internal.Generics + GHC.Internal.InfoProv + GHC.Internal.InfoProv.Types + GHC.Internal.IO + GHC.Internal.IO.Buffer + GHC.Internal.IO.BufferedIO + GHC.Internal.IO.Device + GHC.Internal.IO.Encoding + GHC.Internal.IO.Encoding.CodePage + GHC.Internal.IO.Encoding.Failure + GHC.Internal.IO.Encoding.Iconv + GHC.Internal.IO.Encoding.Latin1 + GHC.Internal.IO.Encoding.Types + GHC.Internal.IO.Encoding.UTF16 + GHC.Internal.IO.Encoding.UTF32 + GHC.Internal.IO.Encoding.UTF8 + GHC.Internal.IO.Exception + GHC.Internal.IO.FD + GHC.Internal.IO.Handle + GHC.Internal.IO.Handle.FD + GHC.Internal.IO.Handle.Internals + GHC.Internal.IO.Handle.Lock + GHC.Internal.IO.Handle.Text + GHC.Internal.IO.Handle.Types + GHC.Internal.IO.IOMode + GHC.Internal.IO.Unsafe + GHC.Internal.IO.StdHandles + GHC.Internal.IO.SubSystem + GHC.Internal.IOArray + GHC.Internal.IORef + GHC.Internal.Int + GHC.Internal.Integer + GHC.Internal.Integer.Logarithms + GHC.Internal.IsList + GHC.Internal.Ix + GHC.Internal.LanguageExtensions + GHC.Internal.Lexeme + GHC.Internal.List + GHC.Internal.Maybe + GHC.Internal.MVar + GHC.Internal.Natural + GHC.Internal.Num + GHC.Internal.OverloadedLabels + GHC.Internal.Pack + GHC.Internal.Profiling + GHC.Internal.Ptr + GHC.Internal.Read + GHC.Internal.Real + GHC.Internal.Records + GHC.Internal.ResponseFile + GHC.Internal.RTS.Flags + GHC.Internal.RTS.Flags.Test + GHC.Internal.ST + GHC.Internal.Stack.CloneStack + GHC.Internal.StaticPtr + GHC.Internal.STRef + GHC.Internal.Show + GHC.Internal.Stable + GHC.Internal.StableName + GHC.Internal.Stack + GHC.Internal.Stack.CCS + GHC.Internal.Stack.Types + GHC.Internal.Stats + GHC.Internal.Storable + GHC.Internal.TH.Syntax + GHC.Internal.TH.Lib + GHC.Internal.TH.Lift + GHC.Internal.TH.Quote + GHC.Internal.TopHandler + GHC.Internal.TypeError + GHC.Internal.TypeLits + GHC.Internal.TypeLits.Internal + GHC.Internal.TypeNats + GHC.Internal.TypeNats.Internal + GHC.Internal.Unicode + GHC.Internal.Weak + GHC.Internal.Weak.Finalize + GHC.Internal.Word + GHC.Internal.Numeric + GHC.Internal.Numeric.Natural + GHC.Internal.System.Environment + GHC.Internal.System.Environment.Blank + GHC.Internal.System.Exit + GHC.Internal.System.IO + GHC.Internal.System.IO.Error + GHC.Internal.System.Mem + GHC.Internal.System.Mem.StableName + GHC.Internal.System.Posix.Internals + GHC.Internal.System.Posix.Types + GHC.Internal.Text.ParserCombinators.ReadP + GHC.Internal.Text.ParserCombinators.ReadPrec + GHC.Internal.Text.Read + GHC.Internal.Text.Read.Lex + GHC.Internal.Text.Show + GHC.Internal.Type.Reflection + GHC.Internal.Type.Reflection.Unsafe + GHC.Internal.Unsafe.Coerce + + GHC.Internal.CString + GHC.Internal.Classes + GHC.Internal.Debug + GHC.Internal.Magic + GHC.Internal.Magic.Dict + GHC.Internal.Prim + GHC.Internal.Prim.Ext + GHC.Internal.Prim.Panic + GHC.Internal.Prim.Exception + GHC.Internal.Prim.PtrEq + GHC.Internal.PrimopWrappers + GHC.Internal.Tuple + GHC.Internal.Types + + -- Cabal expects autogen modules to be some specific directories, not in the + -- source dirs... + -- autogen-modules: + -- GHC.Internal.Prim + -- GHC.Internal.PrimopWrappers + + other-modules: + GHC.Internal.Data.Typeable.Internal + GHC.Internal.IO.Handle.Lock.Common + GHC.Internal.IO.Handle.Lock.Flock + GHC.Internal.IO.Handle.Lock.LinuxOFD + GHC.Internal.IO.Handle.Lock.NoOp + GHC.Internal.IO.Handle.Lock.Windows + GHC.Internal.StaticPtr.Internal + GHC.Internal.Event.Arr + GHC.Internal.Event.Array + GHC.Internal.Event.Internal + GHC.Internal.Event.Internal.Types + GHC.Internal.Event.IntTable + GHC.Internal.Event.IntVar + GHC.Internal.Event.PSQ + GHC.Internal.Event.Unique + GHC.Internal.Unicode.Bits + GHC.Internal.Unicode.Char.DerivedCoreProperties + GHC.Internal.Unicode.Char.UnicodeData.GeneralCategory + GHC.Internal.Unicode.Char.UnicodeData.SimpleLowerCaseMapping + GHC.Internal.Unicode.Char.UnicodeData.SimpleTitleCaseMapping + GHC.Internal.Unicode.Char.UnicodeData.SimpleUpperCaseMapping + GHC.Internal.Unicode.Version + GHC.Internal.System.Environment.ExecutablePath + + + ---------------------------------------- + -- Bignum configuration + ---------------------------------------- + -- check that at least one backend is enabled + if !flag(bignum-native) && !flag(bignum-gmp) && !flag(bignum-ffi) + buildable: False + + -- check that at most one flag is set + if flag(bignum-native) && (flag(bignum-gmp) || flag(bignum-ffi)) + buildable: False + if flag(bignum-gmp) && flag(bignum-ffi) + buildable: False + + if flag(bignum-gmp) + cpp-options: -DBIGNUM_GMP + other-modules: + GHC.Internal.Bignum.Backend.GMP + c-sources: + cbits/gmp_wrappers.c + + if flag(bignum-ffi) + cpp-options: -DBIGNUM_FFI + other-modules: + GHC.Internal.Bignum.Backend.FFI + + if flag(bignum-native) + cpp-options: -DBIGNUM_NATIVE + + if flag(bignum-check) + cpp-options: -DBIGNUM_CHECK + other-modules: + GHC.Internal.Bignum.Backend.Check + + exposed-modules: + GHC.Internal.Bignum.Primitives + GHC.Internal.Bignum.WordArray + GHC.Internal.Bignum.BigNat + GHC.Internal.Bignum.Backend + GHC.Internal.Bignum.Backend.Selected + GHC.Internal.Bignum.Backend.Native + GHC.Internal.Bignum.Natural + GHC.Internal.Bignum.Integer + + -- some other properties related to bignum are set via the + -- ghc-internal.buildinfo file generated by this package's configure script + ---------------------------------------- + + + if !arch(javascript) + c-sources: + cbits/DarwinUtils.c + cbits/PrelIOUtils.c + cbits/SetEnv.c + cbits/iconv.c + cbits/inputReady.c + cbits/md5.c + cbits/primFloat.c + cbits/sysconf.c + cbits/strerror.c + cbits/atomic.c + cbits/bswap.c + cbits/bitrev.c + cbits/clz.c + cbits/ctz.c + cbits/debug.c + cbits/int64x2minmax.c + cbits/longlong.c + cbits/mulIntMayOflo.c + cbits/pdep.c + cbits/pext.c + cbits/popcnt.c + cbits/vectorQuotRem.c + cbits/word2float.c + + cmm-sources: + cbits/StackCloningDecoding.cmm + + if arch(javascript) + js-sources: + -- "platform" must be linked first because it defines global constants + -- (e.g. h$isNode) + jsbits/platform.js + jsbits/base.js + jsbits/errno.js + + hs-source-dirs: src + include-dirs: include + includes: + HsBase.h + install-includes: + HsBase.h + consUtils.h + + if flag(need-atomic) + -- for 64-bit atomic ops on armel (#20549) + extra-libraries: atomic + extra-libraries-static: atomic + -- OS Specific + if os(windows) + -- Windows requires some extra libraries for linking because the RTS + -- is no longer re-exporting them (see #11223) + -- ucrt: standard C library. The RTS will automatically include this, + -- but is added for completeness. + -- mingwex: provides GNU POSIX extensions that aren't provided by ucrt. + -- mingw32: Unfortunately required because of a resource leak between + -- mingwex and mingw32. the __math_err symbol is defined in + -- mingw32 which is required by mingwex. + -- shlwapi: provides PathFileExistsW + -- ws2_32: provides access to socket types and functions + -- ole32: provides UUID functionality. + -- rpcrt4: provides RPC UUID creation. + -- ntdll: provides access to functions to inspect window handles + -- kernel32: provides GetConsoleCP + -- advapi32: provides advanced kernel functions + -- user32: provides access to apis to modify user components (UI etc) + -- on Windows. Required because of mingw32. + extra-libraries: + wsock32, user32, shell32, mingw32, kernel32, advapi32, + mingwex, ws2_32, shlwapi, ole32, rpcrt4, ntdll, ucrt + extra-libraries-static: + wsock32, user32, shell32, mingw32, kernel32, advapi32, + mingwex, ws2_32, shlwapi, ole32, rpcrt4, ntdll, ucrt + -- Minimum supported Windows version. + -- These numbers can be found at: + -- https://msdn.microsoft.com/en-us/library/windows/desktop/aa383745(v=vs.85).aspx + -- If we're compiling on windows, enforce that we only support Windows 7+ + -- Adding this here means it doesn't have to be done in individual .c files + -- and also centralizes the versioning. + cpp-options: -D_WIN32_WINNT=0x06010000 + cc-options: -D_WIN32_WINNT=0x06010000 + exposed-modules: + GHC.Internal.IO.Encoding.CodePage.API + GHC.Internal.IO.Encoding.CodePage.Table + GHC.Internal.Conc.Windows + GHC.Internal.Conc.POSIX + GHC.Internal.Conc.POSIX.Const + GHC.Internal.Windows + GHC.Internal.Event.Windows + GHC.Internal.Event.Windows.Clock + GHC.Internal.Event.Windows.ConsoleEvent + GHC.Internal.Event.Windows.FFI + GHC.Internal.Event.Windows.ManagedThreadPool + GHC.Internal.Event.Windows.Thread + GHC.Internal.IO.Handle.Windows + GHC.Internal.IO.Windows.Handle + GHC.Internal.IO.Windows.Encoding + GHC.Internal.IO.Windows.Paths + c-sources: + cbits/Win32Utils.c + cbits/consUtils.c + cbits/IOutils.c + + else + exposed-modules: + GHC.Internal.Event + other-modules: + GHC.Internal.Event.Control + GHC.Internal.Event.EPoll + GHC.Internal.Event.KQueue + GHC.Internal.Event.Manager + GHC.Internal.Event.Poll + GHC.Internal.Event.Thread + GHC.Internal.Event.TimerManager + + if os(linux) + -- we need libm, but for musl and other's we might need libc, as libm + -- is just an empty shell. + extra-libraries: c, m + extra-libraries-static: c, m + + -- The Ports framework always passes this flag when building software that + -- uses iconv to make iconv from Ports compatible with iconv from the base system + -- See /usr/ports/Mk/Uses/iconv.mk + if os(freebsd) + cc-options: -DLIBICONV_PLUG + + if arch(javascript) + exposed-modules: + GHC.Internal.JS.Prim + GHC.Internal.JS.Prim.Internal + GHC.Internal.JS.Prim.Internal.Build + GHC.Internal.JS.Foreign.Callback + + if arch(wasm32) + exposed-modules: + GHC.Internal.Wasm.Prim + other-modules: + GHC.Internal.Wasm.Prim.Conc + GHC.Internal.Wasm.Prim.Conc.Internal + GHC.Internal.Wasm.Prim.Exports + GHC.Internal.Wasm.Prim.Flag + GHC.Internal.Wasm.Prim.Imports + GHC.Internal.Wasm.Prim.Types + + -- We need to set the unit id to ghc-internal (without a version number) + -- as it's magic. + ghc-options: -this-unit-id ghc-internal + + -- Make sure we don't accidentally regress into anti-patterns + ghc-options: -Wcompat -Wnoncanonical-monad-instances diff --git a/libraries/ghc-internal/ghc-internal.cabal.in b/libraries/ghc-internal/ghc-internal.cabal.in index 8cef2d1db60d..01988e80612e 100644 --- a/libraries/ghc-internal/ghc-internal.cabal.in +++ b/libraries/ghc-internal/ghc-internal.cabal.in @@ -1,4 +1,4 @@ -cabal-version: 3.8 +cabal-version: 3.0 -- WARNING: ghc-internal.cabal is automatically generated from ghc-internal.cabal.in by -- the top-level ./configure script. Make sure you are editing ghc-internal.cabal.in, not ghc-internal.cabal. name: ghc-internal @@ -470,7 +470,7 @@ Library if flag(need-atomic) -- for 64-bit atomic ops on armel (#20549) extra-libraries: atomic - extra-libraries-static: atomic + -- OS Specific if os(windows) -- Windows requires some extra libraries for linking because the RTS @@ -493,9 +493,6 @@ Library extra-libraries: wsock32, user32, shell32, mingw32, kernel32, advapi32, mingwex, ws2_32, shlwapi, ole32, rpcrt4, ntdll, ucrt - extra-libraries-static: - wsock32, user32, shell32, mingw32, kernel32, advapi32, - mingwex, ws2_32, shlwapi, ole32, rpcrt4, ntdll, ucrt -- Minimum supported Windows version. -- These numbers can be found at: -- https://msdn.microsoft.com/en-us/library/windows/desktop/aa383745(v=vs.85).aspx @@ -542,7 +539,6 @@ Library -- we need libm, but for musl and other's we might need libc, as libm -- is just an empty shell. extra-libraries: c, m - extra-libraries-static: c, m -- The Ports framework always passes this flag when building software that -- uses iconv to make iconv from Ports compatible with iconv from the base system diff --git a/libraries/ghci/ghci.cabal b/libraries/ghci/ghci.cabal new file mode 100644 index 000000000000..384b7bcf5dec --- /dev/null +++ b/libraries/ghci/ghci.cabal @@ -0,0 +1,135 @@ +cabal-version: 3.8 +-- WARNING: ghci.cabal is automatically generated from ghci.cabal.in by +-- ../../configure. Make sure you are editing ghci.cabal.in, not ghci.cabal. + +name: ghci +version: 9.14 +license: BSD-3-Clause +license-file: LICENSE +category: GHC +maintainer: ghc-devs@haskell.org +bug-reports: https://gitlab.haskell.org/ghc/ghc/issues/new +synopsis: The library supporting GHC's interactive interpreter +description: + This library offers interfaces which mediate interactions between the + @ghci@ interactive shell and @iserv@, GHC's out-of-process interpreter + backend. +build-type: Simple +extra-source-files: changelog.md + +Flag internal-interpreter + Description: Build with internal interpreter support. + Default: False + Manual: True + +Flag bootstrap + Description: + Enabled when building the stage1 compiler in order to vendor the in-tree + `ghc-boot-th` library, and through that the in-tree TH AST defintions from + `ghc-internal`. + See Note [Bootstrapping Template Haskell] + Default: False + Manual: True + +flag use-system-libffi + default: False + manual: True + +source-repository head + type: git + location: https://gitlab.haskell.org/ghc/ghc.git + subdir: libraries/ghci + +library + default-language: Haskell2010 + default-extensions: NoImplicitPrelude + other-extensions: + BangPatterns + CPP + DeriveGeneric + ExistentialQuantification + FlexibleInstances + GADTs + GeneralizedNewtypeDeriving + InstanceSigs + MagicHash + MultiParamTypeClasses + RecordWildCards + ScopedTypeVariables + StandaloneDeriving + TupleSections + UnboxedTuples + + if flag(internal-interpreter) + CPP-Options: -DHAVE_INTERNAL_INTERPRETER + exposed-modules: + GHCi.Run + GHCi.Debugger + GHCi.CreateBCO + GHCi.ObjLink + GHCi.Signals + GHCi.StaticPtrTable + GHCi.TH + GHCi.Server + + if !arch(javascript) + exposed-modules: + GHCi.InfoTable + + exposed-modules: + GHCi.BreakArray + GHCi.BinaryArray + GHCi.Message + GHCi.ResolvedBCO + GHCi.RemoteTypes + GHCi.FFI + GHCi.TH.Binary + GHCi.Utils + + Build-Depends: + rts, + array == 0.5.*, + base >= 4.8 && < 4.23, + ghc-prim >= 0.5.0 && < 0.14, + binary == 0.8.*, + bytestring >= 0.10 && < 0.13, + containers >= 0.5 && < 0.9, + deepseq >= 1.4 && < 1.6, + filepath >= 1.4 && < 1.6, + ghc-boot == 9.14, + ghc-heap == 9.14, + transformers >= 0.5 && < 0.7 + + if !arch(javascript) + if flag(use-system-libffi) + extra-libraries: ffi + extra-libraries-static: ffi + else + build-depends: libffi-clib + + if impl(ghc > 9.10) + -- ghc-internal is only available (and required) when building + -- with a compiler that itself provides the ghc-internal + -- library. Older bootstrap compilers (<= 9.10) don't ship it, + -- so we must not depend on it in that case. + -- + -- When available we depend on the in-tree version (matching + -- 9.1400) and define HAVE_GHC_INTERNAL so that + -- sources can import the non-deprecated modules from + -- GHC.Internal.* instead of the legacy (deprecated) locations. + Build-Depends: + ghc-internal >= 9.1001.0 && <=9.1400.0 + CPP-Options: -DHAVE_GHC_INTERNAL + + if flag(bootstrap) + build-depends: + ghc-boot-th-next == 9.14 + else + build-depends: + ghc-boot-th == 9.14 + + if !os(windows) + Build-Depends: unix >= 2.7 && < 2.9 + + if arch(wasm32) + build-depends: ghc-experimental == 9.1400.0 diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in index 533c94991b85..89a330fab149 100644 --- a/libraries/ghci/ghci.cabal.in +++ b/libraries/ghci/ghci.cabal.in @@ -1,10 +1,9 @@ -cabal-version: 3.8 -- WARNING: ghci.cabal is automatically generated from ghci.cabal.in by -- ../../configure. Make sure you are editing ghci.cabal.in, not ghci.cabal. name: ghci version: @ProjectVersionMunged@ -license: BSD-3-Clause +license: BSD3 license-file: LICENSE category: GHC maintainer: ghc-devs@haskell.org @@ -14,6 +13,7 @@ description: This library offers interfaces which mediate interactions between the @ghci@ interactive shell and @iserv@, GHC's out-of-process interpreter backend. +cabal-version: >=1.10 build-type: Simple extra-source-files: changelog.md @@ -31,10 +31,6 @@ Flag bootstrap Default: False Manual: True -flag use-system-libffi - default: False - manual: True - source-repository head type: git location: https://gitlab.haskell.org/ghc/ghc.git @@ -100,13 +96,6 @@ library ghc-heap == @ProjectVersionMunged@, transformers >= 0.5 && < 0.7 - if !arch(javascript) - if flag(use-system-libffi) - extra-libraries: ffi - extra-libraries-static: ffi - else - build-depends: libffi-clib - if impl(ghc > 9.10) -- ghc-internal is only available (and required) when building -- with a compiler that itself provides the ghc-internal diff --git a/libraries/template-haskell/template-haskell.cabal.in b/libraries/template-haskell/template-haskell.cabal similarity index 95% rename from libraries/template-haskell/template-haskell.cabal.in rename to libraries/template-haskell/template-haskell.cabal index 63e886685113..4d1438d94370 100644 --- a/libraries/template-haskell/template-haskell.cabal.in +++ b/libraries/template-haskell/template-haskell.cabal @@ -55,8 +55,8 @@ Library -- We don't directly depend on any of the modules from `ghc-internal` -- But we need to depend on it to work around a hadrian bug. -- See: https://gitlab.haskell.org/ghc/ghc/-/issues/25705 - ghc-internal == @ProjectVersionForLib@.*, - ghc-boot-th == @ProjectVersionMunged@ + ghc-internal == 9.1400.*, + ghc-boot-th == 9.14 other-modules: System.FilePath diff --git a/mk/project.mk.in b/mk/project.mk.in index 128a3a7edffd..7c0853303948 100644 --- a/mk/project.mk.in +++ b/mk/project.mk.in @@ -25,11 +25,11 @@ # random .o-file stuff might change even if the .hi syntax doesn't ProjectName = @ProjectName@ -ProjectVersion = @ProjectVersion@ -ProjectVersionInt = @ProjectVersionInt@ +ProjectVersion = 9.14 +ProjectVersionInt = 914 ProjectPatchLevel = @ProjectPatchLevel@ -ProjectPatchLevel1 = @ProjectPatchLevel1@ -ProjectPatchLevel2 = @ProjectPatchLevel2@ +ProjectPatchLevel1 = 0 +ProjectPatchLevel2 = 0 ProjectGitCommitId = @ProjectGitCommitId@ ################################################################################ diff --git a/rts/include/ghcversion.h.in b/rts/include/ghcversion.h.in deleted file mode 100644 index dc700a4fbbf9..000000000000 --- a/rts/include/ghcversion.h.in +++ /dev/null @@ -1,18 +0,0 @@ -#if !defined(__GHCVERSION_H__) -#define __GHCVERSION_H__ - -#define __GLASGOW_HASKELL__ @ProjectVersionInt@ -#define __GLASGOW_HASKELL_FULL_VERSION__ "@ProjectVersion@" - -#define __GLASGOW_HASKELL_PATCHLEVEL1__ @ProjectPatchLevel1@ -#define __GLASGOW_HASKELL_PATCHLEVEL2__ @ProjectPatchLevel2@ - -#define MIN_VERSION_GLASGOW_HASKELL(ma,mi,pl1,pl2) ( \ - ((ma)*100+(mi)) < __GLASGOW_HASKELL__ || \ - ((ma)*100+(mi)) == __GLASGOW_HASKELL__ \ - && (pl1) < __GLASGOW_HASKELL_PATCHLEVEL1__ || \ - ((ma)*100+(mi)) == __GLASGOW_HASKELL__ \ - && (pl1) == __GLASGOW_HASKELL_PATCHLEVEL1__ \ - && (pl2) <= __GLASGOW_HASKELL_PATCHLEVEL2__ ) - -#endif /* __GHCVERSION_H__ */ diff --git a/update_versions.awk b/update_versions.awk new file mode 100755 index 000000000000..5c6183c07990 --- /dev/null +++ b/update_versions.awk @@ -0,0 +1,21 @@ +#!/usr/bin/env -S awk -f + +BEGIN { + IGNORECASE = 1 +} + +BEGINFILE { + if (version == "") { + print "usage: update_versions.awk version=x.y.w.z [FILES..]" > "/dev/stderr" + exit 1 + } +} + +match($0, /^version\s*:\s*/, arr) { + print arr[0] version + next +} + +{ + print +} diff --git a/utils/ghc-iserv/ghc-iserv.cabal.in b/utils/ghc-iserv/ghc-iserv.cabal similarity index 94% rename from utils/ghc-iserv/ghc-iserv.cabal.in rename to utils/ghc-iserv/ghc-iserv.cabal index b0a1e80f0e91..498cd7050666 100644 --- a/utils/ghc-iserv/ghc-iserv.cabal.in +++ b/utils/ghc-iserv/ghc-iserv.cabal @@ -3,7 +3,7 @@ -- ghc-iserv.cabal. Name: ghc-iserv -Version: @ProjectVersion@ +Version: 9.14 Copyright: XXX License: BSD3 -- XXX License-File: LICENSE @@ -36,7 +36,7 @@ Executable ghc-iserv bytestring >= 0.10 && < 0.13, containers >= 0.5 && < 0.9, deepseq >= 1.4 && < 1.6, - ghci == @ProjectVersionMunged@ + ghci == 9.14 if os(windows) Cpp-Options: -DWINDOWS diff --git a/utils/ghc-pkg/ghc-pkg.cabal.in b/utils/ghc-pkg/ghc-pkg.cabal similarity index 97% rename from utils/ghc-pkg/ghc-pkg.cabal.in rename to utils/ghc-pkg/ghc-pkg.cabal index b40a6efe0422..65e06b5ba638 100644 --- a/utils/ghc-pkg/ghc-pkg.cabal.in +++ b/utils/ghc-pkg/ghc-pkg.cabal @@ -1,6 +1,6 @@ Name: ghc-pkg -- XXX Version number -Version: @ProjectVersion@ +Version: 9.14 Copyright: XXX License: BSD3 -- XXX License-File: LICENSE diff --git a/utils/remote-iserv/remote-iserv.cabal.in b/utils/remote-iserv/remote-iserv.cabal similarity index 91% rename from utils/remote-iserv/remote-iserv.cabal.in rename to utils/remote-iserv/remote-iserv.cabal index 24c5c99c748d..ea39593aee22 100644 --- a/utils/remote-iserv/remote-iserv.cabal.in +++ b/utils/remote-iserv/remote-iserv.cabal @@ -3,7 +3,7 @@ -- remote-iserv.cabal. Name: remote-iserv -Version: @ProjectVersion@ +Version: 9.14 Copyright: XXX License: BSD3 -- XXX License-File: LICENSE @@ -24,4 +24,4 @@ Executable remote-iserv Main-Is: Cli.hs Hs-Source-Dirs: src Build-Depends: base >= 4 && < 5, - ghci == @ProjectVersionMunged@ + ghci == 9.14 diff --git a/utils/runghc/runghc.cabal.in b/utils/runghc/runghc.cabal similarity index 96% rename from utils/runghc/runghc.cabal.in rename to utils/runghc/runghc.cabal index cf0d085a3453..9f30ed995b00 100644 --- a/utils/runghc/runghc.cabal.in +++ b/utils/runghc/runghc.cabal @@ -1,5 +1,5 @@ Name: runghc -Version: @ProjectVersion@ +Version: 9.14 Copyright: XXX License: BSD3 -- XXX License-File: LICENSE