diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-10 10:27:09 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-10 10:27:09 +0000 |
commit | 5e8e9500102800e68c9e7fcac9e85c1668b71a36 (patch) | |
tree | 81d79ac70ffbb127e8063f18c8f55475ca169ee1 /Build/source/texk/web2c/etexdir | |
parent | e6a9c88ada2f11dd61e4c4e39dff84944bed5787 (diff) |
towards TL2010: texk/web2c
git-svn-id: svn://tug.org/texlive/trunk@15964 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/etexdir')
-rw-r--r-- | Build/source/texk/web2c/etexdir/ChangeLog | 25 | ||||
-rw-r--r-- | Build/source/texk/web2c/etexdir/am/etex.am | 30 | ||||
-rw-r--r-- | Build/source/texk/web2c/etexdir/etex-binpool.ch | 8 |
3 files changed, 49 insertions, 14 deletions
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index a8dd4b5ba21..ea469ba932e 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,28 @@ +2009-10-04 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/etex.am: Enable compiler warnings. + * etex-binpool.ch (get_strings_started): Drop unused variables. + +2009-09-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/etex.am: Adapt to new makecpool with one argument. + +2009-09-04 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/etex.am: Prepare compiler warnings. + +2009-08-18 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/etex.am: SyncTeX now integrated into ../texmfmp.h. + +2009-08-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/etex.am: Adapt to tangle-sh and web2c-sh. + +2009-08-13 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/etex.am (etex_c_h): avoid to split the C code. + 2009-05-12 Peter Breitenlohner <peb@mppmu.mpg.de> * etrip.test (new): Shell script for e-TRIP tests. diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am index e346298f0d0..506f655069f 100644 --- a/Build/source/texk/web2c/etexdir/am/etex.am +++ b/Build/source/texk/web2c/etexdir/am/etex.am @@ -11,23 +11,26 @@ endif ETEX EXTRA_PROGRAMS += etex etex_CPPFLAGS = +etex_CFLAGS = $(WARNING_CFLAGS) # With --enable-ipc, e-TeX may need to link with -lsocket. etex_LDADD = $(LDADD) $(ipc_socketlibs) # e-TeX C sources -etex_c_h = etexini.c etex0.c etex1.c etex2.c etexcoerce.h etexd.h +etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexextra.c etexdir/etexextra.h +# We must create etexd.h before building the etex_OBJECTS. +etex_prereq = etexd.h +$(etex_OBJECTS): $(etex_prereq) + $(etex_c_h): etex-web2c + @$(web2c) etex etex-web2c: etex.p $(web2c_texmf) - $(web2c) etex - : $(synctex_convert_etex) - echo timestamp >$@ - touch $(etex_c_h) + @$(web2c) etex -etex-pool.c: etex.pool $(makecpool_stamp) tmf-pool.h - $(makecpool) etex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@ +etex-pool.c: etex.pool etexd.h $(makecpool_stamp) + $(makecpool) etex >$@ || rm -f $@ etexextra.c: etexdir/etexextra.h lib/texmfmp.c etexd.h sed s/TEX-OR-MF-OR-MP/etex/ $(srcdir)/lib/texmfmp.c >$@ @@ -38,10 +41,9 @@ etexdir/etexextra.h: etexdir/etexextra.in etexdir/etex.version # Tangling e-TeX etex.p etex.pool: etex-tangle -etex-tangle: tangle$(EXEEXT) etex.web etex.ch - $(tangle) etex etex - echo timestamp >$@ - touch etex.p etex.pool + @$(texmf_tangle) etex etex +etex-tangle: tangle$(EXEEXT) etex.web etex.ch tangle-sh + @$(texmf_tangle) etex etex # Extract etex version etexdir/etex.version: etexdir/etex.ch @@ -80,8 +82,8 @@ EXTRA_DIST += \ etexdir/README \ etexdir/etex_gen.tex -## e-TeX Tests -## +# e-TeX Tests +# etex_tests = etexdir/etrip.test EXTRA_DIST += $(etex_tests) @@ -93,7 +95,7 @@ endif ETEX .PHONY: etrip-clean clean-local:: etrip-clean -## trip.test +# etrip.test etrip-clean: rm -f trip.tfm trip.pl trip.tex trip.fmt ctripin.fot ctripin.log rm -f ctrip.fot ctrip.log trip.dvi ctrip.typ diff --git a/Build/source/texk/web2c/etexdir/etex-binpool.ch b/Build/source/texk/web2c/etexdir/etex-binpool.ch index ac959c7b3fb..d55114962c9 100644 --- a/Build/source/texk/web2c/etexdir/etex-binpool.ch +++ b/Build/source/texk/web2c/etexdir/etex-binpool.ch @@ -2,6 +2,14 @@ % pool in binary % @x +@!m,@!n:text_char; {characters input from |pool_file|} +@!g:str_number; {garbage} +@!a:integer; {accumulator for check sum} +@!c:boolean; {check sum has been checked} +@y +@!g:str_number; {garbage} +@z +@x @ @d bad_pool(#)==begin wake_up_terminal; write_ln(term_out,#); a_close(pool_file); get_strings_started:=false; return; end |