refactor: inline all versions

.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

compiler/ghc.cabal.in → 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

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

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])

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@'

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"

ghc/ghc-bin.cabal.in → 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

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:

libraries/base/base.cabal.in → 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:

libraries/ghc-boot-th/ghc-boot-th.cabal.in → 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:

libraries/ghc-boot/ghc-boot.cabal.in → 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:

libraries/ghc-experimental/ghc-experimental.cabal.in → 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

libraries/ghc-heap/ghc-heap.cabal.in → 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