From a942ed4bb912ee2aafe1ff5d6967099931644159 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 24 Feb 2021 13:19:42 -0400 Subject: [PATCH] Windows: Correct the path to the html help file for 64 bit build. --- Build/NullSoftInstaller.hs | 6 +++--- CHANGELOG | 6 ++++++ ...omment_18_e0adfbf74754f847dc4705685cf00640._comment | 10 ++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 doc/install/Windows/comment_18_e0adfbf74754f847dc4705685cf00640._comment diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs index 9733592214..ca209076d3 100644 --- a/Build/NullSoftInstaller.hs +++ b/Build/NullSoftInstaller.hs @@ -190,8 +190,8 @@ makeInstaller gitannex gitannexcmd license htmlhelp extrabins sharefiles launche addfile gitannexcmd section "meta" [] $ do -- git opens this file when git annex --help is run. - -- (Program Files/Git/mingw32/share/doc/git-doc/git-annex.html) - setOutPath "$INSTDIR\\mingw32\\share\\doc\\git-doc" + -- (Program Files/Git/mingw64/share/doc/git-doc/git-annex.html) + setOutPath "$INSTDIR\\mingw64\\share\\doc\\git-doc" addfile htmlhelp setOutPath "$INSTDIR" addfile license @@ -203,7 +203,7 @@ makeInstaller gitannex gitannexcmd license htmlhelp extrabins sharefiles launche delete [RebootOK] $ autoStartItem removefilesFrom "$INSTDIR/usr/bin" (gitannex:extrabins) removefilesFrom "$INSTDIR/cmd" (gitannexcmd:launchers) - removefilesFrom "$INSTDIR\\mingw32\\share\\doc\\git-doc" [htmlhelp] + removefilesFrom "$INSTDIR\\mingw64\\share\\doc\\git-doc" [htmlhelp] removefilesFrom "$INSTDIR" [license, uninstaller] where addfile f = file [] (str f) diff --git a/CHANGELOG b/CHANGELOG index 973bc42ad8..d7767bd387 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +git-annex (8.20210224) UNRELEASED; urgency=medium + + * Windows: Correct the path to the html help file for 64 bit build. + + -- Joey Hess Wed, 24 Feb 2021 13:18:38 -0400 + git-annex (8.20210223) upstream; urgency=medium * annex.stalldetection can now be set to "true" to make git-annex diff --git a/doc/install/Windows/comment_18_e0adfbf74754f847dc4705685cf00640._comment b/doc/install/Windows/comment_18_e0adfbf74754f847dc4705685cf00640._comment new file mode 100644 index 0000000000..845d50be1f --- /dev/null +++ b/doc/install/Windows/comment_18_e0adfbf74754f847dc4705685cf00640._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="joey" + subject="""re: comment 17""" + date="2021-02-24T17:18:01Z" + content=""" +I've corrected that path. + +(Please don't use this page to report issues with the windows build. +Open bug reports.) +"""]]