diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-08-01 14:28:58 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-08-01 14:28:58 +0000 |
commit | 08cfcfc786b9886a03b8ebbf790716d724d41014 (patch) | |
tree | d3e4b19986fc38ffd9a4fd98a82137276f4bf859 /Build | |
parent | dced0f61f3eb8e164594fafc628ac7d8f97eacaf (diff) |
kpathsea: win32 update
git-svn-id: svn://tug.org/texlive/trunk@23302 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/Makefile.am | 6 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/Makefile.in | 23 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/knj.c | 2 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/win32lib.c | 24 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/win32lib.h | 69 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/win32lib.h.mugica | 57 |
7 files changed, 129 insertions, 59 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index fe041db5dd4..d5c624b5140 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,10 @@ +2011-08-01 Peter Breitenlohner <peb@mppmu.mpg.de> + + * win32lib.h.mugica: Renamed from win32lib.h. + * win32lib.[ch]: New files, yet to be filled in. + + * knj.c (is_cp932_system): No KPSEDLL in knj.c, only in knj.h. + 2011-07-31 Peter Breitenlohner <peb@mppmu.mpg.de> More diffs between TeX Live and W32TeX. diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am index 2dfb4a97213..392e99a39cb 100644 --- a/Build/source/texk/kpathsea/Makefile.am +++ b/Build/source/texk/kpathsea/Makefile.am @@ -89,7 +89,9 @@ libkpathsea_la_SOURCES = \ if WIN32 if MINGW32 libkpathsea_la_SOURCES += mingw32.c -endif MINGW32 +else !MINGW32 +libkpathsea_la_SOURCES += win32lib.c +endif !MINGW32 libkpathsea_la_SOURCES += knj.c endif WIN32 @@ -287,5 +289,5 @@ EXTRA_DIST += $(TESTS) ## Not used ## -EXTRA_DIST += mktex.cnf +EXTRA_DIST += mktex.cnf win32lib.h.mugica diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index a03c429db52..5c15cb711b4 100644 --- a/Build/source/texk/kpathsea/Makefile.in +++ b/Build/source/texk/kpathsea/Makefile.in @@ -39,7 +39,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @MINGW32_TRUE@@WIN32_TRUE@am__append_1 = mingw32.c -@WIN32_TRUE@am__append_2 = knj.c +@MINGW32_FALSE@@WIN32_TRUE@am__append_2 = win32lib.c +@WIN32_TRUE@am__append_3 = knj.c bin_PROGRAMS = kpseaccess$(EXEEXT) kpsereadlink$(EXEEXT) \ kpsestat$(EXEEXT) kpsewhich$(EXEEXT) subdir = . @@ -115,9 +116,10 @@ am__libkpathsea_la_SOURCES_DIST = tex-file.c absolute.c atou.c cnf.c \ uppercasify.c variable.c version.c xbasename.c xcalloc.c \ xdirname.c xfopen.c xfseek.c xfseeko.c xftell.c xftello.c \ xgetcwd.c xmalloc.c xopendir.c xputenv.c xrealloc.c xstat.c \ - xstrdup.c mingw32.c knj.c + xstrdup.c mingw32.c win32lib.c knj.c @MINGW32_TRUE@@WIN32_TRUE@am__objects_1 = libkpathsea_la-mingw32.lo -@WIN32_TRUE@am__objects_2 = libkpathsea_la-knj.lo +@MINGW32_FALSE@@WIN32_TRUE@am__objects_2 = libkpathsea_la-win32lib.lo +@WIN32_TRUE@am__objects_3 = libkpathsea_la-knj.lo am_libkpathsea_la_OBJECTS = libkpathsea_la-tex-file.lo \ libkpathsea_la-absolute.lo libkpathsea_la-atou.lo \ libkpathsea_la-cnf.lo libkpathsea_la-concat.lo \ @@ -146,7 +148,8 @@ am_libkpathsea_la_OBJECTS = libkpathsea_la-tex-file.lo \ libkpathsea_la-xgetcwd.lo libkpathsea_la-xmalloc.lo \ libkpathsea_la-xopendir.lo libkpathsea_la-xputenv.lo \ libkpathsea_la-xrealloc.lo libkpathsea_la-xstat.lo \ - libkpathsea_la-xstrdup.lo $(am__objects_1) $(am__objects_2) + libkpathsea_la-xstrdup.lo $(am__objects_1) $(am__objects_2) \ + $(am__objects_3) libkpathsea_la_OBJECTS = $(am_libkpathsea_la_OBJECTS) libkpathsea_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -360,7 +363,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 SUBDIRS = . doc man EXTRA_DIST = BUGS PROJECTS putenv.c strcasecmp.c strtol.c strstr.c \ - bsnl.awk cnf-to-paths.awk $(TESTS) mktex.cnf + bsnl.awk cnf-to-paths.awk $(TESTS) mktex.cnf win32lib.h.mugica INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/.. AM_CFLAGS = $(WARNING_CFLAGS) lib_LTLIBRARIES = libkpathsea.la @@ -378,7 +381,7 @@ libkpathsea_la_SOURCES = tex-file.c absolute.c atou.c cnf.c concat.c \ variable.c version.c xbasename.c xcalloc.c xdirname.c xfopen.c \ xfseek.c xfseeko.c xftell.c xftello.c xgetcwd.c xmalloc.c \ xopendir.c xputenv.c xrealloc.c xstat.c xstrdup.c \ - $(am__append_1) $(am__append_2) + $(am__append_1) $(am__append_2) $(am__append_3) kpseincludedir = ${includedir}/kpathsea nodist_kpseinclude_HEADERS = \ c-auto.h \ @@ -689,6 +692,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkpathsea_la-uppercasify.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkpathsea_la-variable.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkpathsea_la-version.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkpathsea_la-win32lib.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkpathsea_la-xbasename.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkpathsea_la-xcalloc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkpathsea_la-xdirname.Plo@am__quote@ @@ -1126,6 +1130,13 @@ libkpathsea_la-mingw32.lo: mingw32.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkpathsea_la-mingw32.lo `test -f 'mingw32.c' || echo '$(srcdir)/'`mingw32.c +libkpathsea_la-win32lib.lo: win32lib.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkpathsea_la-win32lib.lo -MD -MP -MF $(DEPDIR)/libkpathsea_la-win32lib.Tpo -c -o libkpathsea_la-win32lib.lo `test -f 'win32lib.c' || echo '$(srcdir)/'`win32lib.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libkpathsea_la-win32lib.Tpo $(DEPDIR)/libkpathsea_la-win32lib.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='win32lib.c' object='libkpathsea_la-win32lib.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkpathsea_la-win32lib.lo `test -f 'win32lib.c' || echo '$(srcdir)/'`win32lib.c + libkpathsea_la-knj.lo: knj.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkpathsea_la-knj.lo -MD -MP -MF $(DEPDIR)/libkpathsea_la-knj.Tpo -c -o libkpathsea_la-knj.lo `test -f 'knj.c' || echo '$(srcdir)/'`knj.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libkpathsea_la-knj.Tpo $(DEPDIR)/libkpathsea_la-knj.Plo diff --git a/Build/source/texk/kpathsea/knj.c b/Build/source/texk/kpathsea/knj.c index 4feddbc1d40..a4fcd3a6d91 100644 --- a/Build/source/texk/kpathsea/knj.c +++ b/Build/source/texk/kpathsea/knj.c @@ -17,7 +17,7 @@ #include <kpathsea/config.h> -KPSEDLL int is_cp932_system; +int is_cp932_system; int isknj(int c) { diff --git a/Build/source/texk/kpathsea/win32lib.c b/Build/source/texk/kpathsea/win32lib.c new file mode 100644 index 00000000000..5d4cb7c546d --- /dev/null +++ b/Build/source/texk/kpathsea/win32lib.c @@ -0,0 +1,24 @@ +/* win32lib.c: bits and pieces for win32 and msvc. + + Copyright 1996, xxxx Fabrice Popineau. + Copyright xxxx, 2011 Akira Kakuto. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this library; if not, see <http://www.gnu.org/licenses/>. */ + +#include <kpathsea/config.h> + +/* + * To be filled in + */ + diff --git a/Build/source/texk/kpathsea/win32lib.h b/Build/source/texk/kpathsea/win32lib.h index 5578aed8770..ed2e1ffe579 100644 --- a/Build/source/texk/kpathsea/win32lib.h +++ b/Build/source/texk/kpathsea/win32lib.h @@ -1,57 +1,26 @@ -/* Public domain. */ +/* win32lib.h: bits and pieces for win32 and msvc. -#ifndef _WIN32LIB_H_ -#define _WIN32LIB_H_ + Copyright 1996, xxxx Fabrice Popineau. + Copyright xxxx, 2011 Akira Kakuto. -#include <io.h> -#include <fcntl.h> -#include <direct.h> + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. -#if !__STDC__ -#if _MSC_VER>=1200 - #pragma warning(push) -#endif -#pragma warning(disable: 4668) -#pragma warning(disable: 4255) + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. -#define boolean donotuse_boolean -#include <windows.h> /* Somewhere here WIN32 gets defined */ -#undef boolean + You should have received a copy of the GNU Lesser General Public License + along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#if _MSC_VER>=1200 - #pragma warning(pop) -#else - #pragma warning(default: 4668) - #pragma warning(default: 4255) -#endif +#ifndef KPATHSEA_WIN32LIBH +#define KPATHSEA_WIN32LIBH -#else /*__STDC__*/ -/* non-ansi definitions for an ANSI compliation with /Fa */ -#define WIN32 -#define off_t _off_t -#define putenv _putenv -#define getcwd _getcwd -#define getcw _getcw -#define putenv _putenv -#define strdup _strdup -#define vsnprintf _vsnprintf -#define fileno _fileno -#define strlwr _strlwr -#define isascii __isascii -#define mkdir _mkdir -#define stat _stat -#define stricmp _stricmp -#define MAX_PATH _MAX_PATH -#define S_IFREG _S_IFREG -#define S_IFMT _S_IFMT +/* + * To be filled in + */ -#endif /*__STDC__*/ - -/*This is not defined even if !__STDC__*/ -#define snprintf _snprintf - -/* The POSIX names are different */ -#define strcasecmp _stricmp -#define strncasecmp _strnicmp - -#endif +#endif /* not KPATHSEA_WIN32LIBH */ diff --git a/Build/source/texk/kpathsea/win32lib.h.mugica b/Build/source/texk/kpathsea/win32lib.h.mugica new file mode 100644 index 00000000000..5578aed8770 --- /dev/null +++ b/Build/source/texk/kpathsea/win32lib.h.mugica @@ -0,0 +1,57 @@ +/* Public domain. */ + +#ifndef _WIN32LIB_H_ +#define _WIN32LIB_H_ + +#include <io.h> +#include <fcntl.h> +#include <direct.h> + +#if !__STDC__ +#if _MSC_VER>=1200 + #pragma warning(push) +#endif +#pragma warning(disable: 4668) +#pragma warning(disable: 4255) + +#define boolean donotuse_boolean +#include <windows.h> /* Somewhere here WIN32 gets defined */ +#undef boolean + +#if _MSC_VER>=1200 + #pragma warning(pop) +#else + #pragma warning(default: 4668) + #pragma warning(default: 4255) +#endif + +#else /*__STDC__*/ +/* non-ansi definitions for an ANSI compliation with /Fa */ +#define WIN32 +#define off_t _off_t +#define putenv _putenv +#define getcwd _getcwd +#define getcw _getcw +#define putenv _putenv +#define strdup _strdup +#define vsnprintf _vsnprintf +#define fileno _fileno +#define strlwr _strlwr +#define isascii __isascii +#define mkdir _mkdir +#define stat _stat +#define stricmp _stricmp +#define MAX_PATH _MAX_PATH +#define S_IFREG _S_IFREG +#define S_IFMT _S_IFMT + +#endif /*__STDC__*/ + +/*This is not defined even if !__STDC__*/ +#define snprintf _snprintf + +/* The POSIX names are different */ +#define strcasecmp _stricmp +#define strncasecmp _strnicmp + +#endif |