hadrian.git
3 years agoDocument the provenance of the Main functions in the code rather than in comments
Neil Mitchell [Thu, 7 Jan 2016 18:30:03 +0000 (18:30 +0000)] 
Document the provenance of the Main functions in the code rather than in comments

3 years agoMove copyRules to Rules/Generate.hs, add missing generated dependencies.
Andrey Mokhov [Thu, 7 Jan 2016 17:02:35 +0000 (17:02 +0000)] 
Move copyRules to Rules/Generate.hs, add missing generated dependencies.

3 years agoRename replaceIf -> replaceWhen to match wordsWhen, clean up.
Andrey Mokhov [Thu, 7 Jan 2016 16:52:25 +0000 (16:52 +0000)] 
Rename replaceIf -> replaceWhen to match wordsWhen, clean up.

[skip ci]

3 years agoCreate ghc-tarballs folder.
Andrey Mokhov [Thu, 7 Jan 2016 16:35:01 +0000 (16:35 +0000)] 
Create ghc-tarballs folder.

See #110. [skip ci]

3 years agoBuild only stage1 base library to fit into Travis 50 min limit for OSX.
Andrey Mokhov [Thu, 7 Jan 2016 15:43:14 +0000 (15:43 +0000)] 
Build only stage1 base library to fit into Travis 50 min limit for OSX.

3 years agoMerge pull request #129 from snowleopard/angerman-patch-2
Andrey Mokhov [Thu, 7 Jan 2016 13:52:04 +0000 (13:52 +0000)] 
Merge pull request #129 from snowleopard/angerman-patch-2

Update README.md [skip ci]

3 years agoUpdate README.md
Moritz Angermann [Thu, 7 Jan 2016 13:48:28 +0000 (21:48 +0800)] 
Update README.md

Drop `shake` requirement, as it applies to windows as well and is not exhaustive.
[skip ci]

3 years agoUpdate README.md
Moritz Angermann [Thu, 7 Jan 2016 13:37:46 +0000 (21:37 +0800)] 
Update README.md

- Trying to unify Linux / OS X / Windows build steps.
- Added note about `src/Settings/User.hs`.
[skip ci]

3 years agoBuild touchy only on Windows, see #125.
Andrey Mokhov [Thu, 7 Jan 2016 13:35:09 +0000 (13:35 +0000)] 
Build touchy only on Windows, see #125.

3 years agoMerge pull request #123 from angerman/feature/fix-clang
Andrey Mokhov [Thu, 7 Jan 2016 13:14:07 +0000 (13:14 +0000)] 
Merge pull request #123 from angerman/feature/fix-clang

Feature/fix clang

3 years agoDownload ghc-tarballs manually.
Andrey Mokhov [Thu, 7 Jan 2016 13:11:16 +0000 (13:11 +0000)] 
Download ghc-tarballs manually.

See #110. [skip ci]

3 years agoBuild touchy, fix #125.
Andrey Mokhov [Thu, 7 Jan 2016 12:59:47 +0000 (12:59 +0000)] 
Build touchy, fix #125.

3 years agoMakes wordsWhen more generic.
Moritz Angermann [Thu, 7 Jan 2016 12:38:11 +0000 (20:38 +0800)] 
Makes wordsWhen more generic.

3 years agoRenames absoluteCommand to lookupInPath
Moritz Angermann [Thu, 7 Jan 2016 12:37:59 +0000 (20:37 +0800)] 
Renames absoluteCommand to lookupInPath

3 years agoMoves wordsWhen into Base, and adjusts names and types to be more descriptive.
Moritz Angermann [Thu, 7 Jan 2016 12:17:23 +0000 (20:17 +0800)] 
Moves wordsWhen into Base, and adjusts names and types to be more descriptive.

3 years agoBring bash quoting back.
Andrey Mokhov [Thu, 7 Jan 2016 12:17:15 +0000 (12:17 +0000)] 
Bring bash quoting back.

See #110. [skip ci]

3 years agoFix missing generated dependencies for rts, see #123.
Andrey Mokhov [Thu, 7 Jan 2016 11:20:36 +0000 (11:20 +0000)] 
Fix missing generated dependencies for rts, see #123.

3 years agoCall bash with single quotes.
Andrey Mokhov [Thu, 7 Jan 2016 11:15:24 +0000 (11:15 +0000)] 
Call bash with single quotes.

See #110. [skip ci]

3 years agoEscape echo quotes.
Andrey Mokhov [Thu, 7 Jan 2016 10:54:09 +0000 (10:54 +0000)] 
Escape echo quotes.

See #110. [skip ci]

3 years agoAdds Oracle
Moritz Angermann [Thu, 7 Jan 2016 10:47:46 +0000 (18:47 +0800)] 
Adds Oracle

3 years agoPrepend to configure.
Andrey Mokhov [Thu, 7 Jan 2016 10:12:13 +0000 (10:12 +0000)] 
Prepend  to configure.

See #110. [skip ci]

3 years agoImprove needBuilder, see #124.
Andrey Mokhov [Thu, 7 Jan 2016 09:37:52 +0000 (09:37 +0000)] 
Improve needBuilder, see #124.

3 years agoRestore install argument to stack.
Andrey Mokhov [Thu, 7 Jan 2016 09:37:20 +0000 (09:37 +0000)] 
Restore install argument to stack.

See #110. [skip ci]

3 years agoFix the old-time issue.
Andrey Mokhov [Thu, 7 Jan 2016 09:24:05 +0000 (09:24 +0000)] 
Fix the old-time issue.

See #110. [skip ci]

3 years ago:+1:
Moritz Angermann [Thu, 7 Jan 2016 05:51:30 +0000 (13:51 +0800)] 
:+1:

3 years ago:(
Moritz Angermann [Thu, 7 Jan 2016 05:02:51 +0000 (13:02 +0800)] 
:(

3 years agoShow the candidates.
Moritz Angermann [Thu, 7 Jan 2016 03:30:05 +0000 (11:30 +0800)] 
Show the candidates.

3 years agoTake 2
Moritz Angermann [Thu, 7 Jan 2016 03:06:37 +0000 (11:06 +0800)] 
Take 2

3 years agoInstall shake, mtl and ansi-terminal.
Andrey Mokhov [Thu, 7 Jan 2016 02:40:43 +0000 (02:40 +0000)] 
Install shake, mtl and ansi-terminal.

See #110. [skip ci]

3 years agoFix paths.
Andrey Mokhov [Thu, 7 Jan 2016 02:23:41 +0000 (02:23 +0000)] 
Fix paths.

See #110. [skip ci]

3 years agoAdd appveyor badge
Andrey Mokhov [Thu, 7 Jan 2016 02:21:18 +0000 (02:21 +0000)] 
Add appveyor badge

See #110. [skip ci]

3 years agoCreate /home/ghc/tmp, add stack install dir to PATH.
Andrey Mokhov [Thu, 7 Jan 2016 02:10:08 +0000 (02:10 +0000)] 
Create /home/ghc/tmp, add stack install dir to PATH.

See #110. [skip ci]

3 years agoDrop extra flags to stack install.
Andrey Mokhov [Thu, 7 Jan 2016 01:59:39 +0000 (01:59 +0000)] 
Drop extra flags to stack install.

See #110. [skip ci]

3 years agoSwitch to stack/windows-x86_64.
Andrey Mokhov [Thu, 7 Jan 2016 01:49:02 +0000 (01:49 +0000)] 
Switch to stack/windows-x86_64.

See #110. [skip ci]

3 years agoInstall ghc-7.10.3 before using stack.
Andrey Mokhov [Thu, 7 Jan 2016 01:40:09 +0000 (01:40 +0000)] 
Install ghc-7.10.3 before using stack.

See #110. [skip ci]

3 years agoTry to use stack instead of cabal.
Andrey Mokhov [Thu, 7 Jan 2016 01:34:53 +0000 (01:34 +0000)] 
Try to use stack instead of cabal.

See #110. [skip ci]

3 years agoTry to use an older cabal version.
Andrey Mokhov [Thu, 7 Jan 2016 01:01:32 +0000 (01:01 +0000)] 
Try to use an older cabal version.

See #110. [skip ci]

3 years agoRun cabal in -v3 mode in bash.
Andrey Mokhov [Wed, 6 Jan 2016 23:56:24 +0000 (23:56 +0000)] 
Run cabal in -v3 mode in bash.

See #110. [skip ci]

3 years agoRun cabal in -v3 mode to reveal the problem.
Andrey Mokhov [Wed, 6 Jan 2016 23:36:07 +0000 (23:36 +0000)] 
Run cabal in -v3 mode to reveal the problem.

See #110. [skip ci]

3 years agoRun cabal outside bash.
Andrey Mokhov [Wed, 6 Jan 2016 23:12:14 +0000 (23:12 +0000)] 
Run cabal outside bash.

See #110. [skip ci]

3 years agoKeep experimenting with cabal folder.
Andrey Mokhov [Wed, 6 Jan 2016 22:44:46 +0000 (22:44 +0000)] 
Keep experimenting with cabal folder.

See #110. [skip ci]

3 years agoMove cabal folder inside /home/ghc.
Andrey Mokhov [Wed, 6 Jan 2016 22:32:46 +0000 (22:32 +0000)] 
Move cabal folder inside /home/ghc.

See #110. [skip ci]

3 years agoFix cabal path, create directory for cabal if it does not exist.
Andrey Mokhov [Wed, 6 Jan 2016 22:11:00 +0000 (22:11 +0000)] 
Fix cabal path, create directory for cabal if it does not exist.

See #110. [skip ci]

3 years agoChange cabal config path and cache it.
Andrey Mokhov [Wed, 6 Jan 2016 22:07:41 +0000 (22:07 +0000)] 
Change cabal config path and cache it.

See #110. [skip ci]

3 years agoFix cabal rename error.
Andrey Mokhov [Wed, 6 Jan 2016 20:30:11 +0000 (20:30 +0000)] 
Fix cabal rename error.

See #110. [skip ci]

3 years agoInstall project dependencies, pass -j --no-progress to build.bat
Andrey Mokhov [Wed, 6 Jan 2016 19:35:18 +0000 (19:35 +0000)] 
Install project dependencies, pass -j --no-progress to build.bat

See #110. [skip ci]

3 years agoRename cabal, add build script.
Andrey Mokhov [Wed, 6 Jan 2016 19:21:43 +0000 (19:21 +0000)] 
Rename cabal, add build script.

See #110. [skip ci]

3 years agoFix path to clone folder.
Andrey Mokhov [Wed, 6 Jan 2016 18:53:37 +0000 (18:53 +0000)] 
Fix path to clone folder.

See #110. [skip ci]

3 years agoDrop heavy python dependency, change project folder.
Andrey Mokhov [Wed, 6 Jan 2016 18:51:55 +0000 (18:51 +0000)] 
Drop heavy python dependency, change project folder.

See #110. [skip ci]

3 years agoCreate /usr/local/bin, silence curl.
Andrey Mokhov [Wed, 6 Jan 2016 18:33:03 +0000 (18:33 +0000)] 
Create /usr/local/bin, silence curl.

See #110. [skip ci]

3 years agoInstall prerequisites for Windows build.
Andrey Mokhov [Wed, 6 Jan 2016 18:19:24 +0000 (18:19 +0000)] 
Install prerequisites for Windows build.

See #110. [skip ci]

3 years agoFix test script, see #110.
Andrey Mokhov [Wed, 6 Jan 2016 18:11:05 +0000 (18:11 +0000)] 
Fix test script, see #110.

3 years agoAdd a test appveyor script, see #110.
Andrey Mokhov [Wed, 6 Jan 2016 17:48:41 +0000 (17:48 +0000)] 
Add a test appveyor script, see #110.

3 years agoUpdates travis and README to reflect fixing #26
Moritz Angermann [Wed, 6 Jan 2016 15:24:22 +0000 (23:24 +0800)] 
Updates travis and README to reflect fixing #26

3 years agoLookup builder in PATH if they are given without path.
Moritz Angermann [Wed, 6 Jan 2016 15:22:43 +0000 (23:22 +0800)] 
Lookup builder in PATH if they are given without path.

`system-gcc` may be given without path (e.g. `clang`), this patch adds lookup using `which`
for those commands. Also drops calling `fixAbsolutePathOnWindows` on non window hosts.
Fixes #26

3 years agoMerge pull request #121 from angerman/feature/fix-osx-ci
Andrey Mokhov [Wed, 6 Jan 2016 13:47:24 +0000 (13:47 +0000)] 
Merge pull request #121 from angerman/feature/fix-osx-ci

Let's try the stupid --with-gcc fix for os x.

3 years agoLet's try the stupid --with-gcc fix for os x.
Moritz Angermann [Wed, 6 Jan 2016 13:43:38 +0000 (21:43 +0800)] 
Let's try the stupid --with-gcc fix for os x.

See #111

3 years agoMerge pull request #120 from quchen/irc-notifications
Andrey Mokhov [Wed, 6 Jan 2016 13:10:12 +0000 (13:10 +0000)] 
Merge pull request #120 from quchen/irc-notifications

Add IRC notifications

3 years agoCache $HOME/.ghc as well
David Luposchainsky [Tue, 5 Jan 2016 15:45:41 +0000 (16:45 +0100)] 
Cache $HOME/.ghc as well

3 years agoAdd IRC notifications
David Luposchainsky [Tue, 5 Jan 2016 15:07:39 +0000 (16:07 +0100)] 
Add IRC notifications

3 years agoRefactor generated dependencies
Andrey Mokhov [Wed, 6 Jan 2016 11:56:22 +0000 (11:56 +0000)] 
Refactor generated dependencies

Do not proceed with building a package until all its generated dependencies are in place. List generated files in ghcPrim package, see #117.

3 years agoSimplify extraObjects in src/Rules/Library.hs, see #117.
Andrey Mokhov [Wed, 6 Jan 2016 11:10:49 +0000 (11:10 +0000)] 
Simplify extraObjects in src/Rules/Library.hs, see #117.

3 years agoMerge pull request #112 from angerman/feature/osx-ci
Andrey Mokhov [Wed, 6 Jan 2016 10:56:48 +0000 (10:56 +0000)] 
Merge pull request #112 from angerman/feature/osx-ci

Adds osx to the list of operatin systems in the travis.yml

3 years agoMerge pull request #115 from angerman/feature/libtool
Andrey Mokhov [Wed, 6 Jan 2016 10:51:29 +0000 (10:51 +0000)] 
Merge pull request #115 from angerman/feature/libtool

Set CONFIG_SHELL, such that libtool obtains the bash header.

3 years agoAdds "MAKEFLAGS=" back in.
Moritz Angermann [Wed, 6 Jan 2016 10:48:56 +0000 (18:48 +0800)] 
Adds "MAKEFLAGS=" back in.

3 years agoRemove -Wall and -fwarn-tabs, fix #116.
Andrey Mokhov [Wed, 6 Jan 2016 10:41:19 +0000 (10:41 +0000)] 
Remove -Wall and -fwarn-tabs, fix #116.

3 years agoSet CONFIG_SHELL, such that libtool obtains the bash header.
Moritz Angermann [Wed, 6 Jan 2016 06:37:10 +0000 (14:37 +0800)] 
Set CONFIG_SHELL, such that libtool obtains the bash header.

This improves on #103 and fixes #114, hopefully.

3 years agobefore_install steps don't merge
Moritz Angermann [Wed, 6 Jan 2016 05:11:19 +0000 (13:11 +0800)] 
before_install steps don't merge

Moved the validation of before_install into install.

3 years agoCan we put addons and before_install into the include?
Moritz Angermann [Wed, 6 Jan 2016 05:03:06 +0000 (13:03 +0800)] 
Can we put addons and before_install into the include?

3 years agorun cabal update
Moritz Angermann [Wed, 6 Jan 2016 04:55:41 +0000 (12:55 +0800)] 
run cabal update

3 years agoReorder os and env
Moritz Angermann [Wed, 6 Jan 2016 04:55:34 +0000 (12:55 +0800)] 
Reorder os and env

3 years agoInstall alex, happy; adjust path only on ghc/cabal path only on linux.
Moritz Angermann [Wed, 6 Jan 2016 04:50:09 +0000 (12:50 +0800)] 
Install alex, happy; adjust path only on ghc/cabal path only on linux.

3 years agoUse install.
Moritz Angermann [Wed, 6 Jan 2016 04:43:17 +0000 (12:43 +0800)] 
Use install.

3 years agoThis should work, I guess.
Moritz Angermann [Wed, 6 Jan 2016 04:38:22 +0000 (12:38 +0800)] 
This should work, I guess.

3 years agoCan we install ghc and cabal through homebrew on os x?
Moritz Angermann [Wed, 6 Jan 2016 04:26:12 +0000 (12:26 +0800)] 
Can we install ghc and cabal through homebrew on os x?

3 years agoDrop commas
Moritz Angermann [Wed, 6 Jan 2016 04:20:58 +0000 (12:20 +0800)] 
Drop commas

3 years agocollapse env, addons wihout linux
Moritz Angermann [Wed, 6 Jan 2016 04:16:48 +0000 (12:16 +0800)] 
collapse env, addons wihout linux

3 years agoenv for all, apt only for linux
Moritz Angermann [Wed, 6 Jan 2016 04:15:00 +0000 (12:15 +0800)] 
env for all, apt only for linux

3 years agoDo we need tabs?
Moritz Angermann [Wed, 6 Jan 2016 03:57:30 +0000 (11:57 +0800)] 
Do we need tabs?

3 years agoAdds osx to the list of operatin systems in the travis.yml
Moritz Angermann [Wed, 6 Jan 2016 03:50:02 +0000 (11:50 +0800)] 
Adds osx to the list of operatin systems in the travis.yml

This should fix #111.

3 years agoAdd a rule for libraries/integer-gmp/gmp/gmp.h, see #103.
Andrey Mokhov [Wed, 6 Jan 2016 01:50:10 +0000 (01:50 +0000)] 
Add a rule for libraries/integer-gmp/gmp/gmp.h, see #103.

3 years agoMinor revision
Andrey Mokhov [Wed, 6 Jan 2016 01:20:21 +0000 (01:20 +0000)] 
Minor revision

[skip ci]

3 years agoAnother attempt to invoke libtool via bash, see #103.
Andrey Mokhov [Wed, 6 Jan 2016 00:51:54 +0000 (00:51 +0000)] 
Another attempt to invoke libtool via bash, see #103.

3 years agoTry to invoke libtool via bash.
Andrey Mokhov [Tue, 5 Jan 2016 23:43:25 +0000 (23:43 +0000)] 
Try to invoke libtool via bash.

See #103.

3 years agoDon't separate build commands with an empty line.\n\nThis allows to fit more commands...
Andrey Mokhov [Tue, 5 Jan 2016 23:21:54 +0000 (23:21 +0000)] 
Don't separate build commands with an empty line.\n\nThis allows to fit more commands on screen.

3 years agoAvoid cyclic dependencies, see #103.
Andrey Mokhov [Tue, 5 Jan 2016 21:30:58 +0000 (21:30 +0000)] 
Avoid cyclic dependencies, see #103.

3 years agoForce integerGmp package to be configured before reading config.mk file, see #103.
Andrey Mokhov [Tue, 5 Jan 2016 19:35:34 +0000 (19:35 +0000)] 
Force integerGmp package to be configured before reading config.mk file, see #103.

3 years agoAttempt to fix integer-gmp problem on Travis, see #103.
Andrey Mokhov [Tue, 5 Jan 2016 17:02:55 +0000 (17:02 +0000)] 
Attempt to fix integer-gmp problem on Travis, see #103.

3 years agoRefactor libffi rules.
Andrey Mokhov [Tue, 5 Jan 2016 17:00:37 +0000 (17:00 +0000)] 
Refactor libffi rules.

3 years agoSeparate build messages with a newline.
Andrey Mokhov [Tue, 5 Jan 2016 16:59:41 +0000 (16:59 +0000)] 
Separate build messages with a newline.

3 years agoMake ghc-cabal build parallel [skip ci].
Andrey Mokhov [Tue, 5 Jan 2016 14:02:21 +0000 (14:02 +0000)] 
Make ghc-cabal build parallel [skip ci].

3 years agoMerge pull request #106 from angerman/feature/broken-osx-readlink
Andrey Mokhov [Tue, 5 Jan 2016 13:02:14 +0000 (13:02 +0000)] 
Merge pull request #106 from angerman/feature/broken-osx-readlink

Fix readlink for os x [skip ci]

3 years ago-Augenkrebs
Moritz Angermann [Tue, 5 Jan 2016 12:58:38 +0000 (20:58 +0800)] 
-Augenkrebs

3 years agoAdd rl function to the cabal build file as well.
Moritz Angermann [Tue, 5 Jan 2016 12:58:07 +0000 (20:58 +0800)] 
Add rl function to the cabal build file as well.

3 years agoAdds quotes.
Moritz Angermann [Tue, 5 Jan 2016 12:54:18 +0000 (20:54 +0800)] 
Adds quotes.

3 years agoMerge pull request #107 from angerman/feature/iserv
Andrey Mokhov [Tue, 5 Jan 2016 12:52:41 +0000 (12:52 +0000)] 
Merge pull request #107 from angerman/feature/iserv

Adds -no-hs-main to iservBin

3 years agoAdds -no-hs-main to iservBin
Moritz Angermann [Tue, 5 Jan 2016 12:44:55 +0000 (20:44 +0800)] 
Adds -no-hs-main to iservBin

Fixes #102. But does not *yet* include the generation of the wrapper script.

3 years agoFix readlink for os x.
Moritz Angermann [Tue, 5 Jan 2016 12:43:29 +0000 (20:43 +0800)] 
Fix readlink for os x.

This should fix #104.

3 years agoTemporarily disable haddock, see #98.
Andrey Mokhov [Tue, 5 Jan 2016 11:39:38 +0000 (11:39 +0000)] 
Temporarily disable haddock, see #98.

3 years agoMerge pull request #101 from quchen/master
Andrey Mokhov [Tue, 5 Jan 2016 11:31:03 +0000 (11:31 +0000)] 
Merge pull request #101 from quchen/master

Rework Travis CI script