Skip to content

Commit 7c72fd5

Browse files
committed
refactor: inline all versions
1 parent f05155d commit 7c72fd5

File tree

17 files changed

+11
-2187
lines changed

17 files changed

+11
-2187
lines changed

compiler/ghc.cabal.in

Lines changed: 0 additions & 1025 deletions
This file was deleted.

configure.ac

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,8 @@ AC_PREREQ([2.69])
33
AC_INIT([ghc-builder], [0.1.0], [[email protected]])
44
AC_CONFIG_SRCDIR([.]) # A representative .in file
55
#AC_CONFIG_AUX_DIR([build-aux]) # Recommended place for config.guess, config.sub
6-
AC_CONFIG_MACRO_DIR([m4]) # For any custom m4 macros
76
# AM_INIT_AUTOMAKE([-Wall -Werror foreign]) # Using some automake conventions
87

9-
# --- Define GHC Build Options ---
10-
# Usage: ./configure ProjectVersion=X.Y ...
11-
AC_ARG_WITH([project-version], [AS_HELP_STRING([--with-project-version=VER], [GHC version (default: 9.14)])], [ProjectVersion="$withval"], [ProjectVersion="9.14"])
12-
AC_ARG_WITH([project-version-int], [AS_HELP_STRING([--with-project-version-int=VER], [GHC version as int (default: 913)])], [ProjectVersionInt="$withval"], [ProjectVersionInt="913"])
13-
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"])
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"])
15-
AC_ARG_WITH([project-patch-level], [AS_HELP_STRING([--with-project-patch-level=VER], [GHC patchlevel version (default: 0)])], [ProjectPatchLevel="$withval"], [ProjectPatchLevel="0"])
16-
AC_ARG_WITH([project-patch-level1], [AS_HELP_STRING([--with-project-patch-level1=VER], [GHC patchlevel1 version (default: 0)])], [ProjectPatchLevel1="$withval"], [ProjectPatchLevel1="0"])
17-
AC_ARG_WITH([project-patch-level2], [AS_HELP_STRING([--with-project-patch-level2=VER], [GHC patchlevel2 version (default: 0)])], [ProjectPatchLevel2="$withval"], [ProjectPatchLevel2="0"])
18-
19-
# Export these variables for substitution by AC_SUBST
20-
AC_SUBST([ProjectVersion])
21-
AC_SUBST([ProjectVersionInt])
22-
AC_SUBST([ProjectVersionMunged])
23-
AC_SUBST([ProjectVersionForLib])
24-
AC_SUBST([ProjectPatchLevel])
25-
AC_SUBST([ProjectPatchLevel1])
26-
AC_SUBST([ProjectPatchLevel2])
27-
28-
# For ghc-boot-th.cabal.in
29-
AC_SUBST([Suffix],[""])
30-
AC_SUBST([SourceRoot],["."])
31-
328
# --- Feature toggle (dynamic only) for imported project settings ---
339
AC_ARG_ENABLE([dynamic],
3410
[AS_HELP_STRING([--enable-dynamic],[Build shared libraries and enable dynamic RTS])],
@@ -79,22 +55,7 @@ AC_SUBST([LlvmMaxVersion])
7955
# --- Files to generate ---
8056
# config.status will create these files by substituting @VAR@ placeholders.
8157
AC_CONFIG_FILES([
82-
ghc/ghc-bin.cabal:ghc/ghc-bin.cabal.in
83-
compiler/ghc.cabal:compiler/ghc.cabal.in
8458
compiler/GHC/CmmToLlvm/Version/Bounds.hs:compiler/GHC/CmmToLlvm/Version/Bounds.hs.in
85-
libraries/ghc-boot/ghc-boot.cabal:libraries/ghc-boot/ghc-boot.cabal.in
86-
libraries/ghc-boot-th/ghc-boot-th.cabal:libraries/ghc-boot-th/ghc-boot-th.cabal.in
87-
libraries/ghc-boot-th-next/ghc-boot-th-next.cabal:libraries/ghc-boot-th-next/ghc-boot-th-next.cabal.in
88-
libraries/ghc-heap/ghc-heap.cabal:libraries/ghc-heap/ghc-heap.cabal.in
89-
libraries/template-haskell/template-haskell.cabal:libraries/template-haskell/template-haskell.cabal.in
90-
libraries/ghci/ghci.cabal:libraries/ghci/ghci.cabal.in
91-
utils/ghc-pkg/ghc-pkg.cabal:utils/ghc-pkg/ghc-pkg.cabal.in
92-
utils/ghc-iserv/ghc-iserv.cabal:utils/ghc-iserv/ghc-iserv.cabal.in
93-
utils/runghc/runghc.cabal:utils/runghc/runghc.cabal.in
94-
libraries/ghc-internal/ghc-internal.cabal:libraries/ghc-internal/ghc-internal.cabal.in
95-
libraries/ghc-experimental/ghc-experimental.cabal:libraries/ghc-experimental/ghc-experimental.cabal.in
96-
libraries/base/base.cabal:libraries/base/base.cabal.in
97-
rts/include/ghcversion.h:rts/include/ghcversion.h.in
9859
cabal.project.stage2.settings:cabal.project.stage2.settings.in
9960
])
10061

driver/ghci/ghci-wrapper.cabal.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
-- ./configure. Make sure you are editing ghci-wrapper.cabal.in, not ghci-wrapper.cabal.
33

44
Name: ghci-wrapper
5-
Version: @ProjectVersion@
5+
Version: 9.14
66
Copyright: XXX
77
License: BSD3
88
-- XXX License-File: LICENSE
@@ -29,4 +29,4 @@ Executable ghci
2929
-- We need to call the versioned ghc executable because the unversioned
3030
-- GHC executable is a wrapper that doesn't call FreeConsole and so
3131
-- breaks an interactive process like GHCi. See #21889, #14150 and #13411
32-
cc-options: -DEXE_PATH="ghc-@ProjectVersion@"
32+
cc-options: -DEXE_PATH="ghc-9.14"

ghc/ghc-bin.cabal.in

Lines changed: 0 additions & 111 deletions
This file was deleted.

libraries/base/base.cabal.in renamed to libraries/base/base.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Library
3030
default-language: Haskell2010
3131
default-extensions: NoImplicitPrelude
3232
build-depends:
33-
ghc-internal == @ProjectVersionForLib@.*,
33+
ghc-internal == 9.1400.*,
3434
ghc-prim,
3535

3636
exposed-modules:

libraries/ghc-boot-th/ghc-boot-th.cabal.in renamed to libraries/ghc-boot-th/ghc-boot-th.cabal

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
-- WARNING: ghc-boot-th@[email protected] is automatically generated from
2-
-- ghc-boot-th@[email protected] by ../../configure. Make sure you are editing
3-
-- ghc-boot-th@[email protected], not ghc-boot-th@[email protected].
4-
5-
name: ghc-boot-th@Suffix@
6-
version: @ProjectVersionMunged@
1+
name: ghc-boot-th
2+
version: 9.14
73
license: BSD3
84
license-file: LICENSE
95
category: GHC
@@ -67,7 +63,7 @@ Library
6763
GHC.Internal.LanguageExtensions
6864
GHC.Internal.Lexeme
6965
else
70-
hs-source-dirs: @SourceRoot@
66+
hs-source-dirs: .
7167
build-depends:
7268
ghc-internal
7369
exposed-modules:

libraries/ghc-boot/ghc-boot.cabal.in renamed to libraries/ghc-boot/ghc-boot.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cabal-version: 3.0
55
-- ghc-boot.cabal.
66

77
name: ghc-boot
8-
version: @ProjectVersionMunged@
8+
version: 9.14
99
license: BSD-3-Clause
1010
license-file: LICENSE
1111
category: GHC
@@ -94,10 +94,10 @@ Library
9494

9595
if flag(bootstrap)
9696
build-depends:
97-
ghc-boot-th-next == @ProjectVersionMunged@
97+
ghc-boot-th-next == 9.14
9898
else
9999
build-depends:
100-
ghc-boot-th == @ProjectVersionMunged@
100+
ghc-boot-th == 9.14
101101

102102
if !os(windows)
103103
build-depends:

libraries/ghc-experimental/ghc-experimental.cabal.in

Lines changed: 0 additions & 48 deletions
This file was deleted.

libraries/ghc-heap/ghc-heap.cabal.in

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)