[tex4ht-commits] [SCM] tex4ht updated: r725 - trunk/lit
karl at gnu.org.ua
karl at gnu.org.ua
Fri Jun 5 19:55:02 CEST 2020
Author: karl
Date: 2020-06-05 20:55:02 +0300 (Fri, 05 Jun 2020)
New Revision: 725
Added:
trunk/lit/Makefile.exp
Modified:
trunk/lit/ChangeLog
trunk/lit/Makefile
trunk/lit/tex4ht-docbook-xtpipes.tex
trunk/lit/tex4ht-html-speech-xtpipes.tex
trunk/lit/tex4ht-javahelp-xtpipes.tex
trunk/lit/tex4ht-jsml-xtpipes.tex
trunk/lit/tex4ht-oo-xtpipes.tex
trunk/lit/tex4ht-xhtml-xtpipes.tex
trunk/lit/tex4ht-xhtmml-xtpipes.tex
trunk/lit/xtpipes.tex
Log:
use paths from tex4ht-dir.tex instead of hardwiring; from Vincent
Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog 2020-06-05 17:34:50 UTC (rev 724)
+++ trunk/lit/ChangeLog 2020-06-05 17:55:02 UTC (rev 725)
@@ -1,3 +1,25 @@
+2020-06-05 Karl Berry <karl at freefriends.org>
+
+ * Makefile (do_java): conditional to enable Java derivations
+ and compilations.
+ * Makefile.exp: move "experimental section" to here from Makefile.
+
+2020-06-05 Vincent Bela\"iche <vincent.belaiche at gmail.com>
+
+ * tex4ht-docbook-xtpipes.tex,
+ * tex4ht-javahelp-xtpipes.tex,
+ * tex4ht-jsml-xtpipes.tex,
+ * tex4ht-oo-xtpipes.tex,
+ * tex4ht-xhtml-xtpipes.tex,
+ * tex4ht-xhtmml-xtpipes.tex: Replace absolute paths by macros
+ from tex4ht-dir.tex.
+
+ * tex4ht-html-speech-xtpipes.tex: Likewise replace absolute paths,
+ and ensure directory \TEXMFTEXivBIN exists.
+
+ * xtpipes.tex: Likewise replace absolute paths, and
+ change system calls so that javac input files are streamed from find.
+
2020-06-04 Michal Hoftich <michal.h21 at gmail.com>
* tex4ht-fonts-modern.tex: removed lot of duplicated .htf entries.
@@ -38,7 +60,7 @@
* tex4ht-4ht.tex (latex.4ht): fixed bug in tabbing environment.
https://tug.org/pipermail/tex4ht/2020q2/002565.html
-
+
2020-05-31 Vincent_Bela\"iche <vincent.belaiche at gmail.com>
* tex4ht-dir.m4: new file, used to generate with m4:
Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile 2020-06-05 17:34:50 UTC (rev 724)
+++ trunk/lit/Makefile 2020-06-05 17:55:02 UTC (rev 725)
@@ -2,9 +2,10 @@
# This file is public domain. Originally written 2010, Karl Berry.
# Assumes GNU make.
-# todo: look for xx below
+# todo: look for xx below, among much more.
SHELL = /bin/sh
+
extra_bin = ./extra-bin
ht_bin = ../bin/ht/unix
PATH := $(shell echo $$PATH)
@@ -21,6 +22,9 @@
# List of directories we'll substitute into tex4ht-dir.tex below:
dirs = homedir wd htmldir xtpipesdir deriveddir texmf_t4ht_bin
+# Uncomment to enable Java compilations:
+#do_java = 1
+
tex_opts = --interaction=nonstopmode -recorder #--file-line-error
tex_1opt = "$(tex_opts)" # must be quoted, passing to shell script
dev_null = </dev/null # when we don't call tex directly.
@@ -85,8 +89,10 @@
derived += $(tex4ht_docbook_derived)
tex4ht_docbook_derived = docbook.4ht docbook-math.4ht docbook-mml.4ht
+ifdef do_java
derived += $(tex4ht_docbook_xtpipes_derived)
-tex4ht_docbook_xtpipes_derived = #docbook.4xt $(wd)/src/DbUtilities.java
+tex4ht_docbook_xtpipes_derived = docbook.4xt $(wd)/src/DbUtilities.java
+endif
derived += $(tex4ht_env_derived)
tex4ht_env_derived = tex4ht.env-unix tex4ht.env-win32 tex4ht.env
@@ -159,8 +165,10 @@
derived += $(tex4ht_html_speech_derived)
tex4ht_html_speech_derived = html-speech.4ht html-speech-math.4ht emacspeak.4ht
+ifdef do_java
derived += $(tex4ht_html_speech_xtpipes_derived)
-tex4ht_html_speech_xtpipes_derived = #jhtspk.4xt $(wd)/src/HtSpk.java
+tex4ht_html_speech_xtpipes_derived = htspk.4xt $(wd)/src/HtSpk.java
+endif
derived += $(tex4ht_html0_derived)
tex4ht_html0_derived = html0.4ht
@@ -196,16 +204,20 @@
derived += $(tex4ht_javahelp_derived)
tex4ht_javahelp_derived = javahelp.4ht javahelp-a.4ht
+ifdef do_java
derived += $(tex4ht_javahelp_xtpipes_derived)
-tex4ht_javahelp_xtpipes_derived = #jjavahelp.4xt
+tex4ht_javahelp_xtpipes_derived = javahelp.4xt
+endif
derived += $(tex4ht_jsmath_derived)
tex4ht_jsmath_derived = jsmath.4ht html-jsmath.4ht
-#jderived += $(tex4ht_jsml_xtpipes_derived)
-#jtex4ht_jsml_xtpipes_derived = \
-#j jsml.4xt \
-#j $(addprefix $(wd)/src/,HtJsml.java GroupMn.java JsmlFilter.java JsmlMathBreak.java)
+ifdef do_java
+derived += $(tex4ht_jsml_xtpipes_derived)
+tex4ht_jsml_xtpipes_derived = \
+ jsml.4xt \
+ $(addprefix $(wd)/src/,HtJsml.java GroupMn.java JsmlFilter.java JsmlMathBreak.java)
+endif
derived += $(tex4ht_jsml_derived)
tex4ht_jsml_derived = jsml.4ht jsml-math.4ht
@@ -228,10 +240,12 @@
derived += $(tex4ht_html5_derived)
tex4ht_html5_derived = html5.4ht
+ifdef do_java
derived += $(tex4ht_oo_xtpipes_derived)
-#jtex4ht_oo_xtpipes_derived = \
-#j oo-math.4xt oo-text.4xt \
-#j $(addprefix $(wd)/src/,OoUtilities.java OomFilter.java OoFilter.java)
+tex4ht_oo_xtpipes_derived = \
+ oo-math.4xt oo-text.4xt \
+ $(addprefix $(wd)/src/,OoUtilities.java OomFilter.java OoFilter.java)
+endif
derived += $(tex4ht_ooffice_derived)
tex4ht_ooffice_derived = ooffice.4ht ooffice-mml.4ht
@@ -263,18 +277,23 @@
derived += $(tex4ht_word_derived)
tex4ht_word_derived = htmlw.4ht
+ifdef do_java
derived += $(tex4ht_xhtml_xtpipes_derived)
-tex4ht_xhtml_xtpipes_derived = #jxhtml.4xt $(wd)/src/XhtmlEmails.java
+tex4ht_xhtml_xtpipes_derived = xhtml.4xt $(wd)/src/XhtmlEmails.java
+endif
+ifdef do_java
derived += $(tex4ht_xhtmml_xtpipes_derived)
-tex4ht_xhtmml_xtpipes_derived = #jxhtmml.4xt $(wd)/src/XhtmmlUtilities.java
+tex4ht_xhtmml_xtpipes_derived = xhtmml.4xt $(wd)/src/XhtmmlUtilities.java
+endif
derived += $(tex4ht_mathjax_derived)
tex4ht_mathjax_derived = mathjax-latex-4ht.4ht
# wripro.tex generates nothing (not literate).
-#jderived += $(xtpipes_derived)
+ifdef do_java
+derived += $(xtpipes_derived)
xtpipes_derived = \
$(addprefix $(wd)/src/, \
xtpipes.java \
@@ -288,6 +307,8 @@
xtpipes-default.4xt \
xtpipes-map.dtd \
xtpipes.dtd \
+ #
+endif
#
all: $(derived)
@@ -573,6 +594,7 @@
#
# Java.
+ifdef do_java
$(wd)/bin/xtpipes.jar: $(xtpipes_derived)
mkdir -p $(xtpipesdir)
find $(wd)/src -iname '*.java' -print0 \
@@ -596,6 +618,7 @@
mkdir -p $(dir $@)
cd $(xtpipesdir) && jar cf $(notdir $@) *
mv $(xtpipesdir)/$(notdir $@) $(dir $@)
+endif
#
# painful, so let's write out the commands. --20mar17
@@ -647,108 +670,3 @@
mostlyclean:
rm -f $(derived)
-
-#
-# ** experimental section **
-# post 'make all' actions
-sources = \
- tex4ht-cond4ht.tex\
- tex4ht-4ht.tex\
- tex4ht-info-html4.tex\
- tex4ht-info-javahelp.tex\
- tex4ht-info-mml.tex\
- tex4ht-info-ooffice.tex\
- tex4ht-info-svg.tex\
- tex4ht-c.tex\
- tex4ht-t4ht.tex\
- tex4ht-docbook.tex\
- tex4ht-bibtex2.tex\
- tex4ht-env.tex\
- tex4ht-fonts-cjk.tex\
- tex4ht-fonts-cjk-utf8.tex\
- tex4ht-fonts-noncjk.tex\
- tex4ht-fonts-4hf.tex \
- tex4ht-fonts-ebgaramond.tex \
- tex4ht-fonts-libertine.tex \
- tex4ht-unicode.tex\
- tex4ht-html-speech.tex\
- tex4ht-html0.tex\
- tex4ht-html32.tex\
- tex4ht-html4.tex\
- tex4ht-javahelp.tex\
- tex4ht-jsmath.tex\
- tex4ht-jsml.tex\
- tex4ht-mathltx.tex\
- tex4ht-mathml.tex\
- tex4ht-mathplayer.tex\
- tex4ht-mkht.tex\
- tex4ht-moz.tex\
- tex4ht-ooffice.tex\
- tex4ht-ooimpress.tex\
- tex4ht-options.tex\
- tex4ht-sty.tex\
- tex4ht-svg.tex\
- tex4ht-tei.tex\
- tex4ht-jats.tex\
- tex4ht-word.tex\
- tex4ht-docbook-xtpipes.tex\
- tex4ht-html-speech-xtpipes.tex\
- tex4ht-javahelp-xtpipes.tex\
- tex4ht-jsml-xtpipes.tex\
- tex4ht-oo-xtpipes.tex\
- tex4ht-xhtml-xtpipes.tex\
- tex4ht-xhtmml-xtpipes.tex\
- xtpipes.tex
-
-# whats wrong with tex4ht-info.tex?
-extra_sources := \
- tex4ht-info.tex
-
-#
-# Generate *.d (dependency) file.
-sources_d := $(sources:%.tex=%.d)
-
-# Automake: Dependency computation is done at build time, as a
-# side-effect of compilation. If I understand it right, gcc -MD option
-# generates *.d file(s) (small Makefile) which are included in main
-# Makefile with 'include' directive.
-#
-# So, here is an attempt to mimic that automake dependency computation.
-# Generate (small) Makefiles with vars for dependencies and derived
-# files from *.fls.
-#
-%.d: %.fls
- $(extra_bin)/fls2d $< >$@
-
-# Fonts need to parse *.fls and *.lg files
-tex4ht-fonts-cjk.d: tex4ht-fonts-cjk.lg tex4ht-fonts-cjk.fls
- $(extra_bin)/flslg2d $^ >$@
-
-tex4ht-fonts-cjk-utf8.d: tex4ht-fonts-cjk-utf8.lg tex4ht-fonts-cjk-utf8.fls
- $(extra_bin)/flslg2d $^ >$@
-
-tex4ht-fonts-noncjk.d: tex4ht-fonts-noncjk.lg tex4ht-fonts-noncjk.fls
- $(extra_bin)/flslg2d $^ >$@
-
-d: $(sources_d)
-
-derived:
- for f in *.fls ; do \
- grep -v $${f%.*} $$f | awk '/OUTPUT/ { print $$2 }' > $${f%.*}.derived ; \
-done
-
-# move *.html files to ./htmldir subfolder
-# process lg file
-tohtmldir:
- for f in *.lg ; do \
- echo Processing $$f && mkdir -p $(htmldir)/$${f%.*} \
- && grep "File: $${f%.*}" $$f | awk -v outdir=$(htmldir)/$${f%.*} '{system("[ -f "$$2" ] && mv -f " $$2" "outdir)}' ; \
-done
-
-# move derived files to ./derived.dir
-# process derived files
-toderiveddir: derived
- for f in *.derived ; do \
- echo $$f && mkdir -p $(deriveddir)/$${f%.*} \
- && awk -v outdir=$(deriveddir)/$${f%.*} '{system("[ -f "$$0" ] && mv -f " $$0" "outdir)}' $$f ; \
-done
Modified: trunk/lit/tex4ht-docbook-xtpipes.tex
===================================================================
--- trunk/lit/tex4ht-docbook-xtpipes.tex 2020-06-05 17:34:50 UTC (rev 724)
+++ trunk/lit/tex4ht-docbook-xtpipes.tex 2020-06-05 17:55:02 UTC (rev 725)
@@ -1,7 +1,7 @@
% $Id$
% htlatex tex4ht-docbook-xtpipes "xhtml,next,3" "" "-d./"
%
-% Copyright 2009-2017 TeX Users Group
+% Copyright 2009-2020 TeX Users Group
% Copyright 2000-2009 Eitan M. Gurari
% Released under LPPL 1.3c+.
% See tex4ht-cpright.tex for license text.
@@ -12,6 +12,7 @@
\input{common}
\input{tex4ht-cpright}
+\input{tex4ht-dir}
@@ -49,7 +50,7 @@
\AtEndDocument{\OutputCodE\<DbUtilities.java\>}
\Needs{"
- javac DbUtilities.java -d /home/4/gurari/xtpipes.dir/.
+ javac DbUtilities.java -d \XTPIPES
"}
\<DbUtilities.java\><<<
@@ -515,14 +516,16 @@
\AtEndDocument{\Needs{%
- "cd /home/4/gurari/xtpipes.dir
+ "pushd \XTPIPES || exit 1
;
jar cf tex4ht.jar *
;
- mv tex4ht.jar /home/4/gurari/tex4ht.dir/texmf/tex4ht/bin/.
+ popd
;
- cp /home/4/gurari/xtpipes.dir/xtpipes/lib/*
- /home/4/gurari/tex4ht.dir/texmf/tex4ht/xtpipes/.
+ mv \XTPIPES tex4ht.jar \TEXMFTEXivBIN
+ ;
+ cp \XTPIPES xtpipes/lib/*
+ \TEXMFTEXivXTPIPES
"}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/lit/tex4ht-html-speech-xtpipes.tex
===================================================================
--- trunk/lit/tex4ht-html-speech-xtpipes.tex 2020-06-05 17:34:50 UTC (rev 724)
+++ trunk/lit/tex4ht-html-speech-xtpipes.tex 2020-06-05 17:55:02 UTC (rev 725)
@@ -1,16 +1,16 @@
% $Id$
% htlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./"
%
-% Copyright (C) 2009-2010 TeX Users Group
-% Copyright (C) 2006-2009 Eitan M. Gurari
+% Copyright 2009-2020 TeX Users Group
+% Copyright 2006-2009 Eitan M. Gurari
% Released under LPPL 1.3c+.
% See tex4ht-cpright.tex for license text.
-
\documentclass{article}
\Configure{ProTex}{log,<<<>>>,title,list,`,[[]]}
\begin{document}
\input{common}
+\input{tex4ht-dir}
\input{tex4ht-cpright}
%%%%%%%%%%%%%%%%%%
@@ -148,7 +148,7 @@
\AtEndDocument{\OutputCodE\<HtSpk.java\>}
\Needs{"
- javac HtSpk.java -d /home/4/gurari/xtpipes.dir/.
+ javac HtSpk.java -d \XTPIPES .
"}
\<HtSpk.java\><<<
@@ -2416,14 +2416,18 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\AtEndDocument{\Needs{%
- "cd /home/4/gurari/xtpipes.dir
+ "pushd \XTPIPES || exit 1
;
jar cf tex4ht.jar *
;
- mv tex4ht.jar /home/4/gurari/tex4ht.dir/texmf/tex4ht/bin/.
+ popd
;
- cp /home/4/gurari/xtpipes.dir/xtpipes/lib/*
- /home/4/gurari/tex4ht.dir/texmf/tex4ht/xtpipes/.
+ mkdir -p \TEXMFTEXivBIN || exit 1
+ ;
+ mv \XTPIPES tex4ht.jar \TEXMFTEXivBIN .
+ ;
+ cp \XTPIPES lib/*
+ \TEXMFTEXivXTPIPES .
"}}
Modified: trunk/lit/tex4ht-javahelp-xtpipes.tex
===================================================================
--- trunk/lit/tex4ht-javahelp-xtpipes.tex 2020-06-05 17:34:50 UTC (rev 724)
+++ trunk/lit/tex4ht-javahelp-xtpipes.tex 2020-06-05 17:55:02 UTC (rev 725)
@@ -1,8 +1,8 @@
% $Id$
% htlatex tex4ht-javahelp-xtpipes "xhtml,next,3" "" "-d./"
%
-% Copyright (C) 2009-2010 TeX Users Group
-% Copyright (C) 2002-2009 Eitan M. Gurari
+% Copyright 2009-2020 TeX Users Group
+% Copyright 2002-2009 Eitan M. Gurari
% Released under LPPL 1.3c+.
% See tex4ht-cpright.tex for license text.
@@ -626,14 +626,18 @@
\AtEndDocument{\Needs{%
- "cd /home/4/gurari/xtpipes.dir
+ "pushd \XTPIPES || exit 1
;
jar cf tex4ht.jar *
;
- mv tex4ht.jar /home/4/gurari/tex4ht.dir/texmf/tex4ht/bin/.
+ popd
;
- cp /home/4/gurari/xtpipes.dir/xtpipes/lib/*
- /home/4/gurari/tex4ht.dir/texmf/tex4ht/xtpipes/.
+ mv tex4ht.jar \TEXMFTEXivBIN
+ ;
+ if [ ! -d \TEXMFTEXivXTPIPES\space]; then exit 1; fi
+ ;
+ cp \XTPIPES xtpipes/lib/*
+ \TEXMFTEXivXTPIPES
"}}
\end{document}
Modified: trunk/lit/tex4ht-jsml-xtpipes.tex
===================================================================
--- trunk/lit/tex4ht-jsml-xtpipes.tex 2020-06-05 17:34:50 UTC (rev 724)
+++ trunk/lit/tex4ht-jsml-xtpipes.tex 2020-06-05 17:55:02 UTC (rev 725)
@@ -1,8 +1,8 @@
% $Id$
% htlatex tex4ht-jsml-xtpipes "xhtml,next,3" "" "-d./"
%
-% Copyright (C) 2009-2010 TeX Users Group
-% Copyright (C) 2002-2009 Eitan M. Gurari
+% Copyright 2009-2020 TeX Users Group
+% Copyright 2002-2009 Eitan M. Gurari
% Released under LPPL 1.3c+.
% See tex4ht-cpright.tex for license text.
@@ -13,6 +13,7 @@
\input{common}
\input{tex4ht-cpright}
+\input{tex4ht-dir}
%%%%%%%%%%%%%%%%%%
\part{Script for xtpipes}
@@ -147,7 +148,7 @@
\AtEndDocument{\OutputCodE\<HtJsml.java\>}
\Needs{"
- javac HtJsml.java -d /home/4/gurari/xtpipes.dir/.
+ javac HtJsml.java -d \XTPIPES
"}
\<HtJsml.java\><<<
@@ -183,7 +184,7 @@
\OutputCodE\<GroupMn.java\>
}
\Needs{"
- javac GroupMn.java -d /home/4/gurari/xtpipes.dir/.
+ javac GroupMn.java -d \XTPIPES
"}
\<GroupMn.java\><<<
@@ -792,9 +793,9 @@
\OutputCodE\<JsmlMathBreak.java\>
}
\Needs{"
- javac -classpath /home/4/gurari/tex4ht.dir/texmf/tex4ht/bin/tex4ht.jar
+ javac -classpath \LIB xtpipes.jar
JsmlMathBreak.java
- -d /home/4/gurari/xtpipes.dir/.
+ -d \XTPIPES .
"}
\<JsmlMathBreak.java\><<<
@@ -992,7 +993,7 @@
\OutputCodE\<JsmlFilter.java\>
}
\Needs{"
- javac JsmlFilter.java -d /home/4/gurari/xtpipes.dir/.
+ javac JsmlFilter.java -d \XTPIPES
"}
\<JsmlFilter.java\><<<
@@ -3807,14 +3808,18 @@
\AtEndDocument{\Needs{%
- "cd /home/4/gurari/xtpipes.dir
+ "pushd \XTPIPES
;
jar cf tex4ht.jar *
;
- mv tex4ht.jar /home/4/gurari/tex4ht.dir/texmf/tex4ht/bin/.
+ popd
;
- cp /home/4/gurari/xtpipes.dir/xtpipes/lib/*
- /home/4/gurari/tex4ht.dir/texmf/tex4ht/xtpipes/.
+ mv \XTPIPES tex4ht.jar \TEXMFTEXivBIN
+ ;
+ if [ ! -d \TEXMFTEXivXTPIPES\space]; then exit 1; fi
+ ;
+ cp \XTPIPES xtpipes/lib/*
+ \TEXMFTEXivXTPIPES
"}}
Modified: trunk/lit/tex4ht-oo-xtpipes.tex
===================================================================
--- trunk/lit/tex4ht-oo-xtpipes.tex 2020-06-05 17:34:50 UTC (rev 724)
+++ trunk/lit/tex4ht-oo-xtpipes.tex 2020-06-05 17:55:02 UTC (rev 725)
@@ -1,7 +1,8 @@
% $Id$
% htlatex tex4ht-oo-xtpipes "xhtml,next,3" "" "-d./"
-% Copyright (C) 2009-2013 TeX Users Group
-% Copyright (C) 2001-2009 Eitan M. Gurari
+%
+% Copyright 2009-2020 TeX Users Group
+% Copyright 2001-2009 Eitan M. Gurari
% Released under LPPL 1.3c+.
% See tex4ht-cpright.tex for license text.
@@ -12,6 +13,7 @@
\input{common}
\input{tex4ht-cpright}
+\input{tex4ht-dir}
%%%%%%%%%%%%%%%%%%
@@ -280,7 +282,7 @@
\AtEndDocument{\OutputCodE\<OoUtilities.java\>}
\Needs{"
- javac OoUtilities.java -d /opt/cvr/gurari/xtpipes.dir/.
+ javac OoUtilities.java -d \XTPIPES
"}
\<OoUtilities.java\><<<
@@ -1540,7 +1542,7 @@
\AtEndDocument{\OutputCodE\<OomFilter.java\>}
\Needs{"
- javac OomFilter.java -d /opt/cvr/gurari/xtpipes.dir/.
+ javac OomFilter.java -d \XTPIPES
"}
\<OomFilter.java\><<<
@@ -1605,7 +1607,7 @@
\AtEndDocument{\OutputCodE\<OoFilter.java\>}
\Needs{"
- javac OoFilter.java -d /opt/cvr/gurari/xtpipes.dir/.
+ javac OoFilter.java -d \XTPIPES
"}
\<OoFilter.java\><<<
@@ -1955,14 +1957,18 @@
\AtEndDocument{\Needs{%
- "cd /opt/cvr/gurari/xtpipes.dir
+ "pushd \XTPIPES || exit 1
;
jar cf tex4ht.jar *
;
- mv tex4ht.jar /opt/cvr/gurari/tex4ht.dir/texmf/tex4ht/bin/.
+ popd
;
- cp /opt/cvr/gurari/xtpipes.dir/xtpipes/lib/*
- /opt/cvr/gurari/tex4ht.dir/texmf/tex4ht/xtpipes/.
+ mv \XTPIPES tex4ht.jar \TEXMFTEXivBIN
+ ;
+ if [ ! -d \TEXMFTEXivXTPIPES\space]; then exit 1; fi
+ ;
+ cp \XTPIPES xtpipes/lib/*
+ \TEXMFTEXivXTPIPES
"}}
\end{document}
Modified: trunk/lit/tex4ht-xhtml-xtpipes.tex
===================================================================
--- trunk/lit/tex4ht-xhtml-xtpipes.tex 2020-06-05 17:34:50 UTC (rev 724)
+++ trunk/lit/tex4ht-xhtml-xtpipes.tex 2020-06-05 17:55:02 UTC (rev 725)
@@ -1,8 +1,8 @@
% $Id$
% htlatex tex4ht-xhtml-xtpipes "xhtml,next,3" "" "-d./"
%
-% Copyright (C) 2009-2010 TeX Users Group
-% Copyright (C) 1996-2009 Eitan M. Gurari
+% Copyright 2009-2020 TeX Users Group
+% Copyright 1996-2009 Eitan M. Gurari
% Released under LPPL 1.3c+.
% See tex4ht-cpright.tex for license text.
@@ -12,6 +12,7 @@
\input{common.tex}
\begin{document}
\input tex4ht-cpright.tex
+\input tex4ht-dir
%%%%%%%%%%%%%%%%%%
@@ -90,9 +91,9 @@
\OutputCodE\<XhtmlEmails.java\>
}
\Needs{"
- javac -classpath /home/4/gurari/tex4ht.dir/texmf/tex4ht/bin/tex4ht.jar
+ javac -classpath \TEXMFTEXivBIN tex4ht.jar
XhtmlEmails.java
- -d /home/4/gurari/xtpipes.dir/.
+ -d \XTPIPES
"}
\<XhtmlEmails.java\><<<
@@ -633,14 +634,20 @@
\AtEndDocument{\Needs{%
- "cd /home/4/gurari/xtpipes.dir
+ "pushd \XTPIPES || exit 1
;
jar cf tex4ht.jar *
;
- mv tex4ht.jar /home/4/gurari/tex4ht.dir/texmf/tex4ht/bin/.
+ popd
;
- cp /home/4/gurari/xtpipes.dir/xtpipes/lib/*
- /home/4/gurari/tex4ht.dir/texmf/tex4ht/xtpipes/.
+ if [ ! -d \TEXMFTEXivBIN\space]; then exit 1; fi
+ ;
+ mv \XTPIPES tex4ht.jar \TEXMFTEXivBIN
+ ;
+ if [ ! -d \TEXMFTEXivXTPIPES\space]; then exit 1; fi
+ ;
+ cp \XTPIPES xtpipes/lib/*
+ \TEXMFTEXivXTPIPES
"}}
Modified: trunk/lit/tex4ht-xhtmml-xtpipes.tex
===================================================================
--- trunk/lit/tex4ht-xhtmml-xtpipes.tex 2020-06-05 17:34:50 UTC (rev 724)
+++ trunk/lit/tex4ht-xhtmml-xtpipes.tex 2020-06-05 17:55:02 UTC (rev 725)
@@ -1,8 +1,8 @@
% $Id$
% htlatex tex4ht-xhtmml-xtpipes "xhtml,next,3" "" "-d./"
-% Copyright (C) 2009-2010 TeX Users Group
-% Copyright (C) 1996-2009 Eitan M. Gurari
+% Copyright 2009-2020 TeX Users Group
+% Copyright 1996-2009 Eitan M. Gurari
% Released under LPPL 1.3c+.
% See tex4ht-cpright.tex for license text.
@@ -12,8 +12,8 @@
\input{common.tex}
\begin{document}
\input tex4ht-cpright.tex
+\input tex4ht-dir
-
%%%%%%%%%%%%%%%%%%
\part{Post Processing for HTML Output Mode}
%%%%%%%%%%%%%%%%%%
@@ -52,7 +52,9 @@
\AtEndDocument{\OutputCodE\<XhtmmlUtilities.java\>}
\Needs{"
- javac XhtmmlUtilities.java -d /home/4/gurari/xtpipes.dir/.
+ if [ ! -d \XTPIPES\space]; then exit 1; fi
+ ;
+ javac XhtmmlUtilities.java -d \XTPIPES
"}
\<XhtmmlUtilities.java\><<<
@@ -722,14 +724,21 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\AtEndDocument{\Needs{%
- "cd /home/4/gurari/xtpipes.dir
+ "pushd \XTPIPES || exit 1
;
jar cf tex4ht.jar *
;
- mv tex4ht.jar /home/4/gurari/tex4ht.dir/texmf/tex4ht/bin/.
+ popd
;
- cp /home/4/gurari/xtpipes.dir/xtpipes/lib/*
- /home/4/gurari/tex4ht.dir/texmf/tex4ht/xtpipes/.
+ if [ ! -d \TEXMFTEXivBIN\space]; then exit 1; fi
+ ;
+ mv \XTPIPES tex4ht.jar \TEXMFTEXivBIN
+ ;
+ if [ ! -d \TEXMFTEXivXTPIPES\space]; then exit 1; fi
+ ;
+ cp \XTPIPES xtpipes/lib/*
+ \TEXMFTEXivXTPIPES
+ ;
"}}
Modified: trunk/lit/xtpipes.tex
===================================================================
--- trunk/lit/xtpipes.tex 2020-06-05 17:34:50 UTC (rev 724)
+++ trunk/lit/xtpipes.tex 2020-06-05 17:55:02 UTC (rev 725)
@@ -8,8 +8,8 @@
% generalize -i attribute to accept multiple directories, like for -classpath
% gcj support these ``generics'' with a ``-5'' or ``-1.5'' switch
-% Copyright (C) 2009-2010 TeX Users Group
-% Copyright (C) 1996-2009 Eitan M. Gurari
+% Copyright 2009-2020 TeX Users Group
+% Copyright 1996-2009 Eitan M. Gurari
% Released under LPPL 1.3c+.
% See tex4ht-cpright.tex for license text.
@@ -21,6 +21,7 @@
\Configure{ProTex}{java,<<<>>>,title,list,`}
\begin{document}
\input tex4ht-cpright.tex
+\input tex4ht-dir.tex
\def\CNT{0}
\bgroup
@@ -87,7 +88,7 @@
\def\MakeDir{\relax
\expandafter \ifx \csname !\StartDir\endcsname\relax
\expandafter\let\csname !\StartDir\endcsname=\empty
- \Needs{"if NOT EXIST \StartDir \space mkdir \StartDir"}%
+ \Needs{"if NOT EXIST \StartDir \space mkdir -p \StartDir"}%
\fi
\ifx \EndDir\empty \else
\expandafter\AppendDir \EndDir////*%
@@ -98,7 +99,7 @@
\def\MakeDir{\relax
\expandafter \ifx \csname !\StartDir\endcsname\relax
\expandafter\let\csname !\StartDir\endcsname=\empty
- \Needs{"mkdir \StartDir"}%
+ \Needs{"mkdir -p \StartDir"}%
\fi
\ifx \EndDir\empty \else
\expandafter\AppendDir \EndDir////*%
@@ -151,7 +152,7 @@
% \def\MakeDir{\relax
% \expandafter \ifx \csname !\StartDir\endcsname\relax
% \expandafter\let\csname !\StartDir\endcsname=\empty
-% \Needs{"mkdir \StartDir"}%
+% \Needs{"mkdir -p \StartDir"}%
% \fi
% \ifx \EndDir\empty \else
% \expandafter\AppendDir \EndDir////*%
@@ -176,10 +177,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% TODO : make \WORK MSDOS / Linux agnostic.
+\def\MYdir{\WORK}
-\def\MYdir{work.dir}
-
\expandafter\let\csname !/\endcsname\empty
\expandafter\let\csname !/\endcsname\empty
\expandafter\let\csname !/home\endcsname\empty
@@ -221,24 +222,17 @@
}
% \Needs{"
-% mkdir work.dir
+% mkdir -p work.dir
% ;
-% mkdir work.dir/xtpipes
+% mkdir -p work.dir/xtpipes
% "}
\ifOption{win} {}{
\AtEndDocument{\Needs{"
- cd work.dir
- ;
- javac -Xlint:unchecked xtpipes/*.java
- -d /home/4/gurari/xtpipes.dir/.
- ;
- javac -Xlint:unchecked xtpipes/*/*.java
- -d /home/4/gurari/xtpipes.dir/.
- ;
- javac -Xlint:unchecked xtpipes.java
- -d /home/4/gurari/xtpipes.dir/.
+ find \WORK\space -type f -iname '*.java' -print0
+ | xargs -0 javac -Xlint:deprecation -d \XTPIPES\space -sourcepath \WORK
+ ;
"}}
}
@@ -246,7 +240,7 @@
\ifOption{win} {
\def\BIN{}
}{
- \def\BIN{(/home/4/gurari/xtpipes.dir)}
+ \def\BIN{(\XTPIPES)}
}
%
@@ -279,7 +273,7 @@
`<class XtpipesEntityResolver`>
>>>
-\Needs{"\mv xtpipes.java.java \MYdir\Slash xtpipes.java"}
+\Needs{"\mv xtpipes.java.java \MYdir xtpipes.java"}
NOTE: We can not place Xtpipes.class and xtpipes.class at the same
directory because MS Windows get confused between the two.
@@ -4411,7 +4405,7 @@
}
{ \ifOption{doc}{
\AtEndDocument{\Needs{"
- mkdir doc.dir
+ mkdir -p doc.dir
;
cd doc.dir
;
@@ -4478,39 +4472,40 @@
\ifOption{win} {}{
\AtEndDocument{\Needs{%
- "cd /home/4/gurari/xtpipes.dir
+ "pushd \XTPIPES || exit 1
;
- jar cf tex4ht.jar *
+ jar cf xtpipes.jar *
;
- mv tex4ht.jar /home/4/gurari/tex4ht.dir/texmf/tex4ht/bin/.
+ popd
;
- cp /home/4/gurari/xtpipes.dir/xtpipes/lib/*
- /home/4/gurari/tex4ht.dir/texmf/tex4ht/xtpipes/.
+ mkdir -p \LIB || exit 1
+ ;
+ mv \XTPIPES xtpipes.jar \LIB
+ ;
+ mkdir -p \HOME texmf/tex4ht/xtpipes/. || exit 1
+ ;
+ cp \XTPIPES xtpipes/lib/*
+ \HOME texmf/tex4ht/xtpipes/.
"}}
}
\ifOption{win} {}{
-\AtEndDocument{\Needs{"
-cd work.dir ;
-mkdir bin;
- javac -Xlint:unchecked -d bin xtpipes/*.java ;
- javac -Xlint:unchecked -d bin xtpipes/util/*.java;
- javac -Xlint:unchecked -d bin *.java ;
-cd bin;
- jar cf xtpipes.jar *;
-cd ..;
-cd xtpipes;
-mkdir bin;
- mv ../bin/xtpipes.jar bin/.
-;
-cp -r bin /home/4/gurari/xtpipes.dir/xtpipes/.
-;
-cd ..
-;
-cd ..
-;
+ \AtEndDocument{\Needs{"
+ mkdir -p \LIB\space || exit 1
+ ;
+ find \WORK\space -type f -iname '*.java' -print0
+ | xargs -0 javac -Xlint:deprecation -d \XTPIPES\space -sourcepath \WORK
+ ;
+ pushd \XTPIPES || exit 1
+ ;
+ jar cf xtpipes.jar *
+ ;
+ popd
+ ;
+ mv \XTPIPES xtpipes.jar \LIB
+ ;
"}}}
More information about the tex4ht-commits
mailing list.