From b23b7bf5009e2503cc8c46f2dffd7a40fede721f Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Thu, 11 May 2000 03:39:39 +0000 Subject: [PATCH] Clean up documentation on both sides (1.3 and 2.0) for the Win32 build. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85185 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/platform/win_compiling.html | 48 ++++++++++++++----------- docs/manual/platform/windows.html | 23 ++++++------ 2 files changed, 37 insertions(+), 34 deletions(-) diff --git a/docs/manual/platform/win_compiling.html b/docs/manual/platform/win_compiling.html index 734521819f..9bf0847041 100644 --- a/docs/manual/platform/win_compiling.html +++ b/docs/manual/platform/win_compiling.html @@ -23,7 +23,9 @@

Compiling Apache requires Microsoft Visual C++ 5.0 (or later) to be properly installed. It is easiest to compile with the command-line tools (nmake, etc...). Consult the VC++ manual to determine how to install - them.

+ them. Be especially aware that the vcvars32.bat file from the + Program Files/DevStudio/VC/bin folder may be required to prepare the + command-line environment for command-line builds!

First, unpack the Apache distribution into an appropriate directory. Open a command-line prompt, and change to the @@ -37,26 +39,27 @@

  • nmake /f Makefile.win _apached (debug build) -

    These will both compile Apache. The latter will include debugging - information in the resulting files, making it easier to find bugs and - track down problems.

    Apache can also be compiled using VC++'s Visual Studio development - environment. Although compiling Apache in this manner is not as - simple, it makes it possible to easily modify the Apache source, or - to compile Apache if the command-line tools are not installed. - Project files (.DSP) are included for each of the - portions of Apache. To build Apache from the these projects files - you will need to build the following projects in this order: + environment. To simplify this process, a Visual Studio workspace, + Apache.dsw, is provided in the src folder. This workspace exposes + the entire list of working .dsp projects that are required for the + complete Apache binary release. It includes dependencies between + the projects to assure that they are built in the appropriate order.

      -
    1. regex\regex.dsp
    2. lib\apr\aprlib.dsp +
    3. lib\apr\aprlibdll.dsp requires aprlib +
    4. lib\pcre\dftables.dsp +
    5. lib\pcre\pcre.dsp requires dftables +
    6. lib\pcre\pcreposix.dsp requires dftables and pcre +
    7. lib\expat-lite\xmltok.dsp +
    8. lib\expat-lite\xmlparse.dsp requires xmltok
    9. ap\ap.dsp
    10. main\gen_uri_delims.dsp
    11. main\gen_test_char.dsp -
    12. ApacheCore.dsp -
    13. Apache.dsp +
    14. ApacheCore.dsp requires all of the above +
    15. Apache.dsp requires ApacheCore and aprlibdll
    In addition, the os\win32 subdirectory contains @@ -64,22 +67,25 @@
    1. os\win32\ApacheModuleAuthAnon.dsp +
    2. os\win32\ApacheModuleAuthDigest.dsp
    3. os\win32\ApacheModuleCERNMeta.dsp -
    4. os\win32\ApacheModuleDigest.dsp
    5. os\win32\ApacheModuleExpires.dsp +
    6. os\win32\ApacheModuleFileCache.dsp
    7. os\win32\ApacheModuleHeaders.dsp
    8. os\win32\ApacheModuleInfo.dsp
    9. os\win32\ApacheModuleRewrite.dsp
    10. os\win32\ApacheModuleSpeling.dsp
    11. os\win32\ApacheModuleStatus.dsp
    12. os\win32\ApacheModuleUserTrack.dsp +
    13. modules\proxy\ApacheModuleProxy.dsp
    The support\ folder contains project files for additional programs that are not part of the apache runtime, but are used by - the administrator to maintain password and log files.

    + the administrator to test Apache and maintain password and log files.

      +
    1. support\ab.dsp
    2. support\htdigest.dsp
    3. support\htpasswd.dsp
    4. support\logresolve.dsp @@ -100,8 +106,8 @@ (for debug build) - The dir argument to INSTDIR gives the installation directory; it can - be omitted if Apache is to be installed into \Apache.

      + The dir argument to INSTDIR gives the installation directory; it + can be omitted if Apache is to be installed into \Apache.

      This will install the following:

      @@ -109,9 +115,9 @@
    5. dir\Apache.exe - Apache executable
    6. dir\aprlib.dll - Apache Portable Runtime shared library
    7. dir\ApacheCore.dll - Apache Core application -
    8. dir\modules\ApacheModule*.dll - Optional Apache - modules (7 files) -
    9. dir\support\*.exe - Administrator support executables +
    10. dir\modules\ApacheModule*.dll - Loadable Apache + modules +
    11. dir\bin\*.exe - Administrator support executables
    12. dir\conf - Empty configuration directory
    13. dir\logs - Empty logging directory @@ -126,7 +132,7 @@ src/Apache.dsw - This assures that lower-level sources are rebuilt from within +

      This assures that lower-level sources are rebuilt from within VisualStudio. The top level project is InstallBin, which invokes Makefile.win to move the compiled executables and dlls. You may personalize the INSTDIR= setting by changing the Settings for diff --git a/docs/manual/platform/windows.html b/docs/manual/platform/windows.html index 46143694b7..5e74482e40 100644 --- a/docs/manual/platform/windows.html +++ b/docs/manual/platform/windows.html @@ -217,6 +217,14 @@ There are two ways you can run Apache: service for Apache, first attempt to start it from the command line to assure that the service starts with no errors.

      +

      Because Apache CANNOT share the same port with another + TCPIP application, you may need to stop or uninstall certain + services first. These include (but are not limited to) other + web servers, and firewall products such as BlackIce. If you can + only start Apache with these services disabled, reconfigure either + Apache or the other product so that they do not listen on the + same TCPIP ports.

      +

      Configuring Apache for Windows

      Apache is configured by files in the conf @@ -276,7 +284,8 @@ There are two ways you can run Apache:

    14. Apache can also load ISAPI Extensions (i.e., Internet Server Applications), such as those used by Microsoft's IIS, and other Windows servers. More information - is available. + is available. Note that Apache CANNOT load ISAPI + Filters.

      Running Apache for Windows as a Service

      @@ -468,12 +477,6 @@ There are two ways you can run Apache: apache -k shutdown -
      - Note: This option is only available with Apache 1.3.3 and - later. For earlier versions, you need to use Control-C in the - Apache console window to shut down the server. -
      -

      This should be used instead of pressing Control-C in the running Apache console window, because it lets Apache end any current transactions and cleanup gracefully.

      @@ -486,12 +489,6 @@ There are two ways you can run Apache: apache -k restart -
      - Note: This option is only available with Apache 1.3.3 and - later. For earlier versions, you need to use Control-C in the - Apache console window to shut down the server. -
      -

      Note for people familiar with the Unix version of Apache: these commands provide a Windows equivalent to kill -TERM pid and kill -USR1 pid. The command -- 2.50.1