Skip to content

Commit

Permalink
remove eptex building environment (#32)
Browse files Browse the repository at this point in the history
  • Loading branch information
t-tk committed Apr 13, 2024
1 parent d03c9b9 commit efc51c1
Show file tree
Hide file tree
Showing 9 changed files with 283 additions and 648 deletions.
3 changes: 0 additions & 3 deletions source/texk/web2c/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,6 @@ include $(srcdir)/etexdir/am/etex.am
## pTeX
include $(srcdir)/ptexdir/am/ptex.am

## e-pTeX
include $(srcdir)/eptexdir/am/eptex.am

## upTeX
include $(srcdir)/uptexdir/am/uptex.am

Expand Down
802 changes: 273 additions & 529 deletions source/texk/web2c/Makefile.in

Large diffs are not rendered by default.

68 changes: 0 additions & 68 deletions source/texk/web2c/configure
Original file line number Diff line number Diff line change
Expand Up @@ -828,10 +828,6 @@ UPTEX_SYNCTEX_FALSE
UPTEX_SYNCTEX_TRUE
UPTEX_FALSE
UPTEX_TRUE
EPTEX_SYNCTEX_FALSE
EPTEX_SYNCTEX_TRUE
EPTEX_FALSE
EPTEX_TRUE
PTEX_SYNCTEX_FALSE
PTEX_SYNCTEX_TRUE
PTEX_FALSE
Expand Down Expand Up @@ -1035,8 +1031,6 @@ enable_etex
enable_etex_synctex
enable_ptex
enable_ptex_synctex
enable_eptex
enable_eptex_synctex
enable_uptex
enable_uptex_synctex
enable_euptex
Expand Down Expand Up @@ -1782,8 +1776,6 @@ Optional Features:
--disable-etex-synctex build e-TeX without SyncTeX support
--enable-ptex compile and install pTeX
--disable-ptex-synctex build pTeX without SyncTeX support
--enable-eptex compile and install e-pTeX
--disable-eptex-synctex build e-pTeX without SyncTeX support
--enable-uptex compile and install upTeX
--disable-uptex-synctex build upTeX without SyncTeX support
--disable-euptex do not compile and install e-upTeX
Expand Down Expand Up @@ -20294,28 +20286,6 @@ test "x$enable_web2c:$enable_ptex" = xyes:yes && {
need_ptexenc=yes
need_zlib=yes
}
# Check whether --enable-eptex was given.
if test ${enable_eptex+y}
then :
enableval=$enable_eptex;
fi
case $enable_eptex in #(
yes | no) :
;; #(
*) :
enable_eptex=no ;;
esac

# Check whether --enable-eptex-synctex was given.
if test ${enable_eptex_synctex+y}
then :
enableval=$enable_eptex_synctex;
fi

test "x$enable_web2c:$enable_eptex" = xyes:yes && {
need_ptexenc=yes
need_zlib=yes
}
# Check whether --enable-uptex was given.
if test ${enable_uptex+y}
then :
Expand Down Expand Up @@ -23097,36 +23067,6 @@ esac
else
PTEX_SYNCTEX_TRUE='#'
PTEX_SYNCTEX_FALSE=
fi
if test "x$enable_eptex" = xyes; then
EPTEX_TRUE=
EPTEX_FALSE='#'
else
EPTEX_TRUE='#'
EPTEX_FALSE=
fi

case $enable_native_texlive_build:$enable_eptex_synctex in #(
yes:yes | no:yes | no:no) :
;; #(
*) :
if test -z "$enable_eptex_synctex"
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-eptex-synctex=yes'" >&5
printf "%s\n" "$as_me: Assuming \`--enable-eptex-synctex=yes'" >&6;}
else case e in #(
e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-eptex-synctex=yes' (native TeX Live build)" >&5
printf "%s\n" "$as_me: WARNING: Enforcing \`--enable-eptex-synctex=yes' (native TeX Live build)" >&2;} ;;
esac
fi
enable_eptex_synctex=yes ;;
esac
if test "x$enable_eptex_synctex" = xyes; then
EPTEX_SYNCTEX_TRUE=
EPTEX_SYNCTEX_FALSE='#'
else
EPTEX_SYNCTEX_TRUE='#'
EPTEX_SYNCTEX_FALSE=
fi
if test "x$enable_uptex" = xyes; then
UPTEX_TRUE=
Expand Down Expand Up @@ -29262,14 +29202,6 @@ if test -z "${PTEX_SYNCTEX_TRUE}" && test -z "${PTEX_SYNCTEX_FALSE}"; then
as_fn_error $? "conditional \"PTEX_SYNCTEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${EPTEX_TRUE}" && test -z "${EPTEX_FALSE}"; then
as_fn_error $? "conditional \"EPTEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${EPTEX_SYNCTEX_TRUE}" && test -z "${EPTEX_SYNCTEX_FALSE}"; then
as_fn_error $? "conditional \"EPTEX_SYNCTEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${UPTEX_TRUE}" && test -z "${UPTEX_FALSE}"; then
as_fn_error $? "conditional \"UPTEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
Expand Down
2 changes: 0 additions & 2 deletions source/texk/web2c/euptexdir/am/euptex.am
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@ bin_PROGRAMS += euptex
if !UPTEX
bin_links += euptex$(EXEEXT):uptex
endif !UPTEX
if !EPTEX
bin_links += euptex$(EXEEXT):eptex
if !PTEX
bin_links += euptex$(EXEEXT):ptex
endif !PTEX
endif !EPTEX
endif EUPTEX
EXTRA_PROGRAMS += euptex

Expand Down
4 changes: 2 additions & 2 deletions source/texk/web2c/lib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ AM_CFLAGS = $(WARNING_CFLAGS)
@KPATHSEA_RULE@

noinst_LIBRARIES = lib.a
if EPTEX
if EUPTEX
noinst_LIBRARIES += libp.a
endif EPTEX
endif EUPTEX
EXTRA_LIBRARIES = libp.a

## We don't compile `texmfmp.c'; this file is included from 'texextra.c'
Expand Down
2 changes: 1 addition & 1 deletion source/texk/web2c/lib/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@EPTEX_TRUE@am__append_1 = libp.a
@EUPTEX_TRUE@am__append_1 = libp.a
subdir = lib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
Expand Down
4 changes: 2 additions & 2 deletions source/texk/web2c/man/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ endif PDFTEX
pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man
EXTRA_DIST += $(pdftex_man_sources)

if EPTEX
if EUPTEX
man_sources += ptex.man
man1_links += ptex:eptex ptex:euptex ptex:uptex
man_sources += ppltotf.man ptftopl.man
man1_links += ppltotf:uppltotf ptftopl:uptftopl
man_sources += pbibtex.man
man1_links += pbibtex:upbibtex
endif EPTEX
endif EUPTEX
EXTRA_DIST += ptex.man ppltotf.man ptftopl.man pbibtex.man

if LUATEX
Expand Down
9 changes: 5 additions & 4 deletions source/texk/web2c/man/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,11 @@ host_triplet = @host@
@ETEX_TRUE@am__append_9 = etex.man
@PDFTEX_TRUE@am__append_10 = $(pdftex_man_sources)
@PDFTEX_TRUE@am__append_11 = pdftex:pdflatex
@EPTEX_TRUE@am__append_12 = ptex.man ppltotf.man ptftopl.man \
@EPTEX_TRUE@ pbibtex.man
@EPTEX_TRUE@am__append_13 = ptex:eptex ptex:euptex ptex:uptex \
@EPTEX_TRUE@ ppltotf:uppltotf ptftopl:uptftopl pbibtex:upbibtex
@EUPTEX_TRUE@am__append_12 = ptex.man ppltotf.man ptftopl.man \
@EUPTEX_TRUE@ pbibtex.man
@EUPTEX_TRUE@am__append_13 = ptex:eptex ptex:euptex ptex:uptex \
@EUPTEX_TRUE@ ppltotf:uppltotf ptftopl:uptftopl \
@EUPTEX_TRUE@ pbibtex:upbibtex
@LUATEX_TRUE@am__append_14 = luatex.man
@LUATEX_TRUE@am__append_15 = luatex:texlua luatex:texluac \
@LUATEX_TRUE@ luatex:luahbtex luatex:luajittex \
Expand Down
37 changes: 0 additions & 37 deletions source/texk/web2c/synctexdir/am/synctex.am
Original file line number Diff line number Diff line change
Expand Up @@ -151,43 +151,6 @@ EXTRA_DIST += \
synctexdir/synctex-e-mem.ch1 \
synctexdir/synctex-e-rec.ch0

## SyncTeX infrastructure: e-pTeX

if EPTEX_SYNCTEX

eptex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)

eptex_LDADD += $(ZLIB_LIBS)
eptex_prereq += $(ZLIB_DEPEND)

eptex_ch_synctex = \
synctexdir/synctex-def.ch0 \
synctexdir/synctex-ep-mem.ch0 \
synctexdir/synctex-mem.ch0 \
synctexdir/synctex-e-mem.ch0 \
synctexdir/synctex-ep-mem.ch1 \
synctexdir/synctex-p-rec.ch0 \
synctexdir/synctex-rec.ch0 \
synctexdir/synctex-rec.ch1 \
synctexdir/synctex-ep-rec.ch0 \
synctexdir/synctex-e-rec.ch0 \
synctexdir/synctex-p-rec.ch1

dist_eptex_SOURCES += \
synctexdir/synctex.c \
synctexdir/synctex.h \
synctexdir/synctex-common.h \
synctexdir/synctex-eptex.h

eptex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"

endif EPTEX_SYNCTEX

EXTRA_DIST += \
synctexdir/synctex-ep-mem.ch0 \
synctexdir/synctex-ep-mem.ch1 \
synctexdir/synctex-ep-rec.ch0

## SyncTeX infrastructure: e-upTeX

if EUPTEX_SYNCTEX
Expand Down

0 comments on commit efc51c1

Please sign in to comment.