New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support haddock response files #2746

Merged
merged 1 commit into from Jul 31, 2015

Conversation

Projects
None yet
2 participants
@randen
Copy link
Collaborator

randen commented Jul 30, 2015

This change is for adding the ehancement to support haddock
response files. This is what was used to build HP 7.10.2
for Windows, but it does need a corresponding change in
haddock to utilize it. Hopefully, this and its corresponding
haddock change can make it into the next ghc release and
eliminate much gnashing of teeth, error prone, and time
consuming manual steps in the HP build process.

Modified:

  • Cabal/Distribution/Simple/Haddock.hs
    • renderArgs function: I put a couple of things into locals
      since I needed another use for UTF8 support check, plus I
      added another check based on version; the temp file logic
      was just as the prologue case above but I did need to
      repeat the invocation of the 'k' function in order to
      keep the cases separate and allow proper handling of the
      temp file automatic (or not, per --keep-temp-files)
      deletion. Important: the haddock version being check
      against for response file support, greater than 2.16.1,
      is a placeholder and may or may not be the actual value
      since that will depend on the as-yet-unreleased haddock
      (which looks like it may be >2.16.1 but at this moment is
      not released).
Propose code for supporting haddock response files
This change is for adding the ehancement to support haddock
response files.  This is what was used to build HP 7.10.2
for Windows, but it does need a corresponding change in
haddock to utilize it. Hopefully, this and its corresponding
haddock change can make it into the next ghc release and
eliminate much gnashing of teeth, error prone, and time
consuming manual steps in the HP build process.

Modified:

* Cabal/Distribution/Simple/Haddock.hs
  * renderArgs function: I put a couple of things into locals
    since I needed another use for UTF8 support check, plus I
    added another check based on version; the temp file logic
    was just as the prologue case above but I did need to
    repeat the invocation of the 'k' function in order to
    keep the cases separate and allow proper handling of the
    temp file automatic (or not, per --keep-temp-files)
    deletion.  Important: the haddock version being check
    against for response file support, greater than 2.16.1,
    is a placeholder and may or may not be the actual value
    since that will depend on the as-yet-unreleased haddock
    (which looks like it may be >2.16.1 but at this moment is
    not released).
@23Skidoo

This comment has been minimized.

Copy link
Member

23Skidoo commented Jul 31, 2015

Does this need to be merged into the 1.22 branch?

@23Skidoo

This comment has been minimized.

Copy link
Member

23Skidoo commented Jul 31, 2015

LGTM.

23Skidoo added a commit that referenced this pull request Jul 31, 2015

Merge pull request #2746 from randen/haddock2
Support haddock response files

@23Skidoo 23Skidoo merged commit c5d2931 into haskell:master Jul 31, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@23Skidoo

This comment has been minimized.

Copy link
Member

23Skidoo commented Jul 31, 2015

Merged, thanks!

@23Skidoo

This comment has been minimized.

Copy link
Member

23Skidoo commented Aug 2, 2015

Also cherry-picked into 1.22.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment