texlive[55856] Build/source/texk/web2c: Avoid changefile ambiguity

commits+ascherer at tug.org commits+ascherer at tug.org
Fri Jul 17 15:13:57 CEST 2020 

Revision: 55856
          http://tug.org/svn/texlive?view=revision&revision=55856
Author:   ascherer
Date:     2020-07-17 15:13:57 +0200 (Fri, 17 Jul 2020)
Log Message:
-----------
Avoid changefile ambiguity for pdfTeX and XeTeX.

Similar to TeX and Metafont, the 'final' composed changefile
will be named such.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/ChangeLog
    trunk/Build/source/texk/web2c/Makefile.in
    trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
    trunk/Build/source/texk/web2c/pdftexdir/am/pdftex.am
    trunk/Build/source/texk/web2c/xetexdir/ChangeLog
    trunk/Build/source/texk/web2c/xetexdir/am/xetex.am

Modified: trunk/Build/source/texk/web2c/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ChangeLog	2020-07-17 11:10:09 UTC (rev 55855)
+++ trunk/Build/source/texk/web2c/ChangeLog	2020-07-17 13:13:57 UTC (rev 55856)
@@ -1,3 +1,8 @@
+2020-07-17  Andreas Scherer  <https://ascherer.github.io>
+
+	* Makefile.am,
+	* Makefile.in: Avoid changefile ambiguity.
+
 2020-07-15  Andreas Scherer  <https://ascherer.github.io>
 
 	* ctangleboot.cin,

Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in	2020-07-17 11:10:09 UTC (rev 55855)
+++ trunk/Build/source/texk/web2c/Makefile.in	2020-07-17 13:13:57 UTC (rev 55856)
@@ -3316,13 +3316,13 @@
 	uptests/yuparse.* uptests/ygkhuge*.* uptrip.diffs \
 	$(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \
 	euptex.p euptex.pool euptex-tangle euptrip.diffs \
-	pdfprimitive-euptex.* $(nodist_pdftex_SOURCES) pdftex.ch \
+	pdfprimitive-euptex.* $(nodist_pdftex_SOURCES) pdftex-final.ch \
 	pdftex-web2c pdftex.p pdftex.pool pdftex-tangle pwprob.log \
 	pwprob.tex pdfimage.fmt pdfimage.log pdfimage.pdf expanded.log \
 	cnfline.log postV3.afm postV7.afm test-13.pdf test-13.xref \
 	test-15.pdf test-15.xref $(nodist_libluatex_sources) \
 	luaimage.* luajitimage.* $(nodist_xetex_SOURCES) xetex.web \
-	xetex.ch xetex-web2c xetex.p xetex.pool xetex-tangle bug73.fmt \
+	xetex-final.ch xetex-web2c xetex.p xetex.pool xetex-tangle bug73.fmt \
 	bug73.log bug73.out bug73.tex filedump.log filedump.out \
 	filedump.tex $(omegaware_programs:=.c) \
 	$(omegaware_programs:=.h) $(omegaware_programs:=.p) \
@@ -18617,9 +18617,9 @@
 pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines
 	@$(web2c) pdftex
 pdftex.p pdftex.pool: pdftex-tangle
-	@$(pdf_tangle) pdftex pdftex
-pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch tangle-sh
-	@$(pdf_tangle) pdftex pdftex
+	@$(pdf_tangle) pdftex pdftex-final
+pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex-final.ch tangle-sh
+	@$(pdf_tangle) pdftex pdftex-final
 pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp)
 	$(makecpool) pdftex >$@ || rm -f $@
 
@@ -18633,8 +18633,8 @@
 	$(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/pdftexdir/pdftex.web \
 	  | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
 
-# Generate pdftex.ch
-pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
+# Generate pdftex-final.ch
+pdftex-final.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
 	$(tie_c) $(pdftex_ch_srcs)
 
 # Convenience target for making the typeset output; not invoked automatically
@@ -18770,9 +18770,9 @@
 	$(makecpool) xetex >$@ || rm -f $@
 
 xetex.p xetex.pool: xetex-tangle
-	@$(xe_tangle) xetex xetex
-xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex.ch tangle-sh
-	@$(xe_tangle) xetex xetex
+	@$(xe_tangle) xetex xetex-final
+xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex-final.ch tangle-sh
+	@$(xe_tangle) xetex xetex-final
 
 # Extract etex version
 $(srcdir)/xetexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web
@@ -18783,7 +18783,8 @@
 	$(AM_V_GEN)grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.web \
 	  | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@
 
-xetex.ch: tie$(EXEEXT) $(xetex_ch_srcs)
+# Generate xetex-final.ch
+xetex-final.ch: tie$(EXEEXT) $(xetex_ch_srcs)
 	$(tie_c) $(xetex_ch_srcs)
 $(libxetex_a_OBJECTS): $(libxetex_prereq)
 xetexdir/xetex-filedump.log xetexdir/xetex-bug73.log xetexdir/xetex.log: xetex$(EXEEXT)

Modified: trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/ChangeLog	2020-07-17 11:10:09 UTC (rev 55855)
+++ trunk/Build/source/texk/web2c/pdftexdir/ChangeLog	2020-07-17 13:13:57 UTC (rev 55856)
@@ -1,3 +1,7 @@
+2020-07-17  Andreas Scherer  <https://ascherer.github.io>
+
+	* am/pdftex.am: Avoid changefile ambiguity.
+
 2020-06-11  Thanh Han The  <hanthethanh at gmail.com>
 
 	* pdftex.web (Create link annotations...): check for gen_running_link.

Modified: trunk/Build/source/texk/web2c/pdftexdir/am/pdftex.am
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/am/pdftex.am	2020-07-17 11:10:09 UTC (rev 55855)
+++ trunk/Build/source/texk/web2c/pdftexdir/am/pdftex.am	2020-07-17 13:13:57 UTC (rev 55856)
@@ -46,9 +46,9 @@
 pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines
 	@$(web2c) pdftex
 pdftex.p pdftex.pool: pdftex-tangle
-	@$(pdf_tangle) pdftex pdftex
-pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch tangle-sh
-	@$(pdf_tangle) pdftex pdftex
+	@$(pdf_tangle) pdftex pdftex-final
+pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex-final.ch tangle-sh
+	@$(pdf_tangle) pdftex pdftex-final
 pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp)
 	$(makecpool) pdftex >$@ || rm -f $@
 
@@ -62,8 +62,8 @@
 	$(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/pdftexdir/pdftex.web \
 	  | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
 
-# Generate pdftex.ch
-pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
+# Generate pdftex-final.ch
+pdftex-final.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
 	$(tie_c) $(pdftex_ch_srcs)
 pdftex_ch_srcs = \
 	pdftexdir/pdftex.web \
@@ -84,7 +84,7 @@
 ##
 EXTRA_DIST += $(pdftex_ch_srcs) pdftexdir/pdftex.defines
 
-DISTCLEANFILES += $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c \
+DISTCLEANFILES += $(nodist_pdftex_SOURCES) pdftex-final.ch pdftex-web2c \
 	pdftex.p pdftex.pool pdftex-tangle
 
 EXTRA_DIST += \

Modified: trunk/Build/source/texk/web2c/xetexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/xetexdir/ChangeLog	2020-07-17 11:10:09 UTC (rev 55855)
+++ trunk/Build/source/texk/web2c/xetexdir/ChangeLog	2020-07-17 13:13:57 UTC (rev 55856)
@@ -1,3 +1,7 @@
+2020-07-17  Andreas Scherer  <https://ascherer.github.io>
+
+	* am/xetex.am: Avoid changefile ambiguity.
+
 2020-07-04  Clerk Ma  <maqiyuan130324 at vip.qq.com>
 
 	* xetex.web: Tweak indentation, etc.

Modified: trunk/Build/source/texk/web2c/xetexdir/am/xetex.am
===================================================================
--- trunk/Build/source/texk/web2c/xetexdir/am/xetex.am	2020-07-17 11:10:09 UTC (rev 55855)
+++ trunk/Build/source/texk/web2c/xetexdir/am/xetex.am	2020-07-17 13:13:57 UTC (rev 55856)
@@ -92,9 +92,9 @@
 
 ## Tangling XeTeX
 xetex.p xetex.pool: xetex-tangle
-	@$(xe_tangle) xetex xetex
-xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex.ch tangle-sh
-	@$(xe_tangle) xetex xetex
+	@$(xe_tangle) xetex xetex-final
+xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex-final.ch tangle-sh
+	@$(xe_tangle) xetex xetex-final
 
 # Extract etex version
 $(srcdir)/xetexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web
@@ -106,8 +106,8 @@
 	$(AM_V_GEN)grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.web \
 	  | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@
 
-## Generate xetex.ch
-xetex.ch: tie$(EXEEXT) $(xetex_ch_srcs)
+## Generate xetex-final.ch
+xetex-final.ch: tie$(EXEEXT) $(xetex_ch_srcs)
 	$(tie_c) $(xetex_ch_srcs)
 xetex_ch_srcs = \
 	xetexdir/xetex.web \
@@ -121,7 +121,7 @@
 ##
 EXTRA_DIST += $(xetex_web_srcs) $(xetex_ch_srcs) xetexdir/xetex.defines
 
-DISTCLEANFILES += $(nodist_xetex_SOURCES) xetex.web xetex.ch xetex-web2c \
+DISTCLEANFILES += $(nodist_xetex_SOURCES) xetex.web xetex-final.ch xetex-web2c \
 	xetex.p xetex.pool xetex-tangle

More information about the tex-live-commits mailing list.