diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-04-27 04:16:39 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-04-27 04:16:39 +0000 |
| commit | 2eb54b1ef835e793963fce4138cc1d78e4f4883b (patch) | |
| tree | 8e8b364dc44fb618f5973a710a0fa215867d3c48 /src/interp | |
| parent | a6b14a62e4c347c6459d7aee6590581aff17f001 (diff) | |
| download | open-axiom-2eb54b1ef835e793963fce4138cc1d78e4f4883b.tar.gz | |
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.
Diffstat (limited to 'src/interp')
| -rw-r--r-- | src/interp/br-data.boot | 4 | ||||
| -rw-r--r-- | src/interp/br-search.boot | 4 | ||||
| -rw-r--r-- | src/interp/daase.lisp | 2 | ||||
| -rw-r--r-- | src/interp/ht-root.boot | 6 |
4 files changed, 7 insertions, 9 deletions
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 |