[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Axiom-developer] Hypertex and constructors
From: |
Waldek Hebisch |
Subject: |
Re: [Axiom-developer] Hypertex and constructors |
Date: |
Wed, 25 Oct 2006 19:03:23 +0200 (CEST) |
Gabriel Dos Reis wrote:
> Waldek Hebisch <address@hidden> writes:
>
> | As few people noticed hypertex searches for constructors where
> | giving no result, for example clicking on "NAG link" and then
> | on "Browser pages for individual routines" gives:
> |
> | There is no constructor matching pattern "Nag*"
> |
> | AFAICS it is due to fake 'libdb.text' which is copied from
> | 'src/algebra' into target algebra directory. If one instead
> | uses freshly build 'libdb.text' then hypertex is able to
> | find Nag routines. BTW I also copied freshly build 'comdb.text'
> | to the target algebra directory, since apparently 'libdb.text'
> | contains references to 'comdb.text' but I am not sure is
> | 'comdb.text' is actually used (I was able to find Nag routines
> | both with and without 'comdb.text').
>
> Kudos for your detective work.
>
> >From my perspective, in the majority of cases it is WRONG for Axiom to
> ever cache things and copy them directly to installation. We should
> be installing info about things we have built, not things that were
> built somewhere else and cached.
>
> Erring on the conservative side, I would be glad to review a patch that
> copy both libdb.text and comdb.text freshly built. The cached files
> should go away.
>
The following patch builds with build-improvements, and allows browsing
constructors. The 'src/share/doc/hypertex/pages/util.ht' hunk is so that
I could test the patch (that is start the browser). The
'src/hyper/htinp.pamphlet' hunk adjusts paths in generated pages.
With the patch it is possible to remove 'src/algebra/libdb.text'.
Even without the patch it is possible to remove 'src/share/algebra/libdb.text'
and 'src/share/algebra/comdb.text' (both are unused).
diff -ru build-improvements.bb/src/algebra/Makefile.in
build-improvements.n2/src/algebra/Makefile.in
--- build-improvements.bb/src/algebra/Makefile.in 2006-10-25
14:10:18.000000000 +0200
+++ build-improvements.n2/src/algebra/Makefile.in 2006-10-25
15:56:16.000000000 +0200
@@ -753,7 +753,7 @@
all: all-ax
-all-ax: $(OUTSRC) $(MID) src ${OUT}/libdb.text ${TESTS}
+all-ax: $(OUTSRC) $(MID) src ${TESTS}
@ echo 4302 finished $(builddir)
-rm -f stamp
$(STAMP) stamp
@@ -845,10 +845,6 @@
${INPUT}/VIEW2D.input: $(srcdir)/view2D.spad.pamphlet
$(axiom_build_document) --tangle='TEST VIEW2D' --output=$@ $<
-${OUT}/libdb.text: $(srcdir)/libdb.text
- @ echo 4300a copying $< to $@
- $(INSTALL_DATA) $< $@
-
${DOC}/diagrams.tex: ${SRC}/doc/diagrams.tex
@ echo 4300b making ${DOC}/diagrams from ${SRC}/doc/diagrams.tex
diff -ru build-improvements.bb/src/algebra/Makefile.pamphlet
build-improvements.n2/src/algebra/Makefile.pamphlet
--- build-improvements.bb/src/algebra/Makefile.pamphlet 2006-10-25
14:10:18.000000000 +0200
+++ build-improvements.n2/src/algebra/Makefile.pamphlet 2006-10-25
15:56:16.000000000 +0200
@@ -1698,12 +1698,6 @@
<<genericDOCfiles>>
@
-<<libdb.text (OUT from IN)>>=
-${OUT}/libdb.text: $(srcdir)/libdb.text
- @ echo 4300a copying $< to $@
- $(INSTALL_DATA) $< $@
-
-@
<<diagrams.tex (OUT from IN)>>=
${DOC}/diagrams.tex: ${SRC}/doc/diagrams.tex
@@ -2041,7 +2035,7 @@
all: all-ax
-all-ax: $(OUTSRC) $(MID) src ${OUT}/libdb.text ${TESTS}
+all-ax: $(OUTSRC) $(MID) src ${TESTS}
@ echo 4302 finished $(builddir)
-rm -f stamp
$(STAMP) stamp
@@ -2063,7 +2057,6 @@
<<genericRules>>
<<testrules>>
-<<libdb.text (OUT from IN)>>
<<diagrams.tex (OUT from IN)>>
<<stages>>
diff -ru build-improvements.bb/src/etc/Makefile.in
build-improvements.n2/src/etc/Makefile.in
--- build-improvements.bb/src/etc/Makefile.in 2006-10-25 14:10:22.000000000
+0200
+++ build-improvements.n2/src/etc/Makefile.in 2006-10-25 15:56:23.000000000
+0200
@@ -27,6 +27,8 @@
@ (cd ${INT}/algebra ; \
echo ')lisp (make-databases "" nil)' | ${INTERPSYS} )
@ $(INSTALL_DATA) ${INT}/algebra/*.daase $(axiom_targetdir)/algebra
+ @ $(INSTALL_DATA) ${INT}/algebra/libdb.text $(axiom_targetdir)/algebra
+ @ $(INSTALL_DATA) ${INT}/algebra/comdb.text $(axiom_targetdir)/algebra
$(axiom_target_bindir)/asq: ${MID}/asq.c
@echo 4 making $(axiom_target_bindir)/asq from ${MID}/asq.c
diff -ru build-improvements.bb/src/etc/Makefile.pamphlet
build-improvements.n2/src/etc/Makefile.pamphlet
--- build-improvements.bb/src/etc/Makefile.pamphlet 2006-10-25
14:10:22.000000000 +0200
+++ build-improvements.n2/src/etc/Makefile.pamphlet 2006-10-25
15:56:23.000000000 +0200
@@ -35,6 +35,8 @@
@ (cd ${INT}/algebra ; \
echo ')lisp (make-databases "" nil)' | ${INTERPSYS} )
@ $(INSTALL_DATA) ${INT}/algebra/*.daase $(axiom_targetdir)/algebra
+ @ $(INSTALL_DATA) ${INT}/algebra/libdb.text $(axiom_targetdir)/algebra
+ @ $(INSTALL_DATA) ${INT}/algebra/comdb.text $(axiom_targetdir)/algebra
@
\section{summary}
diff -ru build-improvements.bb/src/hyper/htinp.pamphlet
build-improvements.n2/src/hyper/htinp.pamphlet
--- build-improvements.bb/src/hyper/htinp.pamphlet 2006-10-25
14:10:16.000000000 +0200
+++ build-improvements.n2/src/hyper/htinp.pamphlet 2006-10-25
15:56:15.000000000 +0200
@@ -545,7 +545,7 @@
fprintf(pfile, "\\tab{5}\\spadgraph{");
print_paste_line(pfile, command);
fprintf(pfile, "}\n");
- fprintf(pfile,
"\\center{\\unixcommand{\\inputimage{\\env{AXIOM}/doc/viewports/%s%d.VIEW/image}}{viewAlone\\space{1}
\\env{AXIOM}/doc/viewports/%s%d}}\n", pagename, example_number, pagename,
example_number);
+ fprintf(pfile,
"\\center{\\unixcommand{\\inputimage{\\env{AXIOM}/share/viewports/%s%d.VIEW/image}}{viewAlone\\space{1}
\\env{AXIOM}/share/viewports/%s%d}}\n", pagename, example_number, pagename,
example_number);
get_graph_output(realcom, pagename, com_type);
fprintf(pfile, "\\end{paste}\\end{patch}\n\n");
Tylko w build-improvements.bb/src/share/algebra: comdb.text
Tylko w build-improvements.bb/src/share/algebra: libdb.text
diff -ru build-improvements.bb/src/share/doc/hypertex/pages/util.ht
build-improvements.n2/src/share/doc/hypertex/pages/util.ht
--- build-improvements.bb/src/share/doc/hypertex/pages/util.ht 2006-10-25
14:10:21.000000000 +0200
+++ build-improvements.n2/src/share/doc/hypertex/pages/util.ht 2006-10-25
15:56:19.000000000 +0200
@@ -135,7 +135,7 @@
% 5. Bitmaps and bitmap manipulation macros.
% ----------------------------------------------------------------------
-\newcommand{\htbmdir}{\env{AXIOM}/../../share/doc/hypertex/bitmaps}
+\newcommand{\htbmdir}{\env{AXIOM}/share/hypertex/bitmaps}
\newcommand{\htbmfile}[1]{\htbmdir /#1.bitmap}
\newcommand{\htbitmap}[1]{\inputbitmap{\htbmfile{#1}}}
\newcommand{\ControlBitmap}[1]{\controlbitmap{\htbmfile{#1}}}
@@ -153,7 +153,7 @@
% Including control panel pixmaps for help pages:
-\newcommand{\helpbit}[1]{\centerline{\inputpixmap{\env{AXIOM}/../../share/doc/hypertex/pixmaps/{#1}}}}
+\newcommand{\helpbit}[1]{\centerline{\inputpixmap{\env{AXIOM}/share/hypertex/pixmaps/{#1}}}}
% ----------------------------------------------------------------------
% 6. HyperDoc button objects.
@@ -194,19 +194,19 @@
% Including viewport bitmaps within \HyperName pages:
\newcommand{\viewport}[1]{\inputimage{{#1}.VIEW/image}}
-\newcommand{\axiomViewport}[1]{\inputimage{\env{AXIOM}/../../share/doc/viewports/{#1}.VIEW/image}}
+\newcommand{\axiomViewport}[1]{\inputimage{\env{AXIOM}/share/viewports/{#1}.VIEW/image}}
\newcommand{\spadviewport}[1]{\axiomViewport{#1}}
% Creating a real live viewport:
\newcommand{\viewportbutton}[2]{\unixcommand{#1}{viewAlone #2}}
-\newcommand{\axiomViewportbutton}[2]{\unixcommand{#1}{viewAlone
\$AXIOM/../../share/doc/viewports/{#2}}}
+\newcommand{\axiomViewportbutton}[2]{\unixcommand{#1}{viewAlone
\$AXIOM/share/viewports/{#2}}}
\newcommand{\spadviewportbutton}[2]{\axiomViewportbutton{#1}{#2}}
% Making active viewport buttons:
\newcommand{\viewportasbutton}[1]{\unixcommand{\inputimage{{#1}.VIEW/image}}{viewAlone
{#1}}}
-\newcommand{\axiomViewportasbutton}[1]{\unixcommand{\inputimage{\env{AXIOM}/../../share/doc/viewports/{#1}.VIEW/image}}{viewAlone
\$AXIOM/../../share/doc/viewports/{#1}}}
+\newcommand{\axiomViewportasbutton}[1]{\unixcommand{\inputimage{\env{AXIOM}/share/viewports/{#1}.VIEW/image}}{viewAlone
\$AXIOM/share/viewports/{#1}}}
\newcommand{\spadviewportasbutton}[1]{\axiomViewportasbutton{#1}}
% ----------------------------------------------------------------------
--
Waldek Hebisch
address@hidden
- [Axiom-developer] Hypertex and constructors, Waldek Hebisch, 2006/10/24
- Re: [Axiom-developer] Hypertex and constructors, Gabriel Dos Reis, 2006/10/24
- Re: [Axiom-developer] Hypertex and constructors,
Waldek Hebisch <=
- Re: [Axiom-developer] Hypertex and constructors, Gabriel Dos Reis, 2006/10/25
- Re: [Axiom-developer] Hypertex and constructors, Waldek Hebisch, 2006/10/25
- Re: [Axiom-developer] Hypertex and constructors, Gabriel Dos Reis, 2006/10/25
- Re: [Axiom-developer] Hypertex and constructors, Waldek Hebisch, 2006/10/25
- Re: [Axiom-developer] Hypertex and constructors, Waldek Hebisch, 2006/10/25
- Re: [Axiom-developer] Hypertex and constructors, Gabriel Dos Reis, 2006/10/25
- Re: [Axiom-developer] Hypertex and constructors, root, 2006/10/25
- Re: [Axiom-developer] Hypertex and constructors, Waldek Hebisch, 2006/10/25