Rob Rix
|
adb9d009cb
|
Merge branch 'master' into hush-little-vector-don’t-you-cry
# Conflicts:
# semantic-diff.cabal
|
2016-02-17 11:43:29 -05:00 |
|
Matt Diephouse
|
8df993408d
|
Set the correct flags
|
2016-02-16 16:45:49 -05:00 |
|
Matt Diephouse
|
c8edf79abb
|
Add a spec for test files
|
2016-02-16 16:38:31 -05:00 |
|
Matt Diephouse
|
5127376e68
|
diffFiles :: Parser -> Renderer T.Text b -> (Source Char, Source Char) -> IO b
|
2016-02-16 16:09:58 -05:00 |
|
Matt Diephouse
|
ac053940fe
|
Add a spec for on-disk tests
|
2016-02-16 12:33:41 -05:00 |
|
Rob Rix
|
52875fdd99
|
Silence a warning for the DiffOutput module.
|
2016-02-13 15:09:13 -08:00 |
|
Rob Rix
|
bda4df6731
|
Build threadily.
|
2016-02-13 14:16:49 -08:00 |
|
Rob Rix
|
54cf53e639
|
Add DiffOutput to the cabal file.
|
2016-02-13 12:41:07 -08:00 |
|
Matt Diephouse
|
4a5c844f34
|
Move Language to a separate module
|
2016-02-10 14:30:14 -08:00 |
|
Matt Diephouse
|
170b7c6e1e
|
Rename Categorizable module to Category
|
2016-02-04 13:59:33 -05:00 |
|
joshvera
|
724910bf7a
|
Merge remote-tracking branch 'origin/master' into git-diff
|
2016-02-01 14:48:30 -05:00 |
|
Matt Diephouse
|
316a7827c3
|
Add Rainbow to semantic-diff-exe
|
2016-01-21 13:32:00 -05:00 |
|
joshvera
|
84d8494c3e
|
Add semantic-diff exe
|
2016-01-15 16:25:58 -05:00 |
|
joshvera
|
13b676f392
|
Merge origin/master into git-diff
|
2016-01-14 14:04:28 -05:00 |
|
Matt Diephouse
|
9c4ea153bc
|
Add a Renderer type for rendering diffs
|
2016-01-14 13:18:40 -05:00 |
|
Matt Diephouse
|
6a3f5c4c00
|
Use Option instead of creating a Union type
|
2016-01-13 13:34:56 -05:00 |
|
Rob Rix
|
c5059e94ee
|
Just include-dirs .
|
2016-01-13 13:34:56 -05:00 |
|
Rob Rix
|
6bffb323c2
|
Extra include dirs.
|
2016-01-13 13:34:56 -05:00 |
|
Rob Rix
|
7dbaddf8fa
|
Add the homebrew icu4c path to extra-lib-dirs on Darwin.
|
2016-01-13 13:34:56 -05:00 |
|
Matt Diephouse
|
473866cb6a
|
Use Option instead of creating a Union type
|
2016-01-13 10:04:26 -05:00 |
|
Rob Rix
|
bfbb1745dd
|
Just include-dirs .
|
2016-01-12 20:49:46 -05:00 |
|
Rob Rix
|
57cee8f754
|
Extra include dirs.
|
2016-01-12 20:47:50 -05:00 |
|
Rob Rix
|
47ed985a6a
|
Add the homebrew icu4c path to extra-lib-dirs on Darwin.
|
2016-01-12 20:39:04 -05:00 |
|
joshvera
|
8f069abbce
|
Merge master into git-diff
|
2016-01-12 12:53:09 -05:00 |
|
Rob Rix
|
662e14448e
|
Just link the libs on Darwin (I hope, oh god I hope)
|
2016-01-12 11:55:23 -05:00 |
|
Rob Rix
|
fe759bb6cd
|
Now with 100% more correct syntax!
|
2016-01-12 11:46:11 -05:00 |
|
Rob Rix
|
d37fcb287e
|
Don’t use script/g++ on Darwin.
|
2016-01-12 11:42:55 -05:00 |
|
Rob Rix
|
23ac8b749e
|
We don’t need these options any more.
-lstdc++ is handled by g++. The libraries are handled by our wrapper
script.
|
2016-01-11 19:23:53 -05:00 |
|
Rob Rix
|
5519a1dda0
|
Use the linker wrapper.
|
2016-01-11 19:18:34 -05:00 |
|
Rob Rix
|
b7030fe9bf
|
Pass the flags through as tho to g++ itself.
|
2016-01-11 19:10:57 -05:00 |
|
Rob Rix
|
0ceafb12ac
|
Pass icui18n first.
|
2016-01-11 19:09:36 -05:00 |
|
Rob Rix
|
dc1d017a40
|
-Bstatic/-Bdynamic exist and may actually differ.
|
2016-01-11 15:34:50 -05:00 |
|
Rob Rix
|
5978a57204
|
Link -lstdc++ via ld-options.
|
2016-01-11 13:08:41 -05:00 |
|
Rob Rix
|
3404008f5b
|
Don’t use extra-libraries.
|
2016-01-11 13:08:27 -05:00 |
|
Rob Rix
|
2dc2c94b79
|
Use ld-options again.
|
2016-01-11 13:08:23 -05:00 |
|
Rob Rix
|
ef3efba294
|
Revert "Don’t link ICU (to compare the errors)."
This reverts commit 2e6ce0b97b1ccf8f95c8086b5e75d8b6ed23cee0.
|
2016-01-11 13:07:47 -05:00 |
|
Rob Rix
|
b986780045
|
Don’t link ICU (to compare the errors).
|
2016-01-11 13:05:32 -05:00 |
|
Rob Rix
|
407e9bf8bc
|
extra-libs here maybe?
|
2016-01-11 12:55:48 -05:00 |
|
Rob Rix
|
d5d7997a19
|
Try to statically link the ICU libs but dynamically link everything else.
|
2016-01-11 12:52:29 -05:00 |
|
Rob Rix
|
5c18bb7715
|
Revert "Pass the static archives in as ld-options."
This reverts commit 6934d44e96e6d999b352e21bfc6446c99b80a387.
|
2016-01-11 12:50:04 -05:00 |
|
Rob Rix
|
a09449720a
|
Pass the static archives in as ld-options.
|
2016-01-11 12:46:05 -05:00 |
|
Rob Rix
|
e767f9858d
|
Revert "Pass the static archives in as c-sources."
This reverts commit ff1b6769186add595de0d3d521efacd5e54cfebb.
|
2016-01-11 12:45:30 -05:00 |
|
Rob Rix
|
39a4d00a99
|
Pass the static archives in as c-sources.
|
2016-01-11 12:44:31 -05:00 |
|
Rob Rix
|
a951895ebf
|
Try linking against ICU .a’s directly.
|
2016-01-11 12:41:43 -05:00 |
|
Rob Rix
|
861a6dfc88
|
Remove the semantic-diff-profile component.
|
2016-01-11 11:46:12 -05:00 |
|
Rob Rix
|
e931df2bd5
|
Remove ld-options.
|
2016-01-11 11:16:47 -05:00 |
|
Rob Rix
|
66fb848834
|
Revert "Revert "Remove -dynamic.""
This reverts commit 7dfd43f26ed0d880ff498f98f3544059c9d5ada6.
|
2016-01-11 11:14:16 -05:00 |
|
Rob Rix
|
597397b16e
|
Revert "Remove -dynamic."
This reverts commit a0c75e64bb5896ee336d2a9c38eba4b3a6f49f9a.
|
2016-01-11 11:13:04 -05:00 |
|
Rob Rix
|
e2d4b6bfea
|
Remove -dynamic.
|
2016-01-11 11:12:15 -05:00 |
|
Rob Rix
|
188d6025d7
|
Revert "Attempt to link the ICU libs statically."
This reverts commit 5961a362ac93ff2c28e59a3bb18900c7713d68e8.
|
2016-01-11 11:12:03 -05:00 |
|