From: Roy T. Fielding Date: Sun, 18 Feb 2001 07:38:50 +0000 (+0000) Subject: Update some references to the old src tree structure. X-Git-Tag: 2.0.12~57 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ddebfc732454cbf7d584abeb17d267618ca86c3;p=thirdparty%2Fapache%2Fhttpd.git Update some references to the old src tree structure. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88228 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/platform/win_compiling.html b/docs/manual/platform/win_compiling.html index a415747e41e..f1a2a71c897 100644 --- a/docs/manual/platform/win_compiling.html +++ b/docs/manual/platform/win_compiling.html @@ -28,8 +28,7 @@ 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 - src subdirectory of the Apache distribution.

+ directory. Open a command-line prompt and cd to that directory.

The master Apache makefile instructions are contained in the Makefile.win file. To compile Apache on Windows, simply @@ -45,7 +44,7 @@

Apache can also be compiled using VC++'s Visual Studio development environment. To simplify this process, a Visual Studio workspace, - Apache.dsw, is provided in the src folder. This workspace exposes + Apache.dsw, is provided. 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.

@@ -55,7 +54,7 @@ VisualStudio 5.0 (97) but you must first use the perl script command:

-    cd src\helpers
+    cd srclib\apr\build
     cvstodsp5.pl
@@ -63,7 +62,7 @@ however VisualStudio 97 in particular will not recognize the /ZI flag to the C compiler for the debugging mode. This script toggles the new /ZI flag back to /Zi for Debug builds, among other adjustments. - The converse script in src/helpers/dsp5tocvs.pl will + The converse script in srclib\apr\build\dsp5tocvs.pl will reverse the adjustments, and we ask you to do so before submitting patches against any .dsp project files.

@@ -71,13 +70,13 @@ .dsp projects of the Apache server in the following sequence:

    -
  1. lib\apr\aprlib.dsp -
  2. lib\apr\aprlibdll.dsp requires aprlib -
  3. lib\pcre\dftables.dsp -
  4. lib\pcre\pcre.dsp requires dftables -
  5. lib\pcre\pcreposix.dsp requires dftables and pcre -
  6. lib\expat-lite\xmltok.dsp -
  7. lib\expat-lite\xmlparse.dsp requires xmltok +
  8. srclib\apr\aprlib.dsp +
  9. srclib\apr\aprlibdll.dsp requires aprlib +
  10. srclib\pcre\dftables.dsp +
  11. srclib\pcre\pcre.dsp requires dftables +
  12. srclib\pcre\pcreposix.dsp requires dftables and pcre +
  13. srclib\expat-lite\xmltok.dsp +
  14. srclib\expat-lite\xmlparse.dsp requires xmltok
  15. main\gen_uri_delims.dsp
  16. main\gen_test_char.dsp
  17. ApacheCore.dsp requires all of the above @@ -151,7 +150,7 @@ are defined in the Microsoft VisualStudio workspace file: 
    -   src/Apache.dsw
+   Apache.dsw

    This assures that lower-level sources are rebuilt from within @@ -159,8 +158,7 @@ Makefile.win to move the compiled executables and dlls. You may personalize the INSTDIR= setting by changing the Settings for InstallBin, Build command line entry under the General tab. - The default from within the InstallBin.dsp project is one level up - (..) from the src tree.

    + INSTDIR defaults to the same directory as the httpd source.

    Warning about building Apache from the development tree