From 2390a6e7d01c9094abfde9ca5affbbbfa5fe40da Mon Sep 17 00:00:00 2001
From: aarne <unknown>
Date: Mon, 8 Nov 2004 13:46:34 +0000
Subject: [PATCH] 2.1

---
 doc/gf-index.html | 19 +++++++++++++----
 grammars/mkLib.sh | 54 +++--------------------------------------------
 src/Makefile      |  2 +-
 3 files changed, 19 insertions(+), 56 deletions(-)

diff --git a/doc/gf-index.html b/doc/gf-index.html
index fc3a19e8a..19e3b98d6 100644
--- a/doc/gf-index.html
+++ b/doc/gf-index.html
@@ -9,19 +9,30 @@
 
 <h1>Grammatical Framework</h1>
 
-<h2>Version 2.0</h2>
+<h2>Version 2.1</h2>
 
-August 10, 2004.
+November 8, 2004.
 </center>
 
 <p>
 
 </p><h2>News</h2>
 
-<b>August 10, 2004. GF 2.0 now released</b>.
+<b>November 8, 2004. GF 2.1 released</b>.
 Here are the <a
 href="doc/gf2-highlights.html">highlights</a>.
-Software available on the <a href="download/gf-download.html">Download Page</a>.
+Software available on the <a href="download/gf-download.html">Download
+Page</a>.
+<p>
+Main novelties in 2.1: 
+multiple inheritance of grammar modules, 
+speech recognition grammar generation,
+lots of bug fixes.
+
+<p>
+
+Version 2.0 still available
+on the <a href="download-2.0/gf-download.html">GF 2.0 Download Page</a>.
 
 <p>
 
diff --git a/grammars/mkLib.sh b/grammars/mkLib.sh
index 5bf83f39c..8de0feeba 100644
--- a/grammars/mkLib.sh
+++ b/grammars/mkLib.sh
@@ -1,52 +1,4 @@
 rm -rf ../lib
-mkdir -p lib
-mkdir -p lib/letter
-# mkdir -p lib/logic
-mkdir -p lib/numerals
-mkdir -p lib/prelude
-mkdir -p lib/resource
-mkdir -p lib/resource/abstract
-mkdir -p lib/resource/english
-mkdir -p lib/resource/finnish
-mkdir -p lib/resource/french
-mkdir -p lib/resource/german
-mkdir -p lib/resource/italian
-mkdir -p lib/resource/romance
-mkdir -p lib/resource/russian
-mkdir -p lib/resource/swedish
-mkdir -p lib/resource/doc
-mkdir -p lib/database
-
-cp -p letter/README lib/letter/
-cp -p letter/mkLetter.gfs lib/letter/
-cp -p letter/*.gf lib/letter/
-
-# cp -p logic/*.gf lib/logic/
-
-cp -p newnumerals/README lib/numerals/
-cp -p newnumerals/*.gf lib/numerals/
-cp -p newnumerals/mkNumerals.gfs lib/numerals/
-
-cp -p prelude/README lib/prelude/
-cp -p prelude/*.gf lib/prelude/
-
-cp -p newresource/mkTest.gfs lib/resource/
-cp -p newresource/mkParadigms.gfs lib/resource/
-cp -p newresource/README lib/resource/
-cp -p newresource/Makefile lib/resource/
-cp -p newresource/index.html lib/resource/
-cp -p newresource/abstract/*.gf lib/resource/abstract/
-cp -p newresource/english/*.gf lib/resource/english/
-cp -p newresource/finnish/*.gf lib/resource/finnish/
-cp -p newresource/french/*.gf lib/resource/french/
-cp -p newresource/german/*.gf lib/resource/german/
-cp -p newresource/italian/*.gf lib/resource/italian/
-cp -p newresource/romance/*.gf lib/resource/romance/
-cp -p newresource/russian/*.gf lib/resource/russian/
-cp -p newresource/swedish/*.gf lib/resource/swedish/
-cp -p newresource/doc/*.html lib/resource/doc/
-
-cp -p database/README lib/database/
-cp -p database/*.gf lib/database/
-
-mv lib ..
+source mkDistr.sh
+cp -r grammars lib
+tar cvfz gf-lib.tgz lib
diff --git a/src/Makefile b/src/Makefile
index cb7593c55..1278bc8db 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -125,7 +125,7 @@ lib:
 dist:
 	-rm -rf $(DIST_DIR)
 	mkdir $(DIST_DIR)
-	cvs export -d $(DIST_DIR) -rHEAD GF2.0
+	cvs export -d $(DIST_DIR) -rHEAD GF2.1
 	cd $(DIST_DIR)/src && autoconf && rm -rf autom4te.cache
 	find $(DIST_DIR) -name .cvsignore -exec rm -f {} ';'
 	cd $(DIST_DIR)/grammars && sh mkLib.sh