diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0ca0794b0..000000000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -sudo: required - -language: c - -services: - - docker - -before_install: - - docker pull odanoburu/gf-src:3.9 - -script: - - | - docker run --mount src="$(pwd)",target=/home/gfer,type=bind odanoburu/gf-src:3.9 /bin/bash -c "cd /home/gfer/src/runtime/c && - autoreconf -i && ./configure && make && make install ; cd /home/gfer ; cabal install -fserver -fc-runtime --extra-lib-dirs='/usr/local/lib'" diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..ac209f1af --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,11 @@ +### New since 3.11 (WIP) + +- Added a changelog! + +### 3.11 + +See + +### 3.10 + +See diff --git a/Makefile b/Makefile index cdb35e49a..fc2a38808 100644 --- a/Makefile +++ b/Makefile @@ -65,6 +65,6 @@ bintar: # Make a source tar.gz distribution using git to make sure that everything is included. # We put the distribution in dist/ so it is removed on `make clean` -sdist: - test -d dist || mkdir dist - git archive --format=tar.gz --output=dist/gf-${VERSION}.tar.gz HEAD +# sdist: +# test -d dist || mkdir dist +# git archive --format=tar.gz --output=dist/gf-${VERSION}.tar.gz HEAD diff --git a/README.md b/README.md index e393be0e6..79e6ab68f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![GF Logo](doc/Logos/gf1.svg) +![GF Logo](https://www.grammaticalframework.org/doc/Logos/gf1.svg) # Grammatical Framework (GF) @@ -39,7 +39,7 @@ or: stack install ``` -For more information, including links to precompiled binaries, see the [download page](http://www.grammaticalframework.org/download/index.html). +For more information, including links to precompiled binaries, see the [download page](https://www.grammaticalframework.org/download/index.html). ## About this repository diff --git a/RELEASE.md b/RELEASE.md index 04bd4b933..1deaa3a90 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -47,11 +47,14 @@ but the generated _artifacts_ must be manually attached to the release as _asset In order to do this you will need to be added the [GF maintainers](https://hackage.haskell.org/package/gf/maintainers/) on Hackage. -1. Run `make sdist` +1. Run `stack sdist --test-tarball` and address any issues. 2. Upload the package, either: - 1. **Manually**: visit and upload the file `dist/gf-X.Y.tar.gz` - 2. **via Cabal (≥2.4)**: `cabal upload dist/gf-X.Y.tar.gz` -3. If the documentation-building fails on the Hackage server, do: + 1. **Manually**: visit and upload the file generated by the previous command. + 2. **via Stack**: `stack upload . --candidate` +3. After testing the candidate, publish it: + 1. **Manually**: visit + 1. **via Stack**: `stack upload .` +4. If the documentation-building fails on the Hackage server, do: ``` cabal v2-haddock --builddir=dist/docs --haddock-for-hackage --enable-doc cabal upload --documentation dist/docs/*-docs.tar.gz diff --git a/doc/gf-people.md b/doc/gf-people.md index 7d0ef90c2..d7b755b9d 100644 --- a/doc/gf-people.md +++ b/doc/gf-people.md @@ -7,7 +7,6 @@ title: "Grammatical Framework: Authors and Acknowledgements" The current maintainers of GF are [Krasimir Angelov](http://www.chalmers.se/cse/EN/organization/divisions/computing-science/people/angelov-krasimir), -[Thomas Hallgren](http://www.cse.chalmers.se/~hallgren/), [Aarne Ranta](http://www.cse.chalmers.se/~aarne/), [John J. Camilleri](http://johnjcamilleri.com), and [Inari Listenmaa](https://inariksit.github.io/). @@ -22,6 +21,7 @@ and The following people have contributed code to some of the versions: +- [Thomas Hallgren](http://www.cse.chalmers.se/~hallgren/) (University of Gothenburg) - Grégoire Détrez (University of Gothenburg) - Ramona Enache (University of Gothenburg) - [Björn Bringert](http://www.cse.chalmers.se/alumni/bringert) (University of Gothenburg) diff --git a/download/index-3.11.md b/download/index-3.11.md index 4f2798a0a..8fa1d5c02 100644 --- a/download/index-3.11.md +++ b/download/index-3.11.md @@ -53,26 +53,39 @@ You will probably need to update the `PATH` environment variable to include your For more information, see [Using GF on Windows](https://www.grammaticalframework.org/~inari/gf-windows.html) (latest updated for Windows 10). - -## Installing from the latest developer source code +**Obtaining** -If you haven't already, clone the repository with: +To obtain the source code for the **release**, +download it from [GitHub](https://github.com/GrammaticalFramework/gf-core/releases). +Alternatively, to obtain the **latest version** of the source code: + +1. If you haven't already, clone the repository with: ``` git clone https://github.com/GrammaticalFramework/gf-core.git ``` - -If you've already cloned the repository previously, update with: - +2. If you've already cloned the repository previously, update with: ``` git pull ``` -Then install with: +**Installing** + +You can then install with: ``` cabal install ``` diff --git a/index.html b/index.html index 8816cc265..f657cc5b5 100644 --- a/index.html +++ b/index.html @@ -8,7 +8,7 @@ - + @@ -85,10 +85,27 @@

Contribute

@@ -154,7 +171,7 @@ least one, it may help you to get a first idea of what GF is.
-

Applications & Availability

+

Applications & availability

GF can be used for building translation systems, @@ -219,19 +236,28 @@ least one, it may help you to get a first idea of what GF is. or browse the channel logs.

- If you have a larger question which the community may benefit from, we recommend you ask it on the mailing list. + There is also a GF server on Discord. +

+ +

+ For bug reports and feature requests, please create an issue in the + GF Core or + RGL repository. + + For programming questions, consider asking them on Stack Overflow with the gf tag. + If you have a more general question to the community, we recommend you ask it on the mailing list.

News

-
2021-07-25
-
- GF 3.11 released. - Release notes -
+
2021-07-25
+
+ GF 3.11 released. + Release notes +
2021-05-05
GF WordNet now supports languages for which there are no other WordNets. New additions: Afrikaans, German, Korean, Maltese, Polish, Somali, Swahili. @@ -244,34 +270,6 @@ least one, it may help you to get a first idea of what GF is.
Abstract Syntax as Interlingua: Scaling Up the Grammatical Framework from Controlled Languages to Robust Pipelines. A paper in Computational Linguistics (2020) summarizing much of the development in GF in the past ten years.
-
2018-12-03
-
- Sixth GF Summer School in Stellenbosch (South Africa), 3–14 December 2018 -
-
2018-12-02
-
- GF 3.10 released. - Release notes -
-
2018-07-25
-
- The GF repository has been split in two: - gf-core and - gf-rgl. - The original GF repository is now archived. -
-
2017-08-11
-
- GF 3.9 released. - Release notes -
-
2017-06-29
-
- GF is moving to GitHub.
-
2017-03-13
-
- GF Summer School in Riga (Latvia), 14-25 August 2017 -

Projects

@@ -341,7 +339,7 @@ least one, it may help you to get a first idea of what GF is. Libraries are at the heart of modern software engineering. In natural language applications, libraries are a way to cope with thousands of details involved in syntax, lexicon, and inflection. The - GF resource grammar library has + GF resource grammar library (RGL) has support for an increasing number of languages, currently including Afrikaans, Amharic (partial), diff --git a/src/programs/gf-main.hs b/src/programs/gf-main.hs index 1dae54bc7..cf387d2fa 100644 --- a/src/programs/gf-main.hs +++ b/src/programs/gf-main.hs @@ -1,3 +1,5 @@ +module Main where + import qualified GF main = GF.main diff --git a/testsuite/compiler/compute/Variants.gfs b/testsuite/compiler/compute/Variants.gfs index 1f512694c..f65427e88 100644 --- a/testsuite/compiler/compute/Variants.gfs +++ b/testsuite/compiler/compute/Variants.gfs @@ -1,2 +1,12 @@ i -retain testsuite/compiler/compute/Variants.gf cc hello +cc <\x -> x++x : Str -> Str> ("a"|"b") +cc <\x -> x : Str -> Str> ("a"|"b") +cc <\x -> "c" : Str -> Str> ("a"|"b") +cc +cc +cc +cc <\x -> x.p1++x.p1 : Str*Str -> Str> <"a"|"b","c"> +cc <\x -> x.p1 : Str*Str -> Str> <"a"|"b","c"> +cc <\x -> x.p2++x.p2 : Str*Str -> Str> <"a"|"b","c"> +cc <\x -> x.p2 : Str*Str -> Str> <"a"|"b","c"> diff --git a/testsuite/compiler/compute/Variants.gfs.gold b/testsuite/compiler/compute/Variants.gfs.gold index cd74b1c23..50af5e513 100644 --- a/testsuite/compiler/compute/Variants.gfs.gold +++ b/testsuite/compiler/compute/Variants.gfs.gold @@ -1 +1,11 @@ variants {"hello"; "hello" ++ "hello"} +variants {"a" ++ "a"; "b" ++ "b"} +variants {"a"; "b"} +"c" +variants {"a"; "b"} ++ variants {"a"; "b"} +variants {"a"; "b"} +"c" +variants {"a"; "b"} ++ variants {"a"; "b"} +variants {"a"; "b"} +"c" ++ "c" +"c"