summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-12-20 07:07:04 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-12-20 07:07:04 +0000
commit46500586978b361422a73168b912a0e151111885 (patch)
treead91bc81ec6d88ccb8803fefd9f08942cfbdd3e4 /Build/source/texk
parentcbd8755638a860c159a2f1b31037bd769a068090 (diff)
WIN32: check shell scripts
git-svn-id: svn://tug.org/texlive/trunk@20812 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/makeindexk/ChangeLog4
-rw-r--r--Build/source/texk/makeindexk/Makefile.am4
-rw-r--r--Build/source/texk/makeindexk/Makefile.in9
-rw-r--r--Build/source/texk/makeindexk/aclocal.m41
-rwxr-xr-xBuild/source/texk/makeindexk/configure61
-rw-r--r--Build/source/texk/makeindexk/configure.ac5
-rw-r--r--Build/source/texk/tetex/ChangeLog5
-rw-r--r--Build/source/texk/tetex/Makefile.am1
-rw-r--r--Build/source/texk/tetex/Makefile.in1
-rw-r--r--Build/source/texk/tetex/ps4pdf133
-rw-r--r--Build/source/texk/web2c/otps/ChangeLog4
-rw-r--r--Build/source/texk/web2c/otps/Makefile.am4
-rw-r--r--Build/source/texk/web2c/otps/Makefile.in2
13 files changed, 92 insertions, 142 deletions
diff --git a/Build/source/texk/makeindexk/ChangeLog b/Build/source/texk/makeindexk/ChangeLog
index 8eb102ffb94..de28d43a7be 100644
--- a/Build/source/texk/makeindexk/ChangeLog
+++ b/Build/source/texk/makeindexk/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am, configure.ac [WIN32]: Skip mkindex shell script.
+
2010-11-02 Taco Hoekwater <taco@elvenkind.com>
* mkind.c (mk_getc): new fn to accept both LF and CRLF.
diff --git a/Build/source/texk/makeindexk/Makefile.am b/Build/source/texk/makeindexk/Makefile.am
index a4344594224..c20b110de79 100644
--- a/Build/source/texk/makeindexk/Makefile.am
+++ b/Build/source/texk/makeindexk/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/makeindexk/
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -9,7 +9,9 @@ INCLUDES = $(KPATHSEA_INCLUDES)
AM_CPPFLAGS = -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
+if !WIN32
dist_bin_SCRIPTS = mkindex
+endif !WIN32
bin_PROGRAMS = makeindex
diff --git a/Build/source/texk/makeindexk/Makefile.in b/Build/source/texk/makeindexk/Makefile.in
index e0a87ce261c..ff1aaa445df 100644
--- a/Build/source/texk/makeindexk/Makefile.in
+++ b/Build/source/texk/makeindexk/Makefile.in
@@ -37,8 +37,9 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = makeindex$(EXEEXT)
subdir = .
-DIST_COMMON = README $(am__configure_deps) $(dist_bin_SCRIPTS) \
- $(dist_man1_MANS) $(srcdir)/../../build-aux/config.guess \
+DIST_COMMON = README $(am__configure_deps) \
+ $(am__dist_bin_SCRIPTS_DIST) $(dist_man1_MANS) \
+ $(srcdir)/../../build-aux/config.guess \
$(srcdir)/../../build-aux/config.sub \
$(srcdir)/../../build-aux/depcomp \
$(srcdir)/../../build-aux/install-sh \
@@ -54,6 +55,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
+ $(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/libtool.m4 \
$(top_srcdir)/../../m4/ltoptions.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
@@ -78,6 +80,7 @@ makeindex_OBJECTS = $(am_makeindex_OBJECTS)
makeindex_LDADD = $(LDADD)
am__DEPENDENCIES_1 =
makeindex_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__dist_bin_SCRIPTS_DIST = mkindex
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -254,7 +257,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
INCLUDES = $(KPATHSEA_INCLUDES)
AM_CPPFLAGS = -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
-dist_bin_SCRIPTS = mkindex
+@WIN32_FALSE@dist_bin_SCRIPTS = mkindex
makeindex_SOURCES = \
genind.c \
genind.h \
diff --git a/Build/source/texk/makeindexk/aclocal.m4 b/Build/source/texk/makeindexk/aclocal.m4
index d77f3a9c0b1..2e8f28004fa 100644
--- a/Build/source/texk/makeindexk/aclocal.m4
+++ b/Build/source/texk/makeindexk/aclocal.m4
@@ -992,6 +992,7 @@ AC_SUBST([am__untar])
m4_include([../../m4/kpse-common.m4])
m4_include([../../m4/kpse-kpathsea-flags.m4])
m4_include([../../m4/kpse-warnings.m4])
+m4_include([../../m4/kpse-win32.m4])
m4_include([../../m4/libtool.m4])
m4_include([../../m4/ltoptions.m4])
m4_include([../../m4/ltsugar.m4])
diff --git a/Build/source/texk/makeindexk/configure b/Build/source/texk/makeindexk/configure
index ae4a8b2846e..00c2f3ee26d 100755
--- a/Build/source/texk/makeindexk/configure
+++ b/Build/source/texk/makeindexk/configure
@@ -616,6 +616,8 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+WIN32_FALSE
+WIN32_TRUE
KPATHSEA_RULE
KPATHSEA_DEPEND
KPATHSEA_LIBS
@@ -14039,6 +14041,61 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
+$as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
+if ${kpse_cv_have_win32+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef WIN32
+ choke me
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef __MINGW32__
+ choke me
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ kpse_cv_have_win32=mingw32
+else
+ kpse_cv_have_win32=native
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ kpse_cv_have_win32=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5
+$as_echo "$kpse_cv_have_win32" >&6; }
+
+ if test "x$kpse_cv_have_win32" != xno; then
+ WIN32_TRUE=
+ WIN32_FALSE='#'
+else
+ WIN32_TRUE='#'
+ WIN32_FALSE=
+fi
+
+
ac_config_files="$ac_config_files Makefile"
@@ -14171,6 +14228,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
+ as_fn_error $? "conditional \"WIN32\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
diff --git a/Build/source/texk/makeindexk/configure.ac b/Build/source/texk/makeindexk/configure.ac
index f8a2434dd7d..af6ca3f61fe 100644
--- a/Build/source/texk/makeindexk/configure.ac
+++ b/Build/source/texk/makeindexk/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -26,6 +26,9 @@ AC_CHECK_FUNCS([strchr strrchr setlocale])
KPSE_KPATHSEA_FLAGS
+KPSE_CHECK_WIN32
+AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
+
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index 76cef281725..54005de9eca 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * ps4pdf: Removed, replaced by newer version under ../texlive/.
+ * Makefile.am: Adapted.
+
2010-12-18 Peter Breitenlohner <peb@mppmu.mpg.de>
* context/texmfstart.man: Fix typo.
diff --git a/Build/source/texk/tetex/Makefile.am b/Build/source/texk/tetex/Makefile.am
index 5e3ce60c95e..b8670a60b3b 100644
--- a/Build/source/texk/tetex/Makefile.am
+++ b/Build/source/texk/tetex/Makefile.am
@@ -16,7 +16,6 @@ dist_bin_SCRIPTS = \
kpsetool \
kpsewhere \
ps2frag \
- ps4pdf \
pslatex \
rubibtex \
rumakeindex \
diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in
index fa1496cebfb..906d0b5aea6 100644
--- a/Build/source/texk/tetex/Makefile.in
+++ b/Build/source/texk/tetex/Makefile.in
@@ -196,7 +196,6 @@ dist_bin_SCRIPTS = \
kpsetool \
kpsewhere \
ps2frag \
- ps4pdf \
pslatex \
rubibtex \
rumakeindex \
diff --git a/Build/source/texk/tetex/ps4pdf b/Build/source/texk/tetex/ps4pdf
deleted file mode 100644
index cbdcb022926..00000000000
--- a/Build/source/texk/tetex/ps4pdf
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2004, Thomas Esser. Public domain.
-# 2005-03-08: New option "--crop", Rolf Niepraschk.
-# dvips call only if the dvi file exist (RN).
-# 2005-06-27: ps2pdf call only if the ps file exist (RN).
-# 2006-04-05: "\RequirePackage{pst-pdf}" added to the (pdf)LaTeX calls
-# as suggested by Niall Murphy.
-# 2006-07-14: Better temp dir handling (suggested by Karl Berry) (RN).
-# 2006-07-23: New option --Xps2pdf and code cleanup (thanks to Karl Berry) (RN).
-
-# First, work around bugs/limitations in some shells on some systems:
-test -f /bin/sh5 && test -z "$RUNNING_SH5" \
- && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
- && { RUNNING_SH5=true; export RUNNING_SH5; exec /bin/sh5 $0 ${1+"$@"}; }
-unset RUNNING_SH5
-
-test -f /bin/bsh && test -z "$RUNNING_BSH" \
- && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
- && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
-unset RUNNING_BSH
-
-# hack around a bug in zsh:
-test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-
-###############################################################################
-# cleanup()
-# clean up the temp area and exit with proper exit status
-###############################################################################
-cleanup()
-{
- rc=$?
- $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
- && { rm -f "$tmpdir"/*; cd /; rmdir "$tmpdir"; }
-
- # set exit code in a portable way; see the autoconf manual for details:
- (exit $rc); exit $rc
-}
-
-###############################################################################
-# setupTmpDir()
-# set up a temp directory and a trap to remove it
-###############################################################################
-setupTmpDir()
-{
- $needsCleanup && return
-
- trap 'cleanup' 1 2 3 7 13 15
- needsCleanup=true
- (umask 077; mkdir "$tmpdir") \
- || abort "could not create directory \`$tmpdir'"
-}
-###############################################################################
-# myexec(args)
-# execute the command given as "args"; abort on error; redirect messages to
-# log in "silent" mode; redirect stdin (</dev/null) in silent mode
-###############################################################################
-myexec()
-{
- if $silent; then
- echo "$0: running $@"
- "$@" >$log 2>&1 </dev/null
- rc=$?
- else
- "$@"
- rc=$?
- fi
- if test $rc != 0; then
- echo "$0: command $@ returned with code $rc"
- cat <$log
- (exit $rc) # set return value
- cleanup
- fi
-}
-
-# some initializations
-progname=pdflatexps
-silent=true # default setting; change if you like
-crop=false
-needsCleanup=false
-ps2pdf_opts="-dAutoRotatePages=/None"
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/.$progname$$
-log=$tmpdir/log
-version="1.0"
-
-# look for optional things first
-while
- case $1 in
- --help|-h) echo "$0 [-v|-q|--crop|--version|--Xps2pdf OPT] FILE"
- echo "Process LaTeX document FILE using the pst-pdf package,"
- echo "including running latex, dvips, and ps2pdf as necessary."
- echo "--Xps2pdf OPT passes OPT to ps2pdf."
- echo " (-dAutoRotatePages=/None is always passed.)"
- echo "--crop runs pdfcrop on ps2pdf output."
- exit 0;;
- --version) echo "$progname version $version"; exit 0;;
- --crop|-c) crop=true;;
- --Xps2pdf|-Xps2pdf) shift; ps2pdf_opts="$ps2pdf_opts $1";;
- -q) silent=true;;
- -v) silent=false;;
- -*) echo "$progname: unknown option $1 ignored";;
- *) break;;
- esac
-do
- shift
-done
-
-# remaining option: filename
-file=$1
-if test -z "$file"; then
- echo "$0: no file to process, try --help for more information." >&2
- exit 1
-fi
-
-# jobname von TeX: Verzeichnisse entfernen, evtl. vorhandene Extension
-# entfernen.
-job=`echo "x$1" | sed 's@x@@; s@.*/@@; s@\.[^.]*$@@'`
-
-setupTmpDir
-myexec latex \
- "\AtBeginDocument{\RequirePackage{pst-pdf}} \input{$file}"
-test -f "$job.dvi" && myexec dvips -Ppdf -o "$job-pics.ps" "$job.dvi"
-test -f "$job-pics.ps" && myexec ps2pdf \
- "$ps2pdf_opts" "$job-pics.ps" "$job-pics.pdf"
-if $crop; then
- myexec pdfcrop "$job-pics.pdf" "$job-pics-crop.pdf"
- mv "$job-pics-crop.pdf" "$job-pics.pdf"
-fi
-myexec pdflatex \
- "\AtBeginDocument{\RequirePackage{pst-pdf}} \input{$file}"
-true
-cleanup
-
diff --git a/Build/source/texk/web2c/otps/ChangeLog b/Build/source/texk/web2c/otps/ChangeLog
index 25db1daa690..05178198d0a 100644
--- a/Build/source/texk/web2c/otps/ChangeLog
+++ b/Build/source/texk/web2c/otps/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am [WIN32]: Skip mkocp and mkofm shell scripts.
+
2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de>
Reorganize web2c headers.
diff --git a/Build/source/texk/web2c/otps/Makefile.am b/Build/source/texk/web2c/otps/Makefile.am
index d55b87b861d..ab8b06c5261 100644
--- a/Build/source/texk/web2c/otps/Makefile.am
+++ b/Build/source/texk/web2c/otps/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/web2c/otps/
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES)
@@ -23,7 +23,9 @@ noinst_HEADERS = otp.h routines.h yystype.h
if OTANGLE
bin_PROGRAMS = $(otps_programs)
+if !WIN32
bin_SCRIPTS = $(otps_scripts)
+endif !WIN32
dist_man1_MANS = $(otps_programs:=.man) $(otps_scripts:=.man)
endif OTANGLE
EXTRA_PROGRAMS = $(otps_programs)
diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in
index 12fd6dcebab..733109e7313 100644
--- a/Build/source/texk/web2c/otps/Makefile.in
+++ b/Build/source/texk/web2c/otps/Makefile.in
@@ -344,7 +344,7 @@ proglib = ../lib/lib.a
otps_programs = otp2ocp outocp
otps_scripts = mkocp mkofm
noinst_HEADERS = otp.h routines.h yystype.h
-@OTANGLE_TRUE@bin_SCRIPTS = $(otps_scripts)
+@OTANGLE_TRUE@@WIN32_FALSE@bin_SCRIPTS = $(otps_scripts)
@OTANGLE_TRUE@dist_man1_MANS = $(otps_programs:=.man) $(otps_scripts:=.man)
EXTRA_DIST = $(otps_scripts) otp2ocp.test outocp.test uni2lat.ocp \
uni2lat.otp uni2lat.out bugs.txt