diff options
Diffstat (limited to 'Build/source/texk/web2c')
28 files changed, 147 insertions, 208 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index fd4608d7587..f254c32ee5d 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,8 @@ +2012-07-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * w2c/config.h: Define LONGINTEGER_PRI instead of + LONGINTEGER_PRId, also to be used for unsigned quantities. + 2012-07-15 Peter Breitenlohner <peb@mppmu.mpg.de> * bibtex.ch, dvicopy.ch, dvitype.ch, gftodvi.ch, gftopk.ch, diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index cde5ba0d784..ab45069e16a 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -715,9 +715,9 @@ dvitype_OBJECTS = $(nodist_dvitype_OBJECTS) dvitype_LDADD = $(LDADD) dvitype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) am__dist_eptex_SOURCES_DIST = eptexdir/eptexextra.c \ - eptexdir/eptexextra.h synctexdir/synctex.c \ - synctexdir/synctex.h synctexdir/synctex-common.h \ - synctexdir/synctex-eptex.h + eptexdir/eptexextra.h eptexdir/eptex_version.h \ + synctexdir/synctex.c synctexdir/synctex.h \ + synctexdir/synctex-common.h synctexdir/synctex-eptex.h @EPTEX_SYNCTEX_TRUE@am__objects_11 = eptex-synctex.$(OBJEXT) dist_eptex_OBJECTS = eptex-eptexextra.$(OBJEXT) $(am__objects_11) am__objects_12 = eptex-eptexini.$(OBJEXT) eptex-eptex0.$(OBJEXT) @@ -725,8 +725,9 @@ nodist_eptex_OBJECTS = $(am__objects_12) eptex-eptex-pool.$(OBJEXT) eptex_OBJECTS = $(dist_eptex_OBJECTS) $(nodist_eptex_OBJECTS) @EPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) am__dist_etex_SOURCES_DIST = etexdir/etexextra.c etexdir/etexextra.h \ - synctexdir/synctex.c synctexdir/synctex.h \ - synctexdir/synctex-common.h synctexdir/synctex-etex.h + etexdir/etex_version.h synctexdir/synctex.c \ + synctexdir/synctex.h synctexdir/synctex-common.h \ + synctexdir/synctex-etex.h @ETEX_SYNCTEX_TRUE@am__objects_13 = etex-synctex.$(OBJEXT) dist_etex_OBJECTS = etex-etexextra.$(OBJEXT) $(am__objects_13) am__objects_14 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT) @@ -736,7 +737,8 @@ etex_OBJECTS = $(dist_etex_OBJECTS) $(nodist_etex_OBJECTS) etex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_4) am__dist_euptex_SOURCES_DIST = euptexdir/euptexextra.c \ - euptexdir/euptexextra.h synctexdir/synctex.c \ + euptexdir/euptexextra.h eptexdir/eptex_version.h \ + uptexdir/uptex_version.h synctexdir/synctex.c \ synctexdir/synctex.h synctexdir/synctex-common.h \ synctexdir/synctex-euptex.h @EUPTEX_SYNCTEX_TRUE@am__objects_15 = euptex-synctex.$(OBJEXT) @@ -832,9 +834,9 @@ pbibtex_OBJECTS = $(am_pbibtex_OBJECTS) $(nodist_pbibtex_OBJECTS) am__DEPENDENCIES_8 = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_2) am__dist_pdftex_SOURCES_DIST = pdftexdir/pdftexextra.c \ - pdftexdir/pdftexextra.h synctexdir/synctex.c \ - synctexdir/synctex.h synctexdir/synctex-common.h \ - synctexdir/synctex-pdftex.h + pdftexdir/pdftexextra.h pdftexdir/pdftex_version.h \ + synctexdir/synctex.c synctexdir/synctex.h \ + synctexdir/synctex-common.h synctexdir/synctex-pdftex.h @PDFTEX_SYNCTEX_TRUE@am__objects_18 = pdftex-synctex.$(OBJEXT) dist_pdftex_OBJECTS = pdftex-pdftexextra.$(OBJEXT) $(am__objects_18) am__objects_19 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT) @@ -873,8 +875,9 @@ am_ppltotf_OBJECTS = nodist_ppltotf_OBJECTS = ppltotf-ppltotf.$(OBJEXT) ppltotf_OBJECTS = $(am_ppltotf_OBJECTS) $(nodist_ppltotf_OBJECTS) am__dist_ptex_SOURCES_DIST = ptexdir/ptexextra.c ptexdir/ptexextra.h \ - synctexdir/synctex.c synctexdir/synctex.h \ - synctexdir/synctex-common.h synctexdir/synctex-ptex.h + ptexdir/ptex_version.h synctexdir/synctex.c \ + synctexdir/synctex.h synctexdir/synctex-common.h \ + synctexdir/synctex-ptex.h @PTEX_SYNCTEX_TRUE@am__objects_20 = ptex-synctex.$(OBJEXT) dist_ptex_OBJECTS = ptex-ptexextra.$(OBJEXT) $(am__objects_20) am__objects_21 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT) @@ -933,9 +936,9 @@ am_uppltotf_OBJECTS = nodist_uppltotf_OBJECTS = uppltotf-uppltotf.$(OBJEXT) uppltotf_OBJECTS = $(am_uppltotf_OBJECTS) $(nodist_uppltotf_OBJECTS) am__dist_uptex_SOURCES_DIST = uptexdir/uptexextra.c \ - uptexdir/uptexextra.h synctexdir/synctex.c \ - synctexdir/synctex.h synctexdir/synctex-common.h \ - synctexdir/synctex-uptex.h + uptexdir/uptexextra.h uptexdir/uptex_version.h \ + synctexdir/synctex.c synctexdir/synctex.h \ + synctexdir/synctex-common.h synctexdir/synctex-uptex.h @UPTEX_SYNCTEX_TRUE@am__objects_24 = uptex-synctex.$(OBJEXT) dist_uptex_OBJECTS = uptex-uptexextra.$(OBJEXT) $(am__objects_24) am__objects_25 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT) @@ -962,9 +965,9 @@ wovp2ovf_OBJECTS = $(nodist_wovp2ovf_OBJECTS) wovp2ovf_LDADD = $(LDADD) wovp2ovf_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) am__dist_xetex_SOURCES_DIST = xetexdir/xetexextra.c \ - xetexdir/xetexextra.h synctexdir/synctex.c \ - synctexdir/synctex.h synctexdir/synctex-common.h \ - synctexdir/synctex-xetex.h + xetexdir/xetexextra.h xetexdir/xetex_version.h \ + synctexdir/synctex.c synctexdir/synctex.h \ + synctexdir/synctex-common.h synctexdir/synctex-xetex.h @XETEX_SYNCTEX_TRUE@am__objects_26 = xetex-synctex.$(OBJEXT) dist_xetex_OBJECTS = xetex-xetexextra.$(OBJEXT) $(am__objects_26) am__objects_27 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT) @@ -1863,9 +1866,9 @@ etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_92) # e-TeX C sources etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h -nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexdir/etex_version.h +nodist_etex_SOURCES = $(etex_c_h) etex-pool.c dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \ - $(am__append_94) + etexdir/etex_version.h $(am__append_94) # We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS. etex_prereq = etexd.h etexdir/etex_version.h $(am__append_93) @@ -1911,9 +1914,9 @@ ptex_DEPENDENCIES = $(ptex_dependencies) # pTeX C sources ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h -nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c ptexdir/ptex_version.h +nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \ - $(am__append_98) + ptexdir/ptex_version.h $(am__append_98) # We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS. ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_97) @@ -1959,14 +1962,12 @@ eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependen # e-pTeX C sources eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h -nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c eptexdir/etex_version.h eptexdir/eptex_version.h eptexdir/ptex_version.h +nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \ - $(am__append_106) + eptexdir/eptex_version.h $(am__append_106) -# We must create eptexd.h and eptexdir/[ep]tex_version.h before building the eptex_OBJECTS. -eptex_prereq = eptexd.h eptexdir/etex_version.h \ - eptexdir/eptex_version.h eptexdir/ptex_version.h \ - $(am__append_105) +# We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS. +eptex_prereq = eptexd.h eptexdir/eptex_version.h $(am__append_105) eptex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -2010,13 +2011,12 @@ uptex_DEPENDENCIES = $(uptex_dependencies) # upTeX C sources uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h -nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c uptexdir/ptex_version.h uptexdir/uptex_version.h +nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \ - $(am__append_102) + uptexdir/uptex_version.h $(am__append_102) -# We must create uptexd.h and uptexdir/*ptex_version.h before building the uptex_OBJECTS. -uptex_prereq = uptexd.h uptexdir/ptex_version.h \ - uptexdir/uptex_version.h $(am__append_101) +# We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS. +uptex_prereq = uptexd.h uptexdir/uptex_version.h $(am__append_101) uptex_web_srcs = \ tex.web \ tex.ch @@ -2060,16 +2060,14 @@ euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_depend # e-upTeX C sources euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h -nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c euptexdir/etex_version.h \ - euptexdir/eptex_version.h euptexdir/ptex_version.h euptexdir/uptex_version.h - +nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \ + eptexdir/eptex_version.h uptexdir/uptex_version.h \ $(am__append_110) -# We must create euptexd.h and euptexdir/*tex_version.h before building the euptex_OBJECTS. -euptex_prereq = euptexd.h euptexdir/etex_version.h \ - euptexdir/eptex_version.h euptexdir/ptex_version.h \ - euptexdir/uptex_version.h $(am__append_109) +# We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS. +euptex_prereq = euptexd.h eptexdir/eptex_version.h \ + uptexdir/uptex_version.h $(am__append_109) euptex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -2114,13 +2112,11 @@ pdftex_LDADD = libpdftex.a $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs) pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a # We must create libpdftex.a etc before building the pdftex_OBJECTS. -pdftex_prereq = libpdftex.a pdftexdir/etex_version.h pdftexdir/pdftex_version.h +pdftex_prereq = libpdftex.a pdftexdir/pdftex_version.h pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h -nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c \ - pdftexdir/etex_version.h pdftexdir/pdftex_version.h - +nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \ - $(am__append_112) + pdftexdir/pdftex_version.h $(am__append_112) pdftex_ch_srcs = \ pdftexdir/pdftex.web \ pdftexdir/tex.ch0 \ @@ -2583,13 +2579,11 @@ xetex_CXXFLAGS = # $(WARNING_CXXFLAGS) xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs) # We must create libxetex.a etc before building the xetex_OBJECTS -xetex_prereq = $(libxetex) xetexdir/etex_version.h xetexdir/xetex_version.h +xetex_prereq = $(libxetex) xetexdir/xetex_version.h xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h -nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c \ - xetexdir/etex_version.h xetexdir/xetex_version.h - +nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \ - $(am__append_114) + xetexdir/xetex_version.h $(am__append_114) xetex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -9855,24 +9849,12 @@ eptex.p eptex.pool: eptex-tangle eptex-tangle: tangle$(EXEEXT) eptex.web eptex.ch tangle-sh @$(texmf_tangle) eptex eptex -# Extract etex version -eptexdir/etex_version.h: etexdir/etex.ch - $(MKDIR_P) eptexdir - grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \ - | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ - # Extract eptex version -eptexdir/eptex_version.h: eptexdir/eptex.ech +eptexdir/eptex_version.h: eptexdir/eptex.ech etexdir/etex_version.h ptexdir/ptex_version.h $(MKDIR_P) eptexdir grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \ | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@ -# Extract ptex version -eptexdir/ptex_version.h: ptexdir/ptex-base.ch - $(MKDIR_P) eptexdir - grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \ - | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@ - # Generate eptex.web eptex.web: tie$(EXEEXT) $(eptex_web_srcs) $(tie) -m eptex.web $(eptex_web_srcs) @@ -9907,14 +9889,8 @@ uptex.p uptex.pool: uptex-tangle uptex-tangle: tangle$(EXEEXT) uptex.web uptex.ch tangle-sh @$(texmf_tangle) uptex uptex -# Extract ptex version -uptexdir/ptex_version.h: ptexdir/ptex-base.ch - $(MKDIR_P) uptexdir - grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \ - | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@ - # Extract uptex version -uptexdir/uptex_version.h: uptexdir/uptex-m.ch +uptexdir/uptex_version.h: uptexdir/uptex-m.ch ptexdir/ptex_version.h $(MKDIR_P) uptexdir grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \ | sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@ @@ -9983,30 +9959,6 @@ euptex.p euptex.pool: euptex-tangle euptex-tangle: tangle$(EXEEXT) euptex.web euptex.ch tangle-sh @$(texmf_tangle) euptex euptex -# Extract etex version -euptexdir/etex_version.h: etexdir/etex.ch - $(MKDIR_P) euptexdir - grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \ - | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ - -# Extract eptex version -euptexdir/eptex_version.h: eptexdir/eptex.ech - $(MKDIR_P) euptexdir - grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \ - | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@ - -# Extract ptex version -euptexdir/ptex_version.h: ptexdir/ptex-base.ch - $(MKDIR_P) euptexdir - grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \ - | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@ - -# Extract uptex version -euptexdir/uptex_version.h: uptexdir/uptex-m.ch - $(MKDIR_P) euptexdir - grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \ - | sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@ - # Generate euptex.web euptex.web: tie$(EXEEXT) $(euptex_web_srcs) $(tie) -m euptex.web $(euptex_web_srcs) @@ -10036,16 +9988,13 @@ 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.h: pdftexdir/pdftex.web - $(MKDIR_P) pdftexdir - grep '^@d eTeX_version_string==' $(srcdir)/pdftexdir/pdftex.web \ - | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ + # Extract pdftex version -pdftexdir/pdftex_version.h: pdftexdir/pdftex.web +pdftexdir/pdftex_version.h: pdftexdir/pdftex.web etexdir/etex_version.h $(MKDIR_P) pdftexdir grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \ | sed "s/^.*'-/#define PDFTEX_VERSION \"/;s/'.*$$/\"/" >$@ + # Generate pdftex.ch pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs) $(tie) -c pdftex.ch $(pdftex_ch_srcs) @@ -10294,12 +10243,7 @@ xetex.p xetex.pool: xetex-tangle xetex-tangle: ./otangle$(EXEEXT) xetex.web tangle-sh @$(o_tangle) xetex -xetexdir/etex_version.h: etexdir/etex.ch - $(MKDIR_P) xetexdir - grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \ - | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ - -xetexdir/xetex_version.h: xetexdir/xetex.ch +xetexdir/xetex_version.h: xetexdir/xetex.ch etexdir/etex_version.h $(MKDIR_P) xetexdir grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.ch \ | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@ diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog index e910461da6f..b60c268c1ac 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog +++ b/Build/source/texk/web2c/eptexdir/ChangeLog @@ -1,3 +1,8 @@ +2012-07-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/eptex.am: Distribute eptex_version.h. + * eptexextra.h: Use ../[ep]texdir/[ep]tex_version.h. + 2012-07-15 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * eptexextra.c: Must #define DLLPROC before reading eptexd.h. diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am index faa67bd22fa..efd5c9826f9 100644 --- a/Build/source/texk/web2c/eptexdir/am/eptex.am +++ b/Build/source/texk/web2c/eptexdir/am/eptex.am @@ -1,6 +1,6 @@ ## texk/web2c/eptexdir/am/eptex.am: Makefile fragment for e-pTeX. ## -## Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## e-pTeX @@ -24,11 +24,11 @@ eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependen # e-pTeX C sources eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h -nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c eptexdir/etex_version.h eptexdir/eptex_version.h eptexdir/ptex_version.h -dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h +nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c +dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h eptexdir/eptex_version.h -# We must create eptexd.h and eptexdir/[ep]tex_version.h before building the eptex_OBJECTS. -eptex_prereq = eptexd.h eptexdir/etex_version.h eptexdir/eptex_version.h eptexdir/ptex_version.h +# We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS. +eptex_prereq = eptexd.h eptexdir/eptex_version.h $(eptex_OBJECTS): $(eptex_prereq) $(eptex_c_h): eptex-web2c @@ -45,24 +45,12 @@ eptex.p eptex.pool: eptex-tangle eptex-tangle: tangle$(EXEEXT) eptex.web eptex.ch tangle-sh @$(texmf_tangle) eptex eptex -# Extract etex version -eptexdir/etex_version.h: etexdir/etex.ch - $(MKDIR_P) eptexdir - grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \ - | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ - # Extract eptex version -eptexdir/eptex_version.h: eptexdir/eptex.ech +eptexdir/eptex_version.h: eptexdir/eptex.ech etexdir/etex_version.h ptexdir/ptex_version.h $(MKDIR_P) eptexdir grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \ | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@ -# Extract ptex version -eptexdir/ptex_version.h: ptexdir/ptex-base.ch - $(MKDIR_P) eptexdir - grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \ - | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@ - # Generate eptex.web eptex.web: tie$(EXEEXT) $(eptex_web_srcs) $(tie) -m eptex.web $(eptex_web_srcs) diff --git a/Build/source/texk/web2c/eptexdir/eptex_version.h b/Build/source/texk/web2c/eptexdir/eptex_version.h new file mode 100644 index 00000000000..035875f90eb --- /dev/null +++ b/Build/source/texk/web2c/eptexdir/eptex_version.h @@ -0,0 +1 @@ +#define EPTEX_VERSION "110825" diff --git a/Build/source/texk/web2c/eptexdir/eptexextra.h b/Build/source/texk/web2c/eptexdir/eptexextra.h index e232e433d57..6b2b66d9993 100644 --- a/Build/source/texk/web2c/eptexdir/eptexextra.h +++ b/Build/source/texk/web2c/eptexdir/eptexextra.h @@ -3,9 +3,9 @@ This is included by e-pTeX, from eptexextra.c */ -#include <eptexdir/etex_version.h> /* for ETEX_VERSION */ +#include <etexdir/etex_version.h> /* for ETEX_VERSION */ #include <eptexdir/eptex_version.h> /* for EPTEX_VERSION */ -#include <eptexdir/ptex_version.h> /* for PTEX_VERSION */ +#include <ptexdir/ptex_version.h> /* for PTEX_VERSION */ #define BANNER "This is e-pTeX, Version 3.1415926-" PTEX_VERSION "-" EPTEX_VERSION "-" ETEX_VERSION #define COPYRIGHT_HOLDER "D.E. Knuth" diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index 419c3965027..b63ee0d8eb0 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,7 @@ +2012-07-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/etex.am: Distribute etex_version.h. + 2012-07-15 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * etexextra.c: Must #define DLLPROC before reading etexd.h. diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am index 70fc4072f34..008489086c4 100644 --- a/Build/source/texk/web2c/etexdir/am/etex.am +++ b/Build/source/texk/web2c/etexdir/am/etex.am @@ -17,8 +17,8 @@ etex_LDADD = $(LDADD) $(ipc_socketlibs) # e-TeX C sources etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h -nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexdir/etex_version.h -dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h +nodist_etex_SOURCES = $(etex_c_h) etex-pool.c +dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h etexdir/etex_version.h # We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS. etex_prereq = etexd.h etexdir/etex_version.h diff --git a/Build/source/texk/web2c/etexdir/etex_version.h b/Build/source/texk/web2c/etexdir/etex_version.h new file mode 100644 index 00000000000..1b85a39ff3a --- /dev/null +++ b/Build/source/texk/web2c/etexdir/etex_version.h @@ -0,0 +1 @@ +#define ETEX_VERSION "2.4" diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog index a1baedcfe4a..f1063a5b7cb 100644 --- a/Build/source/texk/web2c/euptexdir/ChangeLog +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,9 @@ +2012-07-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * euptexextra.h: Use the distributed files + ../{ep,e,p,up}texdir/{ep,e,p,up}tex_version.h. + * am/euptex.am: Adapted. + 2012-07-15 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * euptexextra.c: Must #define DLLPROC before reading euptexd.h. diff --git a/Build/source/texk/web2c/euptexdir/am/euptex.am b/Build/source/texk/web2c/euptexdir/am/euptex.am index 62b0e2f036d..584789a98d9 100644 --- a/Build/source/texk/web2c/euptexdir/am/euptex.am +++ b/Build/source/texk/web2c/euptexdir/am/euptex.am @@ -1,6 +1,6 @@ ## texk/web2c/euptexdir/am/euptex.am: Makefile fragment for e-upTeX. ## -## Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## e-upTeX @@ -24,13 +24,12 @@ euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_depend # e-upTeX C sources euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h -nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c euptexdir/etex_version.h \ - euptexdir/eptex_version.h euptexdir/ptex_version.h euptexdir/uptex_version.h -dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h +nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c +dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \ + eptexdir/eptex_version.h uptexdir/uptex_version.h -# We must create euptexd.h and euptexdir/*tex_version.h before building the euptex_OBJECTS. -euptex_prereq = euptexd.h euptexdir/etex_version.h euptexdir/eptex_version.h \ - euptexdir/ptex_version.h euptexdir/uptex_version.h +# We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS. +euptex_prereq = euptexd.h eptexdir/eptex_version.h uptexdir/uptex_version.h $(euptex_OBJECTS): $(euptex_prereq) $(euptex_c_h): euptex-web2c @@ -47,30 +46,6 @@ euptex.p euptex.pool: euptex-tangle euptex-tangle: tangle$(EXEEXT) euptex.web euptex.ch tangle-sh @$(texmf_tangle) euptex euptex -# Extract etex version -euptexdir/etex_version.h: etexdir/etex.ch - $(MKDIR_P) euptexdir - grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \ - | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ - -# Extract eptex version -euptexdir/eptex_version.h: eptexdir/eptex.ech - $(MKDIR_P) euptexdir - grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \ - | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@ - -# Extract ptex version -euptexdir/ptex_version.h: ptexdir/ptex-base.ch - $(MKDIR_P) euptexdir - grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \ - | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@ - -# Extract uptex version -euptexdir/uptex_version.h: uptexdir/uptex-m.ch - $(MKDIR_P) euptexdir - grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \ - | sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@ - # Generate euptex.web euptex.web: tie$(EXEEXT) $(euptex_web_srcs) $(tie) -m euptex.web $(euptex_web_srcs) diff --git a/Build/source/texk/web2c/euptexdir/euptexextra.h b/Build/source/texk/web2c/euptexdir/euptexextra.h index 6e9d4071c13..9fa305ba444 100644 --- a/Build/source/texk/web2c/euptexdir/euptexextra.h +++ b/Build/source/texk/web2c/euptexdir/euptexextra.h @@ -3,10 +3,10 @@ This is included by e-upTeX, from euptexextra.c */ -#include <euptexdir/eptex_version.h> /* for EPTEX_VERSION */ -#include <euptexdir/etex_version.h> /* for ETEX_VERSION */ -#include <euptexdir/ptex_version.h> /* for PTEX_VERSION */ -#include <euptexdir/uptex_version.h> /* for UPTEX_VERSION */ +#include <eptexdir/eptex_version.h> /* for EPTEX_VERSION */ +#include <etexdir/etex_version.h> /* for ETEX_VERSION */ +#include <ptexdir/ptex_version.h> /* for PTEX_VERSION */ +#include <uptexdir/uptex_version.h> /* for UPTEX_VERSION */ #define BANNER "This is e-upTeX, Version 3.1415926-" PTEX_VERSION "-" UPTEX_VERSION "-" EPTEX_VERSION "-" ETEX_VERSION #define COPYRIGHT_HOLDER "D.E. Knuth" diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 21a5aee2347..c60649ad239 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,12 @@ +2012-07-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/pdftex.am: Distribute pdftex_version.h. + * pdftexextra.h: Use ../etexdir/etex_version.h. + +2012-07-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * writejbig2.c: Use LONGINTEGER_PRI instead of LONGINTEGER_PRId. + 2012-07-15 Peter Breitenlohner <peb@mppmu.mpg.de> * ttf2afm.c: Pass program name string to kpse_set_program_name. diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am index 87ae3829202..5257b2f2fd5 100644 --- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am +++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am @@ -36,13 +36,12 @@ pdftex_LDADD = libpdftex.a $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs) pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a # We must create libpdftex.a etc before building the pdftex_OBJECTS. -pdftex_prereq = libpdftex.a pdftexdir/etex_version.h pdftexdir/pdftex_version.h +pdftex_prereq = libpdftex.a pdftexdir/pdftex_version.h $(pdftex_OBJECTS): $(pdftex_prereq) pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h -nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c \ - pdftexdir/etex_version.h pdftexdir/pdftex_version.h -dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h +nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c +dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h pdftexdir/pdftex_version.h $(pdftex_c_h): pdftex-web2c @$(web2c) pdftex pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines @@ -53,16 +52,13 @@ 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.h: pdftexdir/pdftex.web - $(MKDIR_P) pdftexdir - grep '^@d eTeX_version_string==' $(srcdir)/pdftexdir/pdftex.web \ - | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ + # Extract pdftex version -pdftexdir/pdftex_version.h: pdftexdir/pdftex.web +pdftexdir/pdftex_version.h: pdftexdir/pdftex.web etexdir/etex_version.h $(MKDIR_P) pdftexdir grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \ | sed "s/^.*'-/#define PDFTEX_VERSION \"/;s/'.*$$/\"/" >$@ + # Generate pdftex.ch pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs) $(tie) -c pdftex.ch $(pdftex_ch_srcs) diff --git a/Build/source/texk/web2c/pdftexdir/pdftex_version.h b/Build/source/texk/web2c/pdftexdir/pdftex_version.h new file mode 100644 index 00000000000..d29f4b295eb --- /dev/null +++ b/Build/source/texk/web2c/pdftexdir/pdftex_version.h @@ -0,0 +1 @@ +#define PDFTEX_VERSION "1.40.13" diff --git a/Build/source/texk/web2c/pdftexdir/pdftexextra.h b/Build/source/texk/web2c/pdftexdir/pdftexextra.h index 95635acc46d..7071b148123 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftexextra.h +++ b/Build/source/texk/web2c/pdftexdir/pdftexextra.h @@ -1,5 +1,5 @@ /* -Copyright 1996-2011 Han The Thanh, <thanh@pdftex.org> +Copyright 1996-2012 Han The Thanh, <thanh@pdftex.org> This file is part of pdfTeX. @@ -23,7 +23,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <pdftexdir/pdftex_version.h> /* for PDFTEX_VERSION */ -#include <pdftexdir/etex_version.h> /* for ETEX_VERSION */ +#include <etexdir/etex_version.h> /* for ETEX_VERSION */ #define BANNER "This is pdfTeX, Version 3.1415926-" ETEX_VERSION "-" PDFTEX_VERSION #define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)" diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index fb056210058..7de802b4815 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,7 @@ +2012-07-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/ptex.am: Distribute ptex_version.h. + 2012-07-17 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp> * ptex-base.ch: fix a bug in diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am index b9490f414f9..f7504bed30f 100644 --- a/Build/source/texk/web2c/ptexdir/am/ptex.am +++ b/Build/source/texk/web2c/ptexdir/am/ptex.am @@ -1,6 +1,6 @@ ## texk/web2c/ptexdir/am/ptex.am: Makefile fragment for pTeX. ## -## Copyright (C) 2010-2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2010-2012 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) @@ -56,8 +56,8 @@ ptex_DEPENDENCIES = $(ptex_dependencies) # pTeX C sources ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h -nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c ptexdir/ptex_version.h -dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h +nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c +dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h ptexdir/ptex_version.h # We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS. ptex_prereq = ptexd.h ptexdir/ptex_version.h diff --git a/Build/source/texk/web2c/ptexdir/ptex_version.h b/Build/source/texk/web2c/ptexdir/ptex_version.h new file mode 100644 index 00000000000..09a7c22ecbe --- /dev/null +++ b/Build/source/texk/web2c/ptexdir/ptex_version.h @@ -0,0 +1 @@ +#define PTEX_VERSION "p3.3" diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index cd0fe9635e3..1c5d907ce4d 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,8 @@ +2012-07-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/uptex.am: Distribute uptex_version.h. + * uptexextra.h: Use ../ptexdir/ptex_version.h. + 2012-07-15 Peter Breitenlohner <peb@mppmu.mpg.de> * upbibtex.ch, updvitype.ch, uppltotf.ch, uptftopl.ch: diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am index af5f328991f..ee43eb2bcb6 100644 --- a/Build/source/texk/web2c/uptexdir/am/uptex.am +++ b/Build/source/texk/web2c/uptexdir/am/uptex.am @@ -1,6 +1,6 @@ ## texk/web2c/uptexdir/am/uptex.am: Makefile fragment for upTeX. ## -## Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) @@ -46,11 +46,11 @@ uptex_DEPENDENCIES = $(uptex_dependencies) # upTeX C sources uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h -nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c uptexdir/ptex_version.h uptexdir/uptex_version.h -dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h +nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c +dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h uptexdir/uptex_version.h -# We must create uptexd.h and uptexdir/*ptex_version.h before building the uptex_OBJECTS. -uptex_prereq = uptexd.h uptexdir/ptex_version.h uptexdir/uptex_version.h +# We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS. +uptex_prereq = uptexd.h uptexdir/uptex_version.h $(uptex_OBJECTS): $(uptex_prereq) $(uptex_c_h): uptex-web2c @@ -67,14 +67,8 @@ uptex.p uptex.pool: uptex-tangle uptex-tangle: tangle$(EXEEXT) uptex.web uptex.ch tangle-sh @$(texmf_tangle) uptex uptex -# Extract ptex version -uptexdir/ptex_version.h: ptexdir/ptex-base.ch - $(MKDIR_P) uptexdir - grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \ - | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@ - # Extract uptex version -uptexdir/uptex_version.h: uptexdir/uptex-m.ch +uptexdir/uptex_version.h: uptexdir/uptex-m.ch ptexdir/ptex_version.h $(MKDIR_P) uptexdir grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \ | sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@ diff --git a/Build/source/texk/web2c/uptexdir/uptex_version.h b/Build/source/texk/web2c/uptexdir/uptex_version.h new file mode 100644 index 00000000000..3befc4d32dd --- /dev/null +++ b/Build/source/texk/web2c/uptexdir/uptex_version.h @@ -0,0 +1 @@ +#define UPTEX_VERSION "u1.10" diff --git a/Build/source/texk/web2c/uptexdir/uptexextra.h b/Build/source/texk/web2c/uptexdir/uptexextra.h index 833a82ce3b9..63d72b85f49 100644 --- a/Build/source/texk/web2c/uptexdir/uptexextra.h +++ b/Build/source/texk/web2c/uptexdir/uptexextra.h @@ -3,7 +3,7 @@ This is included by upTeX, from uptexextra.c */ -#include <uptexdir/ptex_version.h> /* for PTEX_VERSION */ +#include <ptexdir/ptex_version.h> /* for PTEX_VERSION */ #include <uptexdir/uptex_version.h> /* for UPTEX_VERSION */ #define BANNER "This is upTeX, Version 3.1415926-" PTEX_VERSION "-" UPTEX_VERSION diff --git a/Build/source/texk/web2c/w2c/config.h b/Build/source/texk/web2c/w2c/config.h index 5e2d60e1daa..21394181bf8 100644 --- a/Build/source/texk/web2c/w2c/config.h +++ b/Build/source/texk/web2c/w2c/config.h @@ -75,18 +75,18 @@ typedef INTEGER_TYPE integer; /* We need a type that's at least off_t wide */ typedef off_t longinteger; +/* To print file offsets we cast them to `LONGINTEGER_TYPE' (or + `unsigned LONGINTEGER_TYPE') and use the conversion specifier + `"%" LONGINTEGER_PRI "d"' (or `"%" LONGINTEGER_PRI "u"'). */ #if defined(WIN32) && !defined(__MINGW32__) #define LONGINTEGER_TYPE __int64 -#define LONGINTEGER_PRId "I64d" -#define LONGINTEGER_PRIi "I64i" +#define LONGINTEGER_PRI "I64" #elif SIZEOF_LONG < SIZEOF_OFF_T #define LONGINTEGER_TYPE long long -#define LONGINTEGER_PRId "lld" -#define LONGINTEGER_PRIi "lli" +#define LONGINTEGER_PRI "ll" #else #define LONGINTEGER_TYPE long -#define LONGINTEGER_PRId "ld" -#define LONGINTEGER_PRIi "li" +#define LONGINTEGER_PRI "l" #endif /* I don't want to write a configure test for remove when all Unix diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index f979845db31..9867da18c04 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -1,3 +1,8 @@ +2012-07-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/xetex.am: Distribute xetex_version.h. + * xetexextra.h: Use ../etexdir/etex_version.h. + 2012-06-25 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * xetex.ch: XeTeX uses 256 math font families. diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am index 6eeb13efb25..90a0a62cd89 100644 --- a/Build/source/texk/web2c/xetexdir/am/xetex.am +++ b/Build/source/texk/web2c/xetexdir/am/xetex.am @@ -63,14 +63,13 @@ xetex_CXXFLAGS = # $(WARNING_CXXFLAGS) xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs) # We must create libxetex.a etc before building the xetex_OBJECTS -xetex_prereq = $(libxetex) xetexdir/etex_version.h xetexdir/xetex_version.h +xetex_prereq = $(libxetex) xetexdir/xetex_version.h $(xetex_OBJECTS): $(xetex_prereq) ## XeTeX C sources xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h -nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c \ - xetexdir/etex_version.h xetexdir/xetex_version.h -dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h +nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c +dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h xetexdir/xetex_version.h $(xetex_c_h): xetex-web2c @$(web2c) xetex @@ -86,14 +85,8 @@ xetex.p xetex.pool: xetex-tangle xetex-tangle: ./otangle$(EXEEXT) xetex.web tangle-sh @$(o_tangle) xetex -## Extract etex version -xetexdir/etex_version.h: etexdir/etex.ch - $(MKDIR_P) xetexdir - grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \ - | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ - ## Extract xetex version -xetexdir/xetex_version.h: xetexdir/xetex.ch +xetexdir/xetex_version.h: xetexdir/xetex.ch etexdir/etex_version.h $(MKDIR_P) xetexdir grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.ch \ | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@ diff --git a/Build/source/texk/web2c/xetexdir/xetex_version.h b/Build/source/texk/web2c/xetexdir/xetex_version.h new file mode 100644 index 00000000000..50695ee64c8 --- /dev/null +++ b/Build/source/texk/web2c/xetexdir/xetex_version.h @@ -0,0 +1 @@ +#define XETEX_VERSION "0.9998" diff --git a/Build/source/texk/web2c/xetexdir/xetexextra.h b/Build/source/texk/web2c/xetexdir/xetexextra.h index 6adccef578e..75b77ce26b2 100644 --- a/Build/source/texk/web2c/xetexdir/xetexextra.h +++ b/Build/source/texk/web2c/xetexdir/xetexextra.h @@ -53,7 +53,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <xetexdir/etex_version.h> /* for ETEX_VERSION */ +#include <etexdir/etex_version.h> /* for ETEX_VERSION */ #include <xetexdir/xetex_version.h> /* for XETEX_VERSION */ #define BANNER "This is XeTeX, Version 3.1415926-" ETEX_VERSION "-" XETEX_VERSION |