summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-16 20:32:59 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-16 20:32:59 -0400
commit22a3eac594e903d6177450170ab534b878663c43 (patch)
tree2f05848ec803051fa8826251de9fbac76150cf06 /Build
parentda9040cb1c415d2f8a5bec2baf5ea49596cb3419 (diff)
add windows uninstaller
Diffstat (limited to 'Build')
-rw-r--r--Build/NullSoftInstaller.hs8
1 files changed, 7 insertions, 1 deletions
diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs
index eac55c8b9..5cb108a3a 100644
--- a/Build/NullSoftInstaller.hs
+++ b/Build/NullSoftInstaller.hs
@@ -76,7 +76,7 @@ makeInstaller gitannex license = nsis $ do
-- Pages to display
page Directory -- Pick where to install
- page $ License license
+ page (License license)
page InstFiles -- Give a progress bar while installing
-- Groups of files to install
section "programs" [] $ do
@@ -84,9 +84,15 @@ makeInstaller gitannex license = nsis $ do
addfile gitannex
addfile license
mapM_ addcygfile cygwinPrograms
+ writeUninstaller "git-annex-uninstall.exe"
section "libraries" [] $ do
setOutPath "$INSTDIR"
mapM_ addcygfile cygwinDlls
+ uninstall $
+ mapM_ (\f -> delete [RebootOK] $ fromString $ "$INSTDIR/" ++ f)
+ [ gitannex
+ , license
+ ] ++ cygwinPrograms ++ cygwinDlls
where
addfile f = file [] (str f)
addcygfile f = addfile $ "C:\\cygwin\\bin" </> f