From 69227d53ecfd202129467710e891c82c0b4653a0 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 17 Jun 2009 16:18:53 +0000 Subject: [PATCH] improve --binary-filename on windows --- Version.hs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Version.hs b/Version.hs index 4f2460fb7..eab6f7e2a 100644 --- a/Version.hs +++ b/Version.hs @@ -28,7 +28,7 @@ buildversion = version ++ patchlevel :: String binaryfilename = prettify $ splitAtElement '.' buildversion :: String where prettify (major:minor:bugfix:patches:[]) = - printf "hledger-%s.%s%s%s-%s-%s" major minor bugfix' patches' os' arch + printf "hledger-%s.%s%s%s-%s-%s%s" major minor bugfix' patches' os' arch suffix where bugfix' | bugfix `elem` ["0"{-,"98","99"-}] = "" @@ -36,9 +36,10 @@ binaryfilename = prettify $ splitAtElement '.' buildversion :: String patches' | patches/="0" = "+"++patches | otherwise = "" - os' - | os == "darwin" = "mac" - | otherwise = os + (os',suffix) + | os == "darwin" = ("mac","") + | os == "mingw32" = ("windows",".exe") + | otherwise = (os,"") prettify (major:minor:bugfix:[]) = prettify (major:minor:bugfix:"0":[]) prettify (major:minor:[]) = prettify (major:minor:"0":"0":[]) prettify (major:[]) = prettify (major:"0":"0":"0":[])