summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-14 15:37:24 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-14 15:37:24 -0400
commitea7f916c04e0b1ee022b3e4987be749db28fa2fa (patch)
tree0698a987c4b475fdccfe48bb2a8f1abebf55b844 /Build
parentc2f6f82a146339bb4b94acff1aae4f12ad023a08 (diff)
parent724d5185d48aee309af1a6d13927c4f7108610fd (diff)
Merge branch 'master' into windows
Conflicts: Annex/Environment.hs Build/Configure.hs Git/Construct.hs Utility/FileMode.hs
Diffstat (limited to 'Build')
-rw-r--r--Build/Configure.hs6
1 files changed, 2 insertions, 4 deletions
diff --git a/Build/Configure.hs b/Build/Configure.hs
index b694559a8..e57b79257 100644
--- a/Build/Configure.hs
+++ b/Build/Configure.hs
@@ -82,17 +82,15 @@ testCp k option = TestCase cmd $ testCmd k cmdline
cmd = "cp " ++ option
cmdline = cmd ++ " " ++ testFile ++ " " ++ testFile ++ ".new"
-{- For release builds, VERSION_FROM_CHANGELOG makes it use just the most
- - recent version from the changelog. -}
isReleaseBuild :: IO Bool
-isReleaseBuild = isJust <$> catchMaybeIO (getEnv "VERSION_FROM_CHANGELOG")
+isReleaseBuild = isJust <$> catchMaybeIO (getEnv "RELEASE_BUILD")
{- Version is usually based on the major version from the changelog,
- plus the date of the last commit, plus the git rev of that commit.
- This works for autobuilds, ad-hoc builds, etc.
-
- If git or a git repo is not available, or something goes wrong,
- - just use the version from the changelog. -}
+ - or this is a release build, just use the version from the changelog. -}
getVersion :: Test
getVersion = do
changelogversion <- getChangelogVersion