summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Build/source/texk/web2c/Makefile.in36
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/pdftex.am11
-rw-r--r--Build/source/texk/web2c/pdftexdir/etex_version.h1
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftexextra.h2
-rw-r--r--Build/source/texk/web2c/xetexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/xetexdir/am/xetex.am13
-rw-r--r--Build/source/texk/web2c/xetexdir/etex_version.h1
-rw-r--r--Build/source/texk/web2c/xetexdir/xetexextra.h2
9 files changed, 59 insertions, 17 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index d55848f30e0..201ffa7293b 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -903,8 +903,9 @@ am__DEPENDENCIES_8 = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_2)
am__dist_pdftex_SOURCES_DIST = pdftexdir/pdftexextra.c \
pdftexdir/pdftexextra.h pdftexdir/pdftex_version.h \
- synctexdir/synctex.c synctexdir/synctex.h \
- synctexdir/synctex-common.h synctexdir/synctex-pdftex.h
+ pdftexdir/etex_version.h synctexdir/synctex.c \
+ synctexdir/synctex.h synctexdir/synctex-common.h \
+ synctexdir/synctex-pdftex.h
@PDFTEX_SYNCTEX_TRUE@am__objects_17 = \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/pdftex-synctex.$(OBJEXT)
dist_pdftex_OBJECTS = pdftexdir/pdftex-pdftexextra.$(OBJEXT) \
@@ -1037,9 +1038,10 @@ 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 xetexdir/xetex_version.h \
- synctexdir/synctex.c synctexdir/synctex.h \
- synctexdir/synctex-common.h synctexdir/synctex-xetex.h
+ xetexdir/xetexextra.h xetexdir/etex_version.h \
+ xetexdir/xetex_version.h synctexdir/synctex.c \
+ synctexdir/synctex.h synctexdir/synctex-common.h \
+ synctexdir/synctex-xetex.h
@XETEX_SYNCTEX_TRUE@am__objects_25 = \
@XETEX_SYNCTEX_TRUE@ synctexdir/xetex-synctex.$(OBJEXT)
dist_xetex_OBJECTS = xetexdir/xetex-xetexextra.$(OBJEXT) \
@@ -2449,11 +2451,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 etexdir/etex_version.h pdftexdir/pdftex_version.h
+pdftex_prereq = libpdftex.a pdftexdir/etex_version.h pdftexdir/pdftex_version.h
pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c
dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
- pdftexdir/pdftex_version.h $(am__append_107)
+ pdftexdir/pdftex_version.h pdftexdir/etex_version.h \
+ $(am__append_107)
pdftex_ch_srcs = \
pdftexdir/pdftex.web \
pdftexdir/tex.ch0 \
@@ -2921,11 +2924,12 @@ 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) etexdir/etex_version.h xetexdir/xetex_version.h
+xetex_prereq = $(libxetex) xetexdir/etex_version.h xetexdir/xetex_version.h
xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c
dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
- xetexdir/xetex_version.h $(am__append_109)
+ xetexdir/etex_version.h xetexdir/xetex_version.h \
+ $(am__append_109)
xetex_ch_srcs = \
xetexdir/xetex.web \
xetexdir/tex.ch0 \
@@ -11115,6 +11119,12 @@ pdftexdir/pdftex_version.h: pdftexdir/pdftex.web
$(AM_V_GEN)grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \
| sed "s/^.*'-/#define PDFTEX_VERSION \"/;s/'.*$$/\"/" >$@
+# Extract etex version
+pdftexdir/etex_version.h: pdftexdir/pdftex.web
+ $(AM_V_at)$(MKDIR_P) pdftexdir
+ $(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)
$(tie) -c pdftex.ch $(pdftex_ch_srcs)
@@ -11363,7 +11373,13 @@ xetex.p xetex.pool: xetex-tangle
xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex.ch tangle-sh
@$(xe_tangle) xetex xetex
-xetexdir/xetex_version.h: xetexdir/xetex.ch
+# Extract etex version
+xetexdir/etex_version.h: xetexdir/xetex.web
+ $(AM_V_at)$(MKDIR_P) xetexdir
+ $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/xetexdir/xetex.web \
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+xetexdir/xetex_version.h: xetexdir/xetex.web
$(AM_V_at)$(MKDIR_P) xetexdir
$(AM_V_GEN)grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.web \
| sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 6b1853df9f4..a79bae53318 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-23 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * etex_version.h: New file extracted from pdftex.web.
+ * am/pdftex.am, pdftexextra.h: Adjust.
+
2013-01-28 Peter Breitenlohner <peb@mppmu.mpg.de>
* utils.c: Include <w2c/config.h> first for large file support.
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index 26f0296b476..267d3f905db 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -33,12 +33,13 @@ 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 etexdir/etex_version.h pdftexdir/pdftex_version.h
+pdftex_prereq = libpdftex.a pdftexdir/etex_version.h 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
-dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h pdftexdir/pdftex_version.h
+dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
+ pdftexdir/pdftex_version.h pdftexdir/etex_version.h
$(pdftex_c_h): pdftex-web2c
@$(web2c) pdftex
pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines
@@ -56,6 +57,12 @@ pdftexdir/pdftex_version.h: pdftexdir/pdftex.web
$(AM_V_GEN)grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \
| sed "s/^.*'-/#define PDFTEX_VERSION \"/;s/'.*$$/\"/" >$@
+# Extract etex version
+pdftexdir/etex_version.h: pdftexdir/pdftex.web
+ $(AM_V_at)$(MKDIR_P) pdftexdir
+ $(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)
$(tie) -c pdftex.ch $(pdftex_ch_srcs)
diff --git a/Build/source/texk/web2c/pdftexdir/etex_version.h b/Build/source/texk/web2c/pdftexdir/etex_version.h
new file mode 100644
index 00000000000..718a5756b3a
--- /dev/null
+++ b/Build/source/texk/web2c/pdftexdir/etex_version.h
@@ -0,0 +1 @@
+#define ETEX_VERSION "2.5"
diff --git a/Build/source/texk/web2c/pdftexdir/pdftexextra.h b/Build/source/texk/web2c/pdftexdir/pdftexextra.h
index 7071b148123..506e8d72278 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftexextra.h
+++ b/Build/source/texk/web2c/pdftexdir/pdftexextra.h
@@ -23,7 +23,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <pdftexdir/pdftex_version.h> /* for PDFTEX_VERSION */
-#include <etexdir/etex_version.h> /* for ETEX_VERSION */
+#include <pdftexdir/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/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index 1b31ccb6530..fce864327f3 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-23 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * etex_version.h: New file extracted from xetex.web.
+ * am/xetex.am, xetexextra.h: Adjust.
+
2013-02-03 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* XeTeX_ext.c: (W32) change to match the simplified win32_popen.
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index 648b89a9b9f..58c88b8117c 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -57,13 +57,14 @@ 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) etexdir/etex_version.h xetexdir/xetex_version.h
+xetex_prereq = $(libxetex) xetexdir/etex_version.h 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
-dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h xetexdir/xetex_version.h
+dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
+ xetexdir/etex_version.h xetexdir/xetex_version.h
$(xetex_c_h): xetex-web2c
@$(web2c) xetex
@@ -79,8 +80,14 @@ xetex.p xetex.pool: xetex-tangle
xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex.ch tangle-sh
@$(xe_tangle) xetex xetex
+# Extract etex version
+xetexdir/etex_version.h: xetexdir/xetex.web
+ $(AM_V_at)$(MKDIR_P) xetexdir
+ $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/xetexdir/xetex.web \
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
+
## Extract xetex version
-xetexdir/xetex_version.h: xetexdir/xetex.ch
+xetexdir/xetex_version.h: xetexdir/xetex.web
$(AM_V_at)$(MKDIR_P) xetexdir
$(AM_V_GEN)grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.web \
| sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@
diff --git a/Build/source/texk/web2c/xetexdir/etex_version.h b/Build/source/texk/web2c/xetexdir/etex_version.h
new file mode 100644
index 00000000000..718a5756b3a
--- /dev/null
+++ b/Build/source/texk/web2c/xetexdir/etex_version.h
@@ -0,0 +1 @@
+#define ETEX_VERSION "2.5"
diff --git a/Build/source/texk/web2c/xetexdir/xetexextra.h b/Build/source/texk/web2c/xetexdir/xetexextra.h
index 31f47e5fe87..3033735200d 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 <etexdir/etex_version.h> /* for ETEX_VERSION */
+#include <xetexdir/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 "-" XETEX_BUILD_DATE
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-14 10:02:24 +0000