Skip to content
This repository was archived by the owner on Feb 3, 2022. It is now read-only.

Cleaning up some Windows HP 7.10.2 changes #197

Merged
merged 4 commits into from
Aug 1, 2015
Merged

Conversation

randen
Copy link
Contributor

@randen randen commented Aug 1, 2015

No description provided.

randen added 4 commits July 31, 2015 21:19
* hptool/os-extras/win/templates/Nsisfile.nsi.mu
  * winGHCi adds some reg entries when it is run, and one
    "WorkdingDir", it reads but never updates if it already
    exists, causing winGHCi associated with any newer HP
    installs to use an old value. So, create and remove this
    particular entry when we do the install.
* windows-platform.sh
  * pick up some robustness fixes from platform.sh
  * add a few more sanity checks for Windows (easier to catch
    these before the long build starts and it then hits them)
(These would likely be different for anyone else
building the Windows HP)
* hptool/src/OS/Win.hs
  * call copyWinTargetExtras with the BuildConfig

* hptool/src/OS/Win/WinPaths.hs
  * Add the build source and target dest paths for msys

* hptool/src/OS/Win/WinRules.hs
  * Add a step which copies the pre-built msys folder from
    our build tree to the target tree (no installer change is
    needed here since the installer just bundles up every
    file from the target tree)

* windows-platform.sh
  * add some sanity checks to make sure the pre-built msys
    tree is available
mzero added a commit that referenced this pull request Aug 1, 2015
Cleaning up some Windows HP 7.10.2 changes
@mzero mzero merged commit 5ab322b into haskell:master Aug 1, 2015
@mzero
Copy link
Member

mzero commented Aug 1, 2015

Unmerged! This doesn't build. In particular, copyWinTargetExtras is called twice, with different numbers of arguments.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants