[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Axiom-developer] paths to viewport in build-improvements
From: |
Waldek Hebisch |
Subject: |
Re: [Axiom-developer] paths to viewport in build-improvements |
Date: |
Sat, 28 Oct 2006 17:54:56 +0200 (CEST) |
Gabriel Dos Reis wrote:
> Please add in the main pamphlet file, an explanation of why we need
> the sed transformation. Some along the line of
>
<snip>
> Please expand as necessary, but we do need an explanation of why we
> are doing that.
>
>
> | diff -ru build-improvements.bb/src/hyper/Makefile.in
> build-improvements/src/hyper/Makefile.in
> | --- build-improvements.bb/src/hyper/Makefile.in 2006-10-27
> 23:37:14.000000000 +0200
> | +++ build-improvements/src/hyper/Makefile.in 2006-10-28
> 04:40:19.000000000 +0200
> | @@ -162,7 +162,11 @@
> | @echo making ${HYPER}/pages from $(axiom_src_srcdir)/pages directory
> | @ mkdir -p ${HYPER}/pages
> | @ cp -pr $(srcdir)/pages/*.ht ${HYPER}/pages
> | - @ cp -pr $(srcdir)/pages/*.pht ${HYPER}/pages
> | + @ (cd $(srcdir)/pages/ ; \
> | + for A in *.pht; do \
>
> For portability, please write the above as
>
> for A in `ls *.pht`; do \
I am not sure why extra ls in backtics is more portable, but did that.
New patch below:
diff -ru build-improvements.bb/src/hyper/ChangeLog.build-improvements
build-improvements/src/hyper/ChangeLog.build-improvements
--- build-improvements.bb/src/hyper/ChangeLog.build-improvements
2006-10-28 17:41:18.000000000 +0200
+++ build-improvements/src/hyper/ChangeLog.build-improvements 2006-10-28
17:51:48.000000000 +0200
@@ -1,5 +1,11 @@
2006-10-28 Waldek Hebisch <address@hidden>
+ * Makefile.pamphlet (${HYPER}/pages/ht.db): correct paths to
+ viewports in installed .pht pages
+ * Makefile.in: Regenerate
+
+2006-10-28 Waldek Hebisch <address@hidden>
+
* viewport/*/* : Backport form trunk (135:137). remove
svn:keywords and svn:eol-style properties. Set svn:mime-type
on *.Z files to application/octet-stream. Copy correct .Z
diff -ru build-improvements.bb/src/hyper/Makefile.in
build-improvements/src/hyper/Makefile.in
--- build-improvements.bb/src/hyper/Makefile.in 2006-10-28 17:41:17.000000000
+0200
+++ build-improvements/src/hyper/Makefile.in 2006-10-28 17:51:48.000000000
+0200
@@ -162,7 +162,11 @@
@echo making ${HYPER}/pages from $(axiom_src_srcdir)/pages directory
@ mkdir -p ${HYPER}/pages
@ cp -pr $(srcdir)/pages/*.ht ${HYPER}/pages
- @ cp -pr $(srcdir)/pages/*.pht ${HYPER}/pages
+ @ (cd $(srcdir)/pages/ ; \
+ for A in `ls *.pht`; do \
+ sed 's,/doc/viewports/,/share/viewports/,g' $$A \
+ > ${HYPER}/pages/$$A; \
+ done )
@ (cd ${HYPER}/pages ; \
rm -f ht.db ; \
rm -f *~ ; \
diff -ru build-improvements.bb/src/hyper/Makefile.pamphlet
build-improvements/src/hyper/Makefile.pamphlet
--- build-improvements.bb/src/hyper/Makefile.pamphlet 2006-10-28
17:41:18.000000000 +0200
+++ build-improvements/src/hyper/Makefile.pamphlet 2006-10-28
17:51:48.000000000 +0200
@@ -241,6 +241,29 @@
@
\section{pages}
+
+The [[.pht]] files contain hardcoded pathnames to viewport directiries
+in the installed system. Of course, that is asking for trouble. During
+installation, we must change those paths to reflect the correct
+location of the viewports. That necessary step is implemented
+as:
+\begin{verbatim}
+ for A in `ls *.pht`; do \
+ sed 's,/doc/viewports/,/share/viewports/,g' $$A \
+ > ${HYPER}/pages/$$A; \
+ done
+\end{verbatim}
+
+In the long term, the [[.pht]] and viewports should be generated at either
+build time or installation time using commands like:
+\begin{verbatim}
+ rm -f ht.db
+ ${HTADD} *.ht
+ for A in `ls *.ht`; do ${SMAN} -paste $$a ; done
+ rm -f ht.db
+ ${HTADD} *.ht *.pht
+\end{verbatim}
+
We need to make sure that [[ht.db]], the hypertex database file
is up to date. The file contains absolute offsets into the various
[[ht]] and [[pht]] files so it must reflect the current pages. In
@@ -250,7 +273,11 @@
@echo making ${HYPER}/pages from $(axiom_src_srcdir)/pages directory
@ mkdir -p ${HYPER}/pages
@ cp -pr $(srcdir)/pages/*.ht ${HYPER}/pages
- @ cp -pr $(srcdir)/pages/*.pht ${HYPER}/pages
+ @ (cd $(srcdir)/pages/ ; \
+ for A in `ls *.pht`; do \
+ sed 's,/doc/viewports/,/share/viewports/,g' $$A \
+ > ${HYPER}/pages/$$A; \
+ done )
@ (cd ${HYPER}/pages ; \
rm -f ht.db ; \
rm -f *~ ; \
--
Waldek Hebisch
address@hidden
Re: [Axiom-developer] paths to viewport in build-improvements, root, 2006/10/27