build system

git-svn-id: svn://tug.org/texlive/trunk@17972 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 54 insertions, 116 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 4923c6a33b2..d3ce571193a 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1234,15 +1234,16 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h triptrap-sh \
 	ptexdir/ptrip.diffs ptexdir/Files ptexdir/pbibtex.defines \
 	ptexdir/ptex.mk ptexdir/ptex-base.ch.orig \
 	ptexdir/ptex-include.ch ptexdir/ptexhelp.h ptexdir/reautoconf \
-	$(pdftex_ch_srcs) pdftexdir/pdftex.defines pdftexdir/pdftex.h \
-	pdftexdir/pdftexextra.in pdftexdir/ChangeLog pdftexdir/NEWS \
-	pdftexdir/README pdftexdir/change-files.txt \
-	pdftexdir/pdftex.mak pdftexdir/pdftex.mk \
-	pdftexdir/regex/COPYING.LIB pdftexdir/regex/README \
-	luatexdir/ptexlib.h luatexdir/getluatexsvnversion.sh \
-	luatexdir/lua51/Makefile luatexdir/lua51/liolib.c \
-	luatexdir/lua51/lua.c luatexdir/lua51/luac.c \
-	luatexdir/lua51/print.c luatexdir/luasocket/src/socket_lua.c \
+	$(pdftex_ch_srcs) etexdir/etex.ch pdftexdir/pdftex.defines \
+	pdftexdir/pdftex.h pdftexdir/pdftexextra.in \
+	pdftexdir/ChangeLog pdftexdir/NEWS pdftexdir/README \
+	pdftexdir/change-files.txt pdftexdir/pdftex.mak \
+	pdftexdir/pdftex.mk pdftexdir/regex/COPYING.LIB \
+	pdftexdir/regex/README luatexdir/ptexlib.h \
+	luatexdir/getluatexsvnversion.sh luatexdir/lua51/Makefile \
+	luatexdir/lua51/liolib.c luatexdir/lua51/lua.c \
+	luatexdir/lua51/luac.c luatexdir/lua51/print.c \
+	luatexdir/luasocket/src/socket_lua.c \
 	luatexdir/luasocket/src/ftp_lua.c \
 	luatexdir/luasocket/src/http_lua.c \
 	luatexdir/luasocket/src/smtp_lua.c \
@@ -1412,20 +1413,21 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
 	tests/xpagenum.typ tests/xcmr10.tfm tests/xcmr10.pl \
 	ptrip.diffs $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c \
 	pdftex.p pdftex.pool pdftex-tangle pdftexdir/pdftex.version \
-	$(nodist_libluatex_a_SOURCES) $(nodist_xetex_SOURCES) \
-	xetex.web xetex-web2c xetex.p xetex.pool xetex-tangle \
-	xetexdir/etex.version xetexdir/xetex.version \
-	$(omegaware_programs:=.c) $(omegaware_programs:=.h) \
-	$(omegaware_programs:=.p) $(omegaware_programs:=-web2c) \
-	omegaware/tests/xlevel1.ofm omegaware/tests/xlevel1.opl \
-	ofont*vf omegaware/tests/xofont* omegaware/tests/Cherokee.tfm \
-	omegaware/tests/OCherokee.ofm omegaware/tests/OCherokee.opl \
-	omegaware/tests/OCherokee.ovf omegaware/tests/xCherokee.* \
-	omegaware/tests/xOCherokee.* cftest.p \
-	omegaware/tests/xrepeated.* omegaware/tests/specialhex.ofm \
-	omegaware/tests/specialhex.opl omegaware/tests/specialhex.ovf \
-	omegaware/tests/xspecialhex.* $(nodist_aleph_SOURCES) \
-	aleph.web aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
+	pdftexdir/etex.version $(nodist_libluatex_a_SOURCES) \
+	$(nodist_xetex_SOURCES) xetex.web xetex-web2c xetex.p \
+	xetex.pool xetex-tangle xetexdir/etex.version \
+	xetexdir/xetex.version $(omegaware_programs:=.c) \
+	$(omegaware_programs:=.h) $(omegaware_programs:=.p) \
+	$(omegaware_programs:=-web2c) omegaware/tests/xlevel1.ofm \
+	omegaware/tests/xlevel1.opl ofont*vf omegaware/tests/xofont* \
+	omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \
+	omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \
+	omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.* \
+	cftest.p omegaware/tests/xrepeated.* \
+	omegaware/tests/specialhex.ofm omegaware/tests/specialhex.opl \
+	omegaware/tests/specialhex.ovf omegaware/tests/xspecialhex.* \
+	$(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c aleph.p \
+	aleph.pool aleph-tangle
 CLEANFILES = 
 TRIPTRAP = $(am__append_6) $(am__append_9) $(am__append_15) \
 	$(am__append_19) $(am__append_24)
@@ -1610,7 +1612,7 @@ etex_ch_srcs = \
 	$(etex_ch_synctex) \
 	etexdir/tex.ch1 \
 	etexdir/tex.ech \
-	etexdir/etex-binpool.ch
+	tex-binpool.ch
 
 
 # e-TeX Tests
@@ -1648,7 +1650,6 @@ ptex_web_srcs = \
 	tex.ch
 
 ptex_ch_srcs = \
-	$(ptex_ch_synctex) \
 	ptexdir/ptex-base.ch \
 	tex-binpool.ch
 
@@ -9009,7 +9010,7 @@ ptex-tangle: tangle$(EXEEXT) ptex.web ptex.ch tangle-sh
 
 # Extract ptex version
 ptexdir/ptex.version: ptexdir/ptex-base.ch
-	$(MKDIR_P) ptexdir/lib
+	$(MKDIR_P) ptexdir
 	grep "^@d TeX_banner=='This is pTeX" $(srcdir)/ptexdir/ptex-base.ch \
 	  | sed "s/^.*-//;s/'.*$$//" >ptexdir/ptex.version
 
@@ -9075,12 +9076,17 @@ pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch tangle-sh
 	@$(pdf_tangle) pdftex pdftex
 pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp)
 	$(makecpool) pdftex >$@ || rm -f $@
+# Extract etex version
+pdftexdir/etex.version: etexdir/etex.ch
+	$(MKDIR_P) pdftexdir
+	grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
+	  | sed "s/^.*'-//;s/'.*$$//" >$@
 # Extract pdftex version
 pdftexdir/pdftex.version: pdftexdir/pdftex.web
 	$(MKDIR_P) pdftexdir
 	grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \
 	  | sed "s/^.*'-//;s/'.*$$//" >pdftexdir/pdftex.version
-pdftexdir/pdftexextra.h: pdftexdir/pdftexextra.in pdftexdir/pdftex.version etexdir/etex.version
+pdftexdir/pdftexextra.h: pdftexdir/pdftexextra.in pdftexdir/pdftex.version pdftexdir/etex.version
 	sed -e s/PDFTEX-VERSION/`cat pdftexdir/pdftex.version`/ \
 	    -e s/ETEX-VERSION/`cat etexdir/etex.version`/ \
 	  $(srcdir)/pdftexdir/pdftexextra.in >$@
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog
index d8e2fd0a761..ea79734b801 100644
--- a/Build/source/texk/web2c/etexdir/ChangeLog
+++ b/Build/source/texk/web2c/etexdir/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/etex.am (etex_ch_srcs): Use tex-binpool.ch as for TeX.
+
 2010-03-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/etex.am (TRIPTRAP): Add etrip.diffs.
diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am
index 33567225a26..135061c9a73 100644
--- a/Build/source/texk/web2c/etexdir/am/etex.am
+++ b/Build/source/texk/web2c/etexdir/am/etex.am
@@ -68,7 +68,7 @@ etex_ch_srcs = \
 	$(etex_ch_synctex) \
 	etexdir/tex.ch1 \
 	etexdir/tex.ech \
-	etexdir/etex-binpool.ch
+	tex-binpool.ch
 ##
 EXTRA_DIST += $(etex_web_srcs) $(etex_ch_srcs) etexdir/etexextra.in \
 	lib/texmfmp.c tmf-pool.h
diff --git a/Build/source/texk/web2c/etexdir/etex-binpool.ch b/Build/source/texk/web2c/etexdir/etex-binpool.ch
deleted file mode 100644
index d55114962c9..00000000000
--- a/Build/source/texk/web2c/etexdir/etex-binpool.ch
+++ /dev/null
@@ -1,83 +0,0 @@
-%
-% 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
-@<Read the other strings...@>=
-name_length := strlen (pool_name);
-name_of_file := xmalloc_array (ASCII_code, name_length + 1);
-strcpy (stringcast(name_of_file+1), pool_name); {copy the string}
-if a_open_in (pool_file, kpse_texpool_format) then
-  begin c:=false;
-  repeat @<Read one string, but return |false| if the
-    string memory space is getting too tight for comfort@>;
-  until c;
-  a_close(pool_file); get_strings_started:=true;
-  end
-else  bad_pool('! I can''t read ', pool_name, '; bad path?')
-@.I can't read TEX.POOL@>
-
-@ @<Read one string...@>=
-begin if eof(pool_file) then bad_pool('! ', pool_name, ' has no check sum.');
-@.TEX.POOL has no check sum@>
-read(pool_file,m); read(pool_file,n); {read two digits of string length}
-if m='*' then @<Check the pool check sum@>
-else  begin if (xord[m]<"0")or(xord[m]>"9")or@|
-      (xord[n]<"0")or(xord[n]>"9") then
-    bad_pool('! ', pool_name, ' line doesn''t begin with two digits.');
-@.TEX.POOL line doesn't...@>
-  l:=xord[m]*10+xord[n]-"0"*11; {compute the length}
-  if pool_ptr+l+string_vacancies>pool_size then
-    bad_pool('! You have to increase POOLSIZE.');
-@.You have to increase POOLSIZE@>
-  for k:=1 to l do
-    begin if eoln(pool_file) then m:=' '@+else read(pool_file,m);
-    append_char(xord[m]);
-    end;
-  read_ln(pool_file); g:=make_string;
-  end;
-end
-
-@ The \.{WEB} operation \.{@@\$} denotes the value that should be at the
-end of this \.{TEX.POOL} file; any other value means that the wrong pool
-file has been loaded.
-@^check sum@>
-
-@<Check the pool check sum@>=
-begin a:=0; k:=1;
-loop@+  begin if (xord[n]<"0")or(xord[n]>"9") then
-  bad_pool('! ', pool_name, ' check sum doesn''t have nine digits.');
-@.TEX.POOL check sum...@>
-  a:=10*a+xord[n]-"0";
-  if k=9 then goto done;
-  incr(k); read(pool_file,n);
-  end;
-done: if a<>@$ then
-  bad_pool('! ', pool_name, ' doesn''t match; tangle me again (or fix the path).');
-@.TEX.POOL doesn't match@>
-c:=true;
-end
-@y
-@ @<Read the other strings...@>=
-  g := loadpoolstrings((pool_size-string_vacancies));
-  if g=0 then begin
-     wake_up_terminal; write_ln(term_out,'! You have to increase POOLSIZE.');
-     get_strings_started:=false;
-     return;
-  end;
-  get_strings_started:=true;
-
-@ Empty module
-
-@ Empty module
-@z
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 66552b70c34..f568296d3e5 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/pdftex.am (EXTRA_DIST): Add etexdir/etex.ch.
+	Use pdftexdir/etex.version instead of etexdir/etex.version.
+
 2010-04-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* ptexlib.h: Move extern declaration of ptexbanner to here
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index 6c1e87788c8..ea9fd9601d4 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -53,12 +53,17 @@ pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch tangle-sh
 	@$(pdf_tangle) pdftex pdftex
 pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp)
 	$(makecpool) pdftex >$@ || rm -f $@
+# Extract etex version
+pdftexdir/etex.version: etexdir/etex.ch
+	$(MKDIR_P) pdftexdir
+	grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
+	  | sed "s/^.*'-//;s/'.*$$//" >$@
 # Extract pdftex version
 pdftexdir/pdftex.version: pdftexdir/pdftex.web
 	$(MKDIR_P) pdftexdir
 	grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \
 	  | sed "s/^.*'-//;s/'.*$$//" >pdftexdir/pdftex.version
-pdftexdir/pdftexextra.h: pdftexdir/pdftexextra.in pdftexdir/pdftex.version etexdir/etex.version
+pdftexdir/pdftexextra.h: pdftexdir/pdftexextra.in pdftexdir/pdftex.version pdftexdir/etex.version
 	sed -e s/PDFTEX-VERSION/`cat pdftexdir/pdftex.version`/ \
 	    -e s/ETEX-VERSION/`cat etexdir/etex.version`/ \
 	  $(srcdir)/pdftexdir/pdftexextra.in >$@
@@ -72,11 +77,11 @@ pdftex_ch_srcs = \
 	$(pdftex_ch_synctex) \
 	pdftexdir/pdftex.ch
 ##
-EXTRA_DIST += $(pdftex_ch_srcs) \
+EXTRA_DIST += $(pdftex_ch_srcs) etexdir/etex.ch \
 	pdftexdir/pdftex.defines pdftexdir/pdftex.h pdftexdir/pdftexextra.in
 
 DISTCLEANFILES += $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c \
-	pdftex.p pdftex.pool pdftex-tangle pdftexdir/pdftex.version
+	pdftex.p pdftex.pool pdftex-tangle pdftexdir/pdftex.version pdftexdir/etex.version
 
 EXTRA_DIST += \
 	pdftexdir/ChangeLog \
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index d9053aa8473..588ea2908ce 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -8,6 +8,8 @@
 	* pbibtex.ch: Correct handling of buffer_overflow.  From Akira.
 	* ptex.defines (inputline3): Removed.
 
+	* am/ptex.am: No synctex.  No reason to create ptexdir/lib/.
+
 2010-04-21  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* pdvitype.test, ppltotf.test, ptftopl.test (new): Shell scripts
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index 05a20f9f90c..14cb8361c65 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -78,7 +78,7 @@ ptex-tangle: tangle$(EXEEXT) ptex.web ptex.ch tangle-sh
 
 # Extract ptex version
 ptexdir/ptex.version: ptexdir/ptex-base.ch
-	$(MKDIR_P) ptexdir/lib
+	$(MKDIR_P) ptexdir
 	grep "^@d TeX_banner=='This is pTeX" $(srcdir)/ptexdir/ptex-base.ch \
 	  | sed "s/^.*-//;s/'.*$$//" >ptexdir/ptex.version
 
@@ -93,7 +93,6 @@ ptex_web_srcs = \
 ptex.ch: tie$(EXEEXT) ptex.web $(ptex_ch_srcs)
 	$(tie) -c ptex.ch ptex.web $(ptex_ch_srcs)
 ptex_ch_srcs = \
-	$(ptex_ch_synctex) \
 	ptexdir/ptex-base.ch \
 	tex-binpool.ch