mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Windows: Correct the path to the html help file for 64 bit build.

Browse source
This commit is contained in:
Joey Hess 2021-02-24 13:19:42 -04:00
parent 0c90ccc40c
commit a942ed4bb9
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Build/NullSoftInstaller.hs
View file

@ -190,8 +190,8 @@ makeInstaller gitannex gitannexcmd license htmlhelp extrabins sharefiles launche
addfile gitannexcmd addfile gitannexcmd
section "meta" [] $ do section "meta" [] $ do
-- git opens this file when git annex --help is run. -- git opens this file when git annex --help is run.
-- (Program Files/Git/mingw32/share/doc/git-doc/git-annex.html) -- (Program Files/Git/mingw64/share/doc/git-doc/git-annex.html)
setOutPath "$INSTDIR\\mingw32\\share\\doc\\git-doc" setOutPath "$INSTDIR\\mingw64\\share\\doc\\git-doc"
addfile htmlhelp addfile htmlhelp
setOutPath "$INSTDIR" setOutPath "$INSTDIR"
addfile license addfile license
@ -203,7 +203,7 @@ makeInstaller gitannex gitannexcmd license htmlhelp extrabins sharefiles launche
delete [RebootOK] $ autoStartItem delete [RebootOK] $ autoStartItem
removefilesFrom "$INSTDIR/usr/bin" (gitannex:extrabins) removefilesFrom "$INSTDIR/usr/bin" (gitannex:extrabins)
removefilesFrom "$INSTDIR/cmd" (gitannexcmd:launchers) 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] removefilesFrom "$INSTDIR" [license, uninstaller]
where where
addfile f = file [] (str f) addfile f = file [] (str f)

6
CHANGELOG
View file

@ -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 <id@joeyh.name> Wed, 24 Feb 2021 13:18:38 -0400
git-annex (8.20210223) upstream; urgency=medium git-annex (8.20210223) upstream; urgency=medium
* annex.stalldetection can now be set to "true" to make git-annex * annex.stalldetection can now be set to "true" to make git-annex

10
doc/install/Windows/comment_18_e0adfbf74754f847dc4705685cf00640._comment Normal file
View file

@ -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.)
"""]]