Commit Graph

7791 Commits

Author SHA1 Message Date
John J. Camilleri 632cd1e522 Refresh home page using basic Bootstrap 2018-10-31 14:13:05 +01:00
John J. Camilleri 4387b1bea0 Add more phony's to Makefile 2018-10-31 13:14:06 +01:00
Inari Listenmaa 0a62c13fd1 Merge pull request #10 from inariksit/master
Add {-# LANGUAGE GADTs -#} to the generated Haskell file
2018-10-19 16:23:16 +02:00
Inari Listenmaa 8c382b3cb1 Add {-# LANGUAGE GADTs -#} to the generated Haskell file 2018-10-19 15:20:05 +02:00
Thomas Hallgren effa818408 gf -cshell bug fix
The functions cExpr and hsExpr in GF.Command.Commands2 need to
handle string literals.
2018-10-16 16:23:54 +02:00
John J. Camilleri 8df3b458d4 cabal sdist doesn't throw an error anymore
This was making it impossible to install gf as external source in cabal sandbox
2018-10-15 21:05:55 +02:00
Krasimir Angelov a0afbfbad3 Merge branch 'master' of https://github.com/GrammaticalFramework/gf-core 2018-10-15 12:04:36 +02:00
Krasimir Angelov 8a9430f63a hide the compatibility API 2018-10-15 12:04:03 +02:00
Thomas Hallgren 6b1e21508e Comment out links to some old demos that no longer work 2018-10-10 14:22:24 +02:00
Aarne Ranta 8787b56def option rf -paragraphs 2018-09-21 10:40:39 +02:00
John J. Camilleri 50e1e7b17e Merge pull request #7 from odanoburu/travis-ci
add travis ci
2018-08-13 08:46:09 +02:00
John J. Camilleri f1803a2f16 Small fixes to gf-developers document 2018-08-12 21:30:11 +02:00
odanoburu 64ccc424cf (#5) rm files from nix build 2018-08-11 22:44:45 -03:00
odanoburu dce81dc0ec (#5) reintroduce make install 2018-08-11 22:16:28 -03:00
odanoburu 29acef41fc (#5) specify image version 2018-08-11 22:11:27 -03:00
odanoburu 4038546321 (#5) no need for make install 2018-08-11 22:07:53 -03:00
odanoburu df31ab241b (#5) add travis CI with docker
dependencies are preinstalled in docker image for faster build, but this means we need to update it whenever dependencies change
2018-08-11 22:02:08 -03:00
John J. Camilleri 35304c8577 Remove Travis build status from homepage 2018-08-08 22:33:20 +02:00
John J. Camilleri 3b7aaaf9f4 Add news item to homepage about repo split 2018-08-08 09:08:50 +02:00
Thomas H e89e5f13bf Merge pull request #3 from MUSTE-Project/master
A version of `readPGF` where the user can handle reading files
2018-08-06 16:31:55 +02:00
Frederik Hanghøj Iversen 6b2c2256d1 A version of readPGF where the user handles the IO. 2018-08-06 16:05:12 +02:00
Thomas Hallgren d9f0dfd400 gf.cabal: expose GF.Text.Lexing, needed by gf-server.cabal 2018-07-31 15:02:59 +02:00
Thomas Hallgren 4fd1ec71c9 gf-server.cabal: relax network version bounds and make building the library and pgf-service executable optional
This allows you to build the content-service without installing the problematic fastcgi library.
2018-07-31 14:29:18 +02:00
John J. Camilleri dfb3914881 Update README 2018-07-26 21:42:06 +02:00
John J. Camilleri 636a8142b4 Minimal update with new repo URLs & build instructions 2018-07-26 01:37:03 +02:00
John J. Camilleri 59e66adb35 Fixes for buildWeb 2018-07-26 00:51:13 +02:00
John J. Camilleri e1dd7bfdf5 [GF Split] Post-split updates 2018-07-25 19:55:11 +02:00
John J. Camilleri 895b479564 Merge pull request #8 from legalese/GF_LIB_PATH
GF_LIB_PATH can now be path1:path2:path3, not just 1path
2018-07-22 14:48:44 +02:00
Meng Weng Wong 7f86bee8e7 explain that GF_LIB_PATH can now be a colon-separated list 2018-07-22 00:14:29 -07:00
meng wong 8a14912ee3 GF_LIB_PATH can now be path1:path2:path3, not just path1
Traditionally, GF_LIB_PATH points to something like
`.../share/ghc-8.0.2-x86_64/gf-3.9/lib`

and if you want prelude and alltenses and present, you add a
`--# -path=.:present`
compiler pragma to the top of your .gf file

But if you are developing some kind of application grammar
library or contrib of your own, you might find yourself
repeating your library path at the top of all your .gf files.

After painstakingly maintaining the same library path at the
top of all your .gf files, you might say, let's factor this
out into GF_LIB_PATH.

Then you might then find to your surprise that GF_LIB_PATH
doesn't accept the usual colon:separated:path notation
familiar from, say, unix PATH and MANPATH.

This patch allows you to define
`GF_LIB_PATH=gf-3.9.lib:$HOME/gf-contrib/whatever/lib`
in a more natural way.

If you are an RGL hacker and have your own version of the
RGL tree sitting somewhere, you should be able to have both
paths in the GF_LIB_PATH, for added convenience. This minor
convenience will probably lead to obscure bugs and great
frustration when you find that your changes are mysteriously
not being picked up by GF; so keep this in mind and use it
cautiously.

This caution should probably sit in the documentation
somewhere. A subsequent commit will do that.

If you use zsh, you can do this to quickly build up a big
GF_LIB_PATH:

% gf_lib_path=( $HOME/src/GF/lib/src/{api,abstract,common,english,api/libraryBrowser,prelude,..} )

% typeset -xT GF_LIB_PATH gf_lib_path
2018-07-22 00:04:07 -07:00
John J. Camilleri cd1942a845 WebSetup: fail silently when example grammars don't build
Also used installed RGL not built
2018-07-19 12:36:39 +02:00
John J. Camilleri 6a8d0038ed Merge pull request #46 from odanoburu/construct
(Eng) use Extend instead of Extra in Construction
2018-07-17 16:32:36 +02:00
John J. Camilleri f9331526d1 More cleanup in Setup and WebSetup 2018-07-05 15:22:05 +02:00
John J. Camilleri 8b5532c1e9 Relax dependency on directory package for Setup
Since `listDirectory` is no longer used (852a49920)
2018-07-05 14:21:05 +02:00
Krasimir Angelov 73cf58da23 revert to a version compatible with Cabal 1.22 2018-07-05 13:10:02 +02:00
Krasimir Angelov e95aa16fdc Merge branch 'master' of https://github.com/GrammaticalFramework/GF 2018-07-05 13:01:46 +02:00
John J. Camilleri 0ef7fb8b0f Cleanup in Setup.hs; include custom-setup:setup-depends in cabal file. 2018-07-05 12:23:02 +02:00
John J. Camilleri 992af4ab97 Clean up imports in Setup.hs
Really just for my own understanding
2018-07-05 10:32:40 +02:00
Krasimir Angelov ce83d8490b Merge branch 'master' of https://github.com/GrammaticalFramework/GF 2018-07-05 09:13:04 +02:00
John J. Camilleri af82dc9fc6 Fix make sdist to use git archive instead of darcs dist 2018-07-04 14:28:25 +02:00
John J. Camilleri a6b1db71cd Remove more remnants from the darcs days 2018-07-04 14:21:44 +02:00
John J. Camilleri 40cc58d6c1 Replace Distribution.Simple.Utils.noticeNoWrap with putStr
Effect is the same and I don't want to upset the package dependencies
2018-07-04 14:00:56 +02:00
John J. Camilleri b9b0217160 Remove code which tries to get version information from darcs folder 2018-07-04 13:40:46 +02:00
Krasimir Angelov f64b17eef7 Merge branch 'master' of https://github.com/GrammaticalFramework/GF
Conflicts:
	examples/phrasebook/SentencesBul.gf
	examples/phrasebook/WordsBul.gf
2018-07-04 13:09:39 +02:00
Krasimir Angelov 7bfd6199d6 a majour refactoring to support clitic pronouns 2018-07-04 13:01:06 +02:00
John J. Camilleri c6f4edaea5 Remove examples directory; these now live in gf-contrib
All changes have been reflected in the gf-contrib repository:
https://github.com/GrammaticalFramework/gf-contrib

Now, for WebSetup to build the example grammars, one must have gf-contrib
cloned in the same top-level directory as GF. When this isn't the case,
WebSetup displays a notice without failing.
2018-07-04 10:09:58 +02:00
Krasimir Angelov 00476ae386 Merge branch 'master' of https://github.com/GrammaticalFramework/GF 2018-06-27 20:52:59 +02:00
Thomas Hallgren 23961ef0b3 GF.Server: add 'import Control.Applicative' for compatibilit with GHC<7.10
One could also add stricter version constraints in gf.cabal, e.g.
base>=4.8 (implies GHC>=7.10) if we want to only support building with
GHC>=7.10.
2018-06-27 17:40:35 +02:00
Krasimir Angelov 97da247d21 Merge branch 'master' of https://github.com/GrammaticalFramework/GF 2018-06-27 11:54:24 +02:00
Krasimir Angelov 6c4c22ff7a undo the partial fix for word completion since it breaks normal parsing 2018-06-27 11:53:40 +02:00