Return-Path: Delivered-To: apmail-new-httpd-archive@apache.org Received: (qmail 45807 invoked by uid 500); 21 Apr 2000 05:02:51 -0000 Mailing-List: contact new-httpd-help@apache.org; run by ezmlm Precedence: bulk X-No-Archive: yes Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list new-httpd@apache.org Received: (qmail 45786 invoked from network); 21 Apr 2000 05:02:50 -0000 From: "William A. Rowe, Jr." To: Subject: RE: cvs commit: apache-2.0/src/support htdigest.mak htpasswd.mak rotatelogs.mak Date: Fri, 21 Apr 2000 00:02:36 -0500 Message-ID: <000401bfab4e$d4b25900$345985d0@corecomm.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_0005_01BFAB24.EBDF5E40" X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook 8.5, Build 4.71.2173.0 Importance: Normal X-MimeOLE: Produced By Microsoft MimeOLE V5.00.2919.6600 In-Reply-To: <20000420192812.60806.qmail@locus.apache.org> X-Spam-Rating: locus.apache.org 1.6.2 0/1000/N This is a multi-part message in MIME format. ------=_NextPart_000_0005_01BFAB24.EBDF5E40 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit > -----Original Message----- > From: stoddard@locus.apache.org [mailto:stoddard@locus.apache.org] > Sent: Thursday, April 20, 2000 2:28 PM > To: apache-2.0-cvs@apache.org > Subject: cvs commit: apache-2.0/src/support htdigest.mak htpasswd.mak > rotatelogs.mak > > > stoddard 00/04/20 12:28:10 > > Modified: src ApacheCore.dsp CHANGES Makefile.win > src/lib/apr aprlib.def > src/main gen_test_char.dsp gen_uri_delims.dsp > src/modules/proxy ApacheModuleProxy.dsp > src/os/win32 ApacheModuleAuthAnon.dsp > ApacheModuleCERNMeta.dsp > ApacheModuleDigest.dsp > ApacheModuleExpires.dsp > ApacheModuleHeaders.dsp > ApacheModuleInfo.dsp ApacheModuleRewrite.dsp > ApacheModuleSpeling.dsp ApacheModuleStatus.dsp > ApacheModuleUserTrack.dsp > src/os/win32/installer/installdll install.mak > src/support htdigest.mak htpasswd.mak rotatelogs.mak I definately missed the aprlib.dsp update! The target is now built by aprlibdll.dsp, but that project relies on aprlib.dsp to do the LIB32 thing instead of the LINK32 thing. You missed the doc update. Both are attached. > Added: src Apache.dsw InstallBin.dsp > src/lib/apr aprlibdll.dsp > src/os/win32 BaseAddr.ref Missing lib/apr/misc/win32/aprlib.c It's a no-op file (just a comment) to suppress the LNK4001 error. See that post yesterday, it's attached here. > Removed: src Apache.mak ApacheCore.mak > src/ap ap.mak > src/lib/apr aprlib.mak > src/main gen_test_char.mak gen_uri_delims.mak > src/modules/proxy ApacheModuleProxy.mak > src/os/win32 ApacheModuleAuthAnon.mak > ApacheModuleCERNMeta.mak > ApacheModuleDigest.mak > ApacheModuleExpires.mak > ApacheModuleHeaders.mak > ApacheModuleInfo.mak ApacheModuleRewrite.mak > ApacheModuleSpeling.mak ApacheModuleStatus.mak > ApacheModuleUserTrack.mak > src/regex regex.mak That's the most beautiful commit I've seen (the Removed: that is :-) ------=_NextPart_000_0005_01BFAB24.EBDF5E40 Content-Type: text/plain; name="winbuild-fix.diffs" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="winbuild-fix.diffs" New File: apache-2.0/src/lib/apr/misc/win32/aprlib.c=20 --- begin aprlib.c --- /* * Placeholder to force aprlib.dll creation with no LNK4001 error * * However, this isn't a bad place to store dynamic-only functions=20 * such as determining which version of apr the application has loaded. */ --- end aprlib.c --- Index: apache-2.0/src/lib/apr/aprlib.dsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/apache/apache-2.0/src/lib/apr/aprlib.dsp,v retrieving revision 1.17 diff -u -r1.17 aprlib.dsp --- aprlib.dsp 2000/04/17 13:56:39 1.17 +++ aprlib.dsp 2000/04/21 04:56:33 @@ -2,7 +2,7 @@ # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** =20 -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 +# TARGTYPE "Win32 (x86) Static Library" 0x0104 =20 CFG=3Daprlib - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using = NMAKE, @@ -17,70 +17,59 @@ !MESSAGE=20 !MESSAGE Possible choices for configuration are: !MESSAGE=20 -!MESSAGE "aprlib - Win32 Release" (based on "Win32 (x86) Dynamic-Link = Library") -!MESSAGE "aprlib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link = Library") +!MESSAGE "aprlib - Win32 Release" (based on "Win32 (x86) Static = Library") +!MESSAGE "aprlib - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE=20 =20 # Begin Project # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=3Dcl.exe -MTL=3Dmidl.exe -RSC=3Drc.exe =20 !IF "$(CFG)" =3D=3D "aprlib - Win32 Release" =20 # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" +# PROP BASE Output_Dir "LibR" +# PROP BASE Intermediate_Dir "LibR" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 +# PROP Output_Dir "LibR" +# PROP Intermediate_Dir "LibR" # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D = "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MT /W3 /GX /O2 /I "./include" /I "./inc" /I = "./misc/win32" /I "./file_io/win32" /I "./time/win32" /D "WIN32" /D = "NDEBUG" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" BSC32=3Dbscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -LINK32=3Dlink.exe -# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib = /nologo /base:"0x278A0000" /subsystem:windows /dll /map /machine:I386 -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo = /base:"0x278A0000" /subsystem:windows /dll /map /machine:I386 +LIB32=3Dlink.exe -lib +# ADD BASE LIB32 /nologo /out:".\LibR\apr.lib" +# ADD LIB32 /nologo /out:".\LibR\apr.lib" =20 !ELSEIF "$(CFG)" =3D=3D "aprlib - Win32 Debug" =20 # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Output_Dir "LibD" +# PROP BASE Intermediate_Dir "LibD" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" +# PROP Output_Dir "LibD" +# PROP Intermediate_Dir "LibD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" = /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "./include" /I "./inc" /I = "./misc/win32" /I "./file_io/win32" /I "./time/win32" /D "WIN32" /D = "_DEBUG" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" BSC32=3Dbscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -LINK32=3Dlink.exe -# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib = /nologo /base:"0x278A0000" /subsystem:windows /dll /map /debug = /machine:I386 -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo = /base:"0x278A0000" /subsystem:windows /dll /map /debug /machine:I386 +LIB32=3Dlink.exe -lib +# ADD BASE LIB32 /nologo /out:".\LibD\apr.lib" +# ADD LIB32 /nologo /out:".\LibD\apr.lib" =20 !ENDIF=20 =20 Index: apache-2.0/htdocs/manual/win_compiling.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/apache/apache-2.0/htdocs/manual/win_compiling.html,v retrieving revision 1.1 diff -u -r1.1 win_compiling.html --- win_compiling.html 2000/04/17 13:38:13 1.1 +++ win_compiling.html 2000/04/21 04:57:14 @@ -14,22 +14,6 @@ > =20 - - - -Using Apache with Microsoft Windows - - - - - -

Compiling Apache for Microsoft Windows

=20

There are many important points before you begin compiling Apache. @@ -47,7 +31,7 @@ =20

The master Apache makefile instructions are contained in the Makefile.win file. To compile Apache on Windows, simply - use one of the following commands: + use one of the following commands:

  • nmake /f Makefile.win _apacher (release build)
  • nmake /f Makefile.win _apached (debug build) @@ -64,10 +48,10 @@ 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: - This needs updating for Apache 2.0 +
      -
    1. os\win32\ApacheOS.dsp
    2. regex\regex.dsp +
    3. lib\apr\aprlib.dsp
    4. ap\ap.dsp
    5. main\gen_uri_delims.dsp
    6. main\gen_test_char.dsp @@ -75,46 +59,97 @@
    7. Apache.dsp
    =20 - In addition, the src\os\win32 subdirectory contains - project files for the optional modules (see below).

    + In addition, the os\win32 subdirectory contains + project files for the optional modules. =20 +
      +
    1. os\win32\ApacheModuleAuthAnon.dsp +
    2. os\win32\ApacheModuleCERNMeta.dsp +
    3. os\win32\ApacheModuleDigest.dsp +
    4. os\win32\ApacheModuleExpires.dsp +
    5. os\win32\ApacheModuleHeaders.dsp +
    6. os\win32\ApacheModuleInfo.dsp +
    7. os\win32\ApacheModuleRewrite.dsp +
    8. os\win32\ApacheModuleSpeling.dsp +
    9. os\win32\ApacheModuleStatus.dsp +
    10. os\win32\ApacheModuleUserTrack.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.

    + +
      +
    1. support\htdigest.dsp +
    2. support\htpasswd.dsp +
    3. support\logresolve.dsp +
    4. support\rotatelogs.dsp +
    +

    Once Apache has been compiled, it needs to be installed in its = server root directory. The default is the \Apache directory, on the current hard drive.

    =20 -

    To install the files into the \Apache directory - automatically, use one the following nmake commands (see above):

    -
      -
    • nmake /f Makefile.win installr INSTDIR=3Ddir - (for release build) -
    • nmake /f Makefile.win installd INSTDIR=3Ddir - (for debug build) -
    +

    To build and install all the files into the desired folder = dir + automatically, use one the following nmake commands: + +

      +
    • nmake /f Makefile.win installr = INSTDIR=3Ddir + (for release build) +
    • nmake /f Makefile.win installd = INSTDIR=3Ddir + (for debug build) +
    =20 -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.

    =20

    This will install the following:

    =20
    • dir\Apache.exe - Apache executable -
    • dir\ApacheCore.dll - Main Apache shared = library +
    • dir\aprlib.dll - Apache Portable Runtime = shared library +
    • dir\ApacheCore.dll - Apache Core = application
    • dir\modules\ApacheModule*.dll - Optional = Apache modules (7 files) +
    • dir\support\*.exe - Administrator support = executables
    • dir\conf - Empty configuration directory
    • dir\logs - Empty logging directory
    =20

    If you do not have nmake, or wish to install in a different = directory, - be sure to use a similar naming scheme.

    + be sure to use a similar naming scheme, or use the following = shortcut.

    =20 -

    -Before running the server you must fill out the conf directory. -Copy the *.conf-dist-win from the distribution conf directory -and rename *.conf. Edit the @@ServerRoot@@ entries to your -actual server root (for example "C:\apache"). Copy over -the conf/magic and conf/mime.types files as well. +

    To simplify the process, dependencies between all projects + are defined in the Microsoft VisualStudio workspace file: + =20 +

    +   src/Apache.dsw
+
    + =20 + This assures that lower-level sources are rebuilt from within + VisualStudio. The top level project is InstallBin, which invokes=20 + Makefile.win to move the compiled executables and dlls. You may=20 + personalize the INSTDIR=3D 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.

    + +

    Warning about building Apache from the development = tree

    + +

    Only the .dsp files are distributed between release builds. The + .mak files are NOT regenerated, due to the tremendous waste of + reviewer's time. Therefore, you cannot rely on the NMAKE commands=20 + above unless you -frequently- export all .mak files yourself from=20 + the project. This is unnecessary if you build from withing the + Microsoft DeveloperStudio environment.

    =20 + +

    Before running the server you must fill out the conf directory. + Copy the *.conf-dist-win from the distribution conf directory + and rename *.conf. Edit the @@ServerRoot@@ entries to your + actual server root (for example "C:\apache"). Copy over + the conf/magic and conf/mime.types files as well.

    =20 + ------=_NextPart_000_0005_01BFAB24.EBDF5E40--