From e480384a737e02ff93b4baf641d42a38b6cffc6a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 23 Nov 2016 19:55:23 +0100 Subject: Drop the nickname "woe32". --- ChangeLog | 6 ++++ Makefile.in | 4 +-- README.windows | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.woe32 | 93 ---------------------------------------------------------- 4 files changed, 101 insertions(+), 95 deletions(-) create mode 100644 README.windows delete mode 100644 README.woe32 diff --git a/ChangeLog b/ChangeLog index d1155b3..acc7067 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-11-23 Bruno Haible + + Drop the nickname "woe32". + * README.windows: Renamed from README.woe32. + * Makefile.in (SOURCE_FILES): Update. + 2016-11-19 Bruno Haible doc: Prepare for possible use of GNU texi2any. diff --git a/Makefile.in b/Makefile.in index 8d9f68b..705f2a5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # Makefile for gperf -# Copyright (C) 1989, 1992, 1993, 1998, 2002, 2012 Free Software Foundation, Inc. +# Copyright (C) 1989, 1992, 1993, 1998, 2002, 2012, 2016 Free Software Foundation, Inc. # Written by Douglas C. Schmidt # and Bruno Haible . # @@ -60,7 +60,7 @@ maintainer-clean : force # List of source files. SOURCE_FILES = \ - README README.woe32 README.vms NEWS AUTHORS \ + README README.windows README.vms NEWS AUTHORS \ configure.ac aclocal.m4 Makefile.in Makefile.vms \ Makefile.devel ChangeLog # List of distributed files imported from other packages. diff --git a/README.windows b/README.windows new file mode 100644 index 0000000..2021bc5 --- /dev/null +++ b/README.windows @@ -0,0 +1,93 @@ +Installation on Woe32 (Microsoft Windows): + +There are three ways to create binaries of this package for Woe32: +1) Native binaries, built using the mingw tool chain. +2) Native binaries, built using the MS Visual C/C++ tool chain. +3) Binaries for the Cygwin environment. For these, please see the normal + INSTALL file. + +=============================================================================== +1) Native binaries, built using the mingw tool chain. + + I recommend to use the cygwin environment as the development environment + and mingw only as the target (runtime, deployment) environment. + For this, you need to install + - cygwin, + - the mingw runtime package, also from the cygwin site. + + Building for mingw is achieved through the following preparation, + configure, and build commands: + + PATH=/usr/local/mingw/bin:$PATH + export PATH + ./configure --host=i586-pc-mingw32 --prefix=/usr/local/mingw \ + CC="gcc-3 -mno-cygwin" \ + CXX="g++-3 -mno-cygwin" + make + make check + + Installation: + + make install + +=============================================================================== +2) Native binaries, built using the MS Visual C/C++ tool chain. + + Note that binaries created with MSVC have a distribution constraint: They + depend on a closed-source library ('msvcr70.dll' for MSVC 7.0, 'msvcr90.dll' + for MSVC 9.0, and so on) which is not normally part of a Windows + installation. + You cannot distribute 'msvcr*.dll' with the binaries - this would be a + violation of the GPL and of the Microsoft EULA. + You can distribute the binaries without including 'msvcr*.dll', but this + will cause problems for users that don't have this library on their system. + Therefore it is not recommended; the mingw tool chain is preferred for + this reason. + + Requires MS Visual C/C++ 4.0 or newer. The "Express" edition which + contains just the tools and not the IDE is sufficient. + + Requires also a cygwin or mingw environment (with 'bash', the common POSIX + commands, and 'make' ) as a build environment. Building with "nmake" is no + longer supported. + + Make sure that the MSVC tools ("cl" etc.) are found in PATH. + In a typical MSVC 6.0 installation, this can be achieved by running + C:\Program Files\Microsoft Visual Studio\VC98\bin\vcvars32.bat + In a typical MSVC 7.0 installation, it can be achieved by running + C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\vsvars32.bat + In a typical MSVC 9.0 installation, it can be achieved by running + C:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\vsvars32.bat + + Then start a bash (from cygwin or mingw). + + Building for mingw is achieved through the following preparation, + configure, and build commands: + + PATH=/usr/local/msvc/bin:$PATH + export PATH + + win32_target=_WIN32_WINNT_WINXP # for MSVC 9.0 + win32_target=_WIN32_WINNT_VISTA # possibly for MSVC >= 10.0 + win32_target=_WIN32_WINNT_WIN7 # possibly for MSVC >= 10.0 + + ./configure --host=i586-pc-mingw32 --prefix=/usr/local/msvc \ + CC="`pwd`/build-aux/compile cl -nologo" \ + CFLAGS="-MD" \ + CXX="`pwd`/build-aux/compile cl -nologo" \ + CXXFLAGS="-MD" \ + CPPFLAGS="-D_WIN32_WINNT=$win32_target -I/usr/local/msvc/include" \ + LDFLAGS="-L/usr/local/msvc/lib" \ + LD="link" \ + NM="dumpbin -symbols" \ + STRIP=":" \ + AR="`pwd`/build-aux/ar-lib lib" \ + RANLIB=":" + make + make check + + Installation: + + make install + +=============================================================================== diff --git a/README.woe32 b/README.woe32 deleted file mode 100644 index 2021bc5..0000000 --- a/README.woe32 +++ /dev/null @@ -1,93 +0,0 @@ -Installation on Woe32 (Microsoft Windows): - -There are three ways to create binaries of this package for Woe32: -1) Native binaries, built using the mingw tool chain. -2) Native binaries, built using the MS Visual C/C++ tool chain. -3) Binaries for the Cygwin environment. For these, please see the normal - INSTALL file. - -=============================================================================== -1) Native binaries, built using the mingw tool chain. - - I recommend to use the cygwin environment as the development environment - and mingw only as the target (runtime, deployment) environment. - For this, you need to install - - cygwin, - - the mingw runtime package, also from the cygwin site. - - Building for mingw is achieved through the following preparation, - configure, and build commands: - - PATH=/usr/local/mingw/bin:$PATH - export PATH - ./configure --host=i586-pc-mingw32 --prefix=/usr/local/mingw \ - CC="gcc-3 -mno-cygwin" \ - CXX="g++-3 -mno-cygwin" - make - make check - - Installation: - - make install - -=============================================================================== -2) Native binaries, built using the MS Visual C/C++ tool chain. - - Note that binaries created with MSVC have a distribution constraint: They - depend on a closed-source library ('msvcr70.dll' for MSVC 7.0, 'msvcr90.dll' - for MSVC 9.0, and so on) which is not normally part of a Windows - installation. - You cannot distribute 'msvcr*.dll' with the binaries - this would be a - violation of the GPL and of the Microsoft EULA. - You can distribute the binaries without including 'msvcr*.dll', but this - will cause problems for users that don't have this library on their system. - Therefore it is not recommended; the mingw tool chain is preferred for - this reason. - - Requires MS Visual C/C++ 4.0 or newer. The "Express" edition which - contains just the tools and not the IDE is sufficient. - - Requires also a cygwin or mingw environment (with 'bash', the common POSIX - commands, and 'make' ) as a build environment. Building with "nmake" is no - longer supported. - - Make sure that the MSVC tools ("cl" etc.) are found in PATH. - In a typical MSVC 6.0 installation, this can be achieved by running - C:\Program Files\Microsoft Visual Studio\VC98\bin\vcvars32.bat - In a typical MSVC 7.0 installation, it can be achieved by running - C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\vsvars32.bat - In a typical MSVC 9.0 installation, it can be achieved by running - C:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\vsvars32.bat - - Then start a bash (from cygwin or mingw). - - Building for mingw is achieved through the following preparation, - configure, and build commands: - - PATH=/usr/local/msvc/bin:$PATH - export PATH - - win32_target=_WIN32_WINNT_WINXP # for MSVC 9.0 - win32_target=_WIN32_WINNT_VISTA # possibly for MSVC >= 10.0 - win32_target=_WIN32_WINNT_WIN7 # possibly for MSVC >= 10.0 - - ./configure --host=i586-pc-mingw32 --prefix=/usr/local/msvc \ - CC="`pwd`/build-aux/compile cl -nologo" \ - CFLAGS="-MD" \ - CXX="`pwd`/build-aux/compile cl -nologo" \ - CXXFLAGS="-MD" \ - CPPFLAGS="-D_WIN32_WINNT=$win32_target -I/usr/local/msvc/include" \ - LDFLAGS="-L/usr/local/msvc/lib" \ - LD="link" \ - NM="dumpbin -symbols" \ - STRIP=":" \ - AR="`pwd`/build-aux/ar-lib lib" \ - RANLIB=":" - make - make check - - Installation: - - make install - -=============================================================================== -- cgit v1.2.1