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/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/gf.cabal b/gf.cabal index 711acaeb2..e356614ec 100644 --- a/gf.cabal +++ b/gf.cabal @@ -8,12 +8,15 @@ license-file: LICENSE category: Natural Language Processing, Compiler synopsis: Grammatical Framework description: GF, Grammatical Framework, is a programming language for multilingual grammar applications +maintainer: John J. Camilleri homepage: https://www.grammaticalframework.org/ bug-reports: https://github.com/GrammaticalFramework/gf-core/issues tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4 data-dir: src -extra-source-files: WebSetup.hs +extra-source-files: + WebSetup.hs + doc/Logos/gf0.png data-files: www/*.html www/*.css @@ -106,7 +109,7 @@ library --ghc-options: -fwarn-unused-imports --if impl(ghc>=7.8) -- ghc-options: +RTS -A20M -RTS - ghc-prof-options: -fprof-auto + -- ghc-prof-options: -fprof-auto exposed-modules: PGF @@ -370,7 +373,7 @@ executable gf if impl(ghc<7.8) ghc-options: -with-rtsopts=-K64M - ghc-prof-options: -auto-all + -- ghc-prof-options: -auto-all if impl(ghc>=8.2) ghc-options: -fhide-source-paths 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