diff options
| author | kr.angelov <kr.angelov@chalmers.se> | 2008-05-23 14:37:39 +0000 |
|---|---|---|
| committer | kr.angelov <kr.angelov@chalmers.se> | 2008-05-23 14:37:39 +0000 |
| commit | 0b80bf17d97fe5410c4e6697b6325c777dfee5b0 (patch) | |
| tree | c0695afc08765b45b758804ab564daf4b8af0f1d /src-3.0 | |
| parent | 61e4e6e4835ccb2aba3b00415274d0cc6586c263 (diff) | |
use the version number from Paths_gf
Diffstat (limited to 'src-3.0')
| -rw-r--r-- | src-3.0/GFI.hs | 5 | ||||
| -rw-r--r-- | src-3.0/Makefile | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src-3.0/GFI.hs b/src-3.0/GFI.hs index b85d38a61..0761ace5f 100644 --- a/src-3.0/GFI.hs +++ b/src-3.0/GFI.hs @@ -11,6 +11,9 @@ import GF.System.Readline (fetchCommand) import System.CPUTime +import Data.Version +import Paths_gf + mainGFI :: [String] -> IO () mainGFI xx = do @@ -66,7 +69,7 @@ welcome = unlines [ " * * * ", " * * * ", " ", - "This is GF version 3.0 alpha. ", + "This is GF version "++showVersion version++". ", "Some things may work. " ] diff --git a/src-3.0/Makefile b/src-3.0/Makefile index e668006bc..25034bac7 100644 --- a/src-3.0/Makefile +++ b/src-3.0/Makefile @@ -139,13 +139,11 @@ ghci-nofud: $(GHCI) $(GHCFLAGS) today: - echo 'module Paths_gf (getDataDir) where' > Paths_gf.hs - echo '{-# NOINLINE today #-}' >> Paths_gf.hs - echo 'today :: String' >> Paths_gf.hs - echo 'today = "'`date`'"' >> Paths_gf.hs + echo 'module Paths_gf (version, getDataDir) where' > Paths_gf.hs + echo 'import Data.Version' >> Paths_gf.hs echo '{-# NOINLINE version #-}' >> Paths_gf.hs - echo 'version :: String' >> GF/Today.hs - echo 'version = "'$(PACKAGE_VERSION)'"' >> Paths_gf.hs + echo 'version :: Version' >> Paths_gf.hs + echo 'version = Version {versionBranch = [3,0], versionTags = ["alpha"]}' >> Paths_gf.hs echo '{-# NOINLINE libdir #-}' >> Paths_gf.hs echo 'libdir :: String' >> Paths_gf.hs echo 'libdir = "'$(GF_LIB_DIR)'"' >> Paths_gf.hs |