Fix SF/2781848

	* interp/daase.lisp (make-databases): Build glossary files too.
	* interp/br-data.boot (buildGloss): gloss.text now lives in doc/.
	* interp/br-search.boot (grepSource): Likewise.
	* interp/ht-root.boot (htGlossPage): Likewise.
	* etc/Makefile.in (openaxiom_glossfiles): New.
	(mostlyclean-local): Remove them too.
	(stamp-databases): Now copy glossary files too.
	* doc/Makefile.in ($(OUT)/gloss.text): New rule.
	(stamp): Make it a prerequisite.
	* Makefile.pamphlet (all-databases): Make all-doc a prerequisite.
	(all-hyper-post): Likewise.
	* doc/gloss.text: Resurect.

10 files changed, 43 insertions, 15 deletions

diff --git a/TODO b/TODO
index a44f23d4..81456d39 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,7 @@
 === TODO ===
 ============
 
+* Improve efficiency of array operations.
 * Rework subsumption.
 * Finish network communication support.
 * Finish Bemol backend.
diff --git a/src/ChangeLog b/src/ChangeLog
index b236b0f8..80552226 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,21 @@
 2009-04-26  Gabriel Dos Reis  <gdr@cs.tamu.edu>>
 
+	Fix SF/2781848
+	* interp/daase.lisp (make-databases): Build glossary files too.
+	* interp/br-data.boot (buildGloss): gloss.text now lives in doc/.
+	* interp/br-search.boot (grepSource): Likewise.
+	* interp/ht-root.boot (htGlossPage): Likewise.
+	* etc/Makefile.in (openaxiom_glossfiles): New.
+	(mostlyclean-local): Remove them too.
+	(stamp-databases): Now copy glossary files too.
+	* doc/Makefile.in ($(OUT)/gloss.text): New rule.
+	(stamp): Make it a prerequisite.
+	* Makefile.pamphlet (all-databases): Make all-doc a prerequisite.
+	(all-hyper-post): Likewise.
+	* doc/gloss.text: Resurect.
+
+2009-04-26  Gabriel Dos Reis  <gdr@cs.tamu.edu>>
+
 	* interp/sys-macros.lisp (makeSimpleArrayFromList): New.
 	* algebra/array1.spad.pamphlet (construct$PrimitiveArray): Implement.
 	(copy$PrimitiveArray): Likewise.
diff --git a/src/Makefile.in b/src/Makefile.in
index 825c0b29..f65eb8b8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -58,10 +58,10 @@ all-asq: all-hyper-post
 	cd etc && $(MAKE) $@
 
 .PHONY: all-databases
-all-databases:  all-interpsys
+all-databases:  all-interpsys all-doc
 	cd etc && $(MAKE) $@
 
-all-hyper-post: all-algebra
+all-hyper-post: all-algebra  all-doc
 	cd hyper && $(MAKE) all-hyper-post
 all-graph: all-lib
 	cd graph && $(MAKE) $@
diff --git a/src/Makefile.pamphlet b/src/Makefile.pamphlet
index 296d3608..d3a90eb9 100644
--- a/src/Makefile.pamphlet
+++ b/src/Makefile.pamphlet
@@ -215,10 +215,10 @@ all-asq: all-hyper-post
 	cd etc && $(MAKE) $@
 
 .PHONY: all-databases
-all-databases:  all-interpsys
+all-databases:  all-interpsys all-doc
 	cd etc && $(MAKE) $@
 
-all-hyper-post: all-algebra
+all-hyper-post: all-algebra  all-doc
 	cd hyper && $(MAKE) all-hyper-post
 @
 
diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
index 31b56941..e5af57bb 100644
--- a/src/doc/Makefile.in
+++ b/src/doc/Makefile.in
@@ -49,7 +49,11 @@ all-ax all-doc: stamp
 $(OUT)/help/%.help: $(IN)/help/%.help
 	cp -p $< $@
 
-stamp:  $(patsubst $(IN)/help/%.help,$(OUT)/help/%.help,$(HELPFILES))
+$(OUT)/gloss.text: $(IN)/gloss.text
+	cp -p $< $@
+
+stamp:  $(patsubst $(IN)/help/%.help,$(OUT)/help/%.help,$(HELPFILES)) \
+		$(OUT)/gloss.text
 	-rm -f stamp
 	$(STAMP) stamp
 
diff --git a/src/etc/Makefile.in b/src/etc/Makefile.in
index 3bf2886f..efeed334 100644
--- a/src/etc/Makefile.in
+++ b/src/etc/Makefile.in
@@ -39,6 +39,10 @@ openaxiom_databases = \
 		operation.daase libdb.text comb.text \
 		USERS.DAASE/index.KAF  DEPENDENTS.DAASE/index.KAF)
 
+openaxiom_glossfiles = \
+	$(addprefix $(axiom_targetdir)/algebra/, \
+		glosskey.text gloss.ht glossdef.text)
+
 subdir = src/etc/
 
 pamphlets = Makefile.pamphlet $(asq_SOURCES)
@@ -65,7 +69,7 @@ stamp: stamp-databases $(axiom_target_bindir)/asq$(EXEEXT) \
 .PHONY: all-databases
 all-databases:  stamp-databases
 
-stamp-databases: ../algebra/*.NRLIB/code.$(FASLEXT)
+stamp-databases: ../algebra/*.NRLIB/code.$(FASLEXT) ../doc/gloss.text
 	@ echo rebuilding databases...
 	rm -f stamp-databases
 	rm -f ../algebra/topics.data
@@ -85,6 +89,8 @@ stamp-databases: ../algebra/*.NRLIB/code.$(FASLEXT)
 	mkdir -p $(axiom_targetdir)/algebra/DEPENDENTS.DAASE
 	cp -p ../algebra/DEPENDENTS.DAASE/index.KAF \
 		$(axiom_targetdir)/algebra/DEPENDENTS.DAASE
+	cp -p ../algebra/glosskey.text $(axiom_target_docdir)
+	cp -p ../algebra/glossdef.text $(axiom_target_docdir)
 
 bin_PROGRAMS = asq$(EXEEXT)
 asq_sources = asq.c
@@ -106,10 +112,13 @@ $(axiom_target_libdir)/summary: $(srcdir)/summary
 $(axiom_target_libdir)/copyright: $(srcdir)/copyright
 	cp -p $< $@ 
 
+../doc/gloss.text: $(axiom_src_docdir)/gloss.text
+	cp $< cp $@
 
 mostlyclean-local:
 	rm -f $(asq_sources) $(asq_objects)
 	rm -f $(openaxiom_databases)
+	rm -f $(openaxiom_glossfiles)
 	rm -f stamp
 
 clean-local: mostlyclean-local
diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot
index 1fe1de2b..6f1cd1fc 100644
--- a/src/interp/br-data.boot
+++ b/src/interp/br-data.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -328,7 +328,7 @@ buildGloss() ==  --called by buildDatabase (database.boot)
   $outStream: local := MAKE_-OUTSTREAM '"temp.text"
   $x : local := nil
   $attribute? : local := true     --do not surround first word
-  pathname := STRCONC(systemRootDirectory(),'"/algebra/gloss.text")
+  pathname := STRCONC(systemRootDirectory(),'"doc/gloss.text")
   instream := MAKE_-INSTREAM pathname
   keypath  := '"glosskey.text"
   removeFile keypath
diff --git a/src/interp/br-search.boot b/src/interp/br-search.boot
index 45e833fb..4890e4ba 100644
--- a/src/interp/br-search.boot
+++ b/src/interp/br-search.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -952,7 +952,7 @@ dbGetCommentOrigin line ==
 
 grepSource key ==
   key = 'libdb   => STRCONC(systemRootDirectory(),'"/algebra/libdb.text")
-  key = 'gloss   => STRCONC(systemRootDirectory(),'"/algebra/glosskey.text")
+  key = 'gloss   => STRCONC(systemRootDirectory(),'"doc/glosskey.text")
   key = $localLibdb => $localLibdb
   mkGrepTextfile
     MEMQ(key, '(_. a c d k o p x)) => 'libdb
diff --git a/src/interp/daase.lisp b/src/interp/daase.lisp
index 29cbf446..e4193d52 100644
--- a/src/interp/daase.lisp
+++ b/src/interp/daase.lisp
@@ -1326,7 +1326,7 @@
   (|saveUsersHashTable|)
   (|mkDependentsHashTable|)
   (|saveDependentsHashTable|)
-; (|buildGloss|)
+  (|buildGloss|)
   (write-compress)
   (write-browsedb)
   (write-operationdb)
diff --git a/src/interp/ht-root.boot b/src/interp/ht-root.boot
index 7307caa6..49277330 100644
--- a/src/interp/ht-root.boot
+++ b/src/interp/ht-root.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -146,9 +146,7 @@ htGlossPage(htPage,pattern,tryAgain?) ==
   grepForm := mkGrepPattern(filter,'none)
   $key: local := 'none
   results := applyGrep(grepForm,'gloss)
-  --pathname := STRCONC('"/tmp/",PNAME resultFile,'".text.", getEnv '"SPADNUM")
-  --instream := MAKE_-INSTREAM pathname
-  defstream := MAKE_-INSTREAM STRCONC(systemRootDirectory(),'"/algebra/glossdef.text")
+  defstream := MAKE_-INSTREAM STRCONC(systemRootDirectory(),'"doc/glossdef.text")
   lines := gatherGlossLines(results,defstream)
   -- removeFile pathname 
   --SHUT instream