Tweak README and authors in dyna.cabal

diff --git a/README b/README
index cad519beaeb1033ebbe84bd42fadf8db5d4192ee..c32a82d8ac69344867136f3661326b79d328ec3f 100644 (file)
--- a/README
+++ b/README
@@ -27,8 +27,8 @@ src/Dyna/
                    -- modules here are named by the upstream package.
 
 
-For those not familar with cabal
---------------------------------
+Building
+--------
 
 First, ensure that you have GHC 7.6 or later.  (Though in a pinch, if you're
 only interested in the frontend stuff, apparently as early as 7.0 continues
@@ -38,25 +38,20 @@ Then, sadly, I have to ask you to build some upstream packages out of their
 repositories.  I thought they were going to be released "soon" when I
 switched to these later versions, but it hasn't happened yet:
 
-git submodule init
-git submodule update
-(cd external/ekmett-parsers; cabal install --user)
-(cd external/ekmett-trifecta; cabal install --user)
+make upstream
 
 Build K3, which requires OCaml:
 
+git submodule update external/damsl-k3
 (cd external/damsl-k3; make)
 
 Then fetch, build, and install any dependencies
 
-(cabal install --enable-tests --only-dependencies)
+make deps
 
 Build Dyna:
 
-cabal configure --user --enable-tests
-cabal build
-# cabal haddock # skip this, for depressing reasons
-cabal test
+make build
 
 And then run the REPL:
 
@@ -67,3 +62,11 @@ still rather "in the works" so you probably want to load some module in
 GHCi; for example:
 
 ghci -isrc Dyna.ParserHS.Parser
+
+Disclaimer
+----------
+
+This may someday be useful.  For the moment, it doesn't do much except keep
+us busy.  If you're trying to make it do something and it breaks, you get to
+keep all the pieces; see sections 15 - 17 of the AGPLv3 (available in
+LICENSE).

diff --git a/dyna.cabal b/dyna.cabal
index 5bc6bb168cf0008b38dc19caf9683634fa7466c1..ba008982115bb6ab6fdcff4db79d0c7bbe3c9432 100644 (file)
--- a/dyna.cabal
+++ b/dyna.cabal
@@ -4,10 +4,10 @@ Cabal-Version:  >=1.14
 Build-Type:     Simple
 Stability:      alpha
 Copyright:      Copyright (c) 2007--2012,
-                      Nathaniel W. Filardo, wren ng thornton
+                      Nathaniel W. Filardo, Tim Vieira, wren ng thornton
 License:        OtherLicense
 License-File:   LICENSE
-Author:         Nathaniel W. Filardo, wren ng thornton
+Author:         Nathaniel W. Filardo, Tim Vieira, wren ng thornton
 Maintainer:     haskell@dyna.org
 Homepage:       http://www.dyna.org/
 Category:       Compilers/Interpreters