X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fmk%2Fversion.mk;h=ad758da42ea95696fd6e90d6f2015cd5b0ec9c54;hb=387a411e5d6478249de6872c283f2df78ef83bf4;hp=8e172cca82712c11c92c74db74418bf8578588a9;hpb=b76acf5691189acac3df80c0b84c4c41b344a7c1;p=ghc-hetmet.git diff --git a/ghc/mk/version.mk b/ghc/mk/version.mk index 8e172cc..ad758da 100644 --- a/ghc/mk/version.mk +++ b/ghc/mk/version.mk @@ -19,9 +19,9 @@ # ProjectVersion is treated as a *string* # ProjectVersionInt is treated as an *integer* (for cpp defines) -# Versioning scheme: A.BB.C -# A: major version, any number of digits -# B: minor version, two digits padded with leading zeros +# Versioning scheme: A.B.C +# A: major version, decimal, any number of digits +# B: minor version, decimal, any number of digits # C: patchlevel, one digit, omitted if zero. # # ProjectVersionInt does *not* contain the patchlevel (rationale: this @@ -36,23 +36,9 @@ ProjectName = The Glorious Glasgow Haskell Compilation System ProjectNameShort = ghc -ProjectVersion = 4.09 -ProjectVersionInt = 409 - -# -# Optionally, you can get the compiler driver to check the -# version consistency between the object files being linked. -# -# Major numbers must always agree, minor disagreements yield a warning. -# -# These version numbers are currently separate from the project -# version - one (semi-valid) reason for having them separate is that -# object files produced by different versions of the compiler need -# not be incompatible.. -HscMajorVersion=40 -HscMinorVersion=0 -CcMajorVersion=36 -CcMinorVersion=1 +ProjectVersion = 6.1.20030727 +ProjectVersionInt = 601 +ProjectPatchLevel = 0 # Interface file version (hi-boot files only) # @@ -61,17 +47,14 @@ CcMinorVersion=1 # M.hi-boot. # (It'll be happy with the latter if the former doesn't exist.) # -# This variable is used ONLY for hi-boot files. -# Its only purpose is to allow you to have a single directory -# with multiple .hi-boot files for the same module, each -# corresponding to a different version of GHC. # -# It is propagated to hsc like this: -# * This file is included in ghc/Makefile -# * ghc/Makefile has a main/Constants.lhs-specific flag -# -DHscIfaceFileVersion=$(HscIfaceFileVersion) -# * main/Constants.lhs defines -# interfaceFileFormatVersion = HscIfaceFileVersion -# So there! +# This variable is used ONLY for hi-boot files. Its only purpose is +# to allow you to have a single directory with multiple .hi-boot files +# for the same module, each corresponding to a different version of +# GHC. +# +# HscIfaceFileVersion is propagated to hsc via +# ghc/compiler/main/Config.hs, which is automatically generated by +# ghc/compiler/Makefile. -HscIfaceFileVersion=5 +HscIfaceFileVersion=6