Commit Graph

33 Commits

Author SHA1 Message Date
1fc3b01590 Embed the .manifest files of all httpd binaries as a post-build
operation.  This ensures the exported (Studio 97 generated) .mak
files create a usable Apache directly from the VC 8 (Studio 2005)
command line environment.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@495126 13f79535-47bb-0310-9956-ffa450edef68
2007-01-11 05:37:20 +00:00
6df9b82d20 Revert Revision 397647
While it solves the studio 2005 (we desire this), it breaks
the studio 6 packaging (we require this).  Discussion on list
of practical solutions.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419644 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 18:36:23 +00:00
b2820e8da8 This resource /D syntax was pretty horridly imported into VS 2005,
change the quotation to ensure a peaceful transition to sln/vcproj files.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397647 13f79535-47bb-0310-9956-ffa450edef68
2006-04-27 21:41:29 +00:00
f65c47bd75 Remove all /machine:I386 references, these are getting in the way
of switching linkers from the x86 (default linker) to x64 or other
  possible target platforms.  (Also, this commit cleans up lingering
  /GX switches from the 'BASE' options that are supposed to be unused).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397407 13f79535-47bb-0310-9956-ffa450edef68
2006-04-27 05:30:39 +00:00
663687ae8e s|/GX |/EHsc | because they were always synonyms, and Visual Studio
2005 edition complains bitterly and loudly that /GX is deprecated.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395419 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 22:51:02 +00:00
862d0e231e Remove a host of dependencies upon awk, using the same template for
nearly every .rc compilation (giving the output .res file a different
  name for each component).  Adds AP_SERVER_BASEPROJECT to ap_revision.h
  so we can display the proper name of "Apache HTTP Server" as opposed
  to AP_SERVER_BASEPRODUCT (which is, and should remain, simply "Apache"
  for the server string tokens.)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395418 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 22:47:49 +00:00
20d06d7a06 Reintroduce stack frame construction with /Oy- (removal was implied by /O2).
This makes binaries far easier to debug, during operation and for post-crash
  .dmp analysis.  Do not alter /Gs optimizations per brane.

Reviewed by: stoddard, brane

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170253 13f79535-47bb-0310-9956-ffa450edef68
2005-05-15 19:11:57 +00:00
3c5a741b55 Add proxy_balancer to proxy module, including config and capturing
-I ../generators for the mod_status.h

Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104608 13f79535-47bb-0310-9956-ffa450edef68
2004-08-11 22:52:46 +00:00
2f1cf770a5 fix windows build: add path to mod_ssl.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102837 13f79535-47bb-0310-9956-ffa450edef68
2004-03-01 18:06:08 +00:00
281948b722 After discussions at length on dev@apr/httpd, it is determined that
the older .dbg format symbols are not worth the interference with
  generating complete .pdb symbolic debugging databases.

  This patch further eliminates pdbtype:sept flags that interfere with
  deciphering local symbols and type information.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98970 13f79535-47bb-0310-9956-ffa450edef68
2003-03-11 00:58:59 +00:00
25ac108fe2 After consultations on the APR list, it was decided that /map files are
fairly redundant when you retain rich .pdb debugging symbol files.  We
  have rarely used them, and generally .dbg and .pdb files prove much more
  useful for the cases we have.

  While eliminating /map files, we are also shrinking the size of the .dbg
  files by stripping 'private' symbol information.  Really this means less
  rich diagnostics from Dr. Watson on NT or Win9x when they query the .dbg
  symbols in creating a DrWatson log file.  But it's more than compensated
  for on newer OS'es where Dr. Watson will query the .pdb symbols, on all
  Win32 flavors when WinDbg is used with the .pdb symbols, and the fact that
  the distribution of binary symbols will use less bandwidth when less
  information is duplicated from the .pdb format into the .dbg files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98743 13f79535-47bb-0310-9956-ffa450edef68
2003-02-20 15:56:04 +00:00
e8c0a9532f foo.dbgmark turned out to be the same 8.3 name as foo.dbg itself, which
was badness.  Twist this puppy to .dbr, the only name I could invent that
  doesn't look like any database file extension I recall.

  It stands for .dbg rebased.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98712 13f79535-47bb-0310-9956-ffa450edef68
2003-02-18 22:07:21 +00:00
a45632ba37 *) Introduce debugging symbols for Win32 release builds, both .pdb
and .dbg files (older debuggers and Dr. Watson-type utilities
     on WinNT or Win9x don't support the newer .pdb flavor.)
     [Allen Edwards, William Rowe]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98596 13f79535-47bb-0310-9956-ffa450edef68
2003-02-07 21:30:53 +00:00
b67d127829 Catch up with the changes to apr/build/win32ver.awk and name all loadable
httpd modules as .so, internally.  Credit to Mladen Turk for identifing
  the issue.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98380 13f79535-47bb-0310-9956-ffa450edef68
2003-01-20 19:52:30 +00:00
aff1454d34 *) Split all Win32 modules [excluding the core components mod_core,
mod_so, mod_win32 and the winnt mpm] into individual loadable
     modules, so the administrator may individually disable the former
     compiled-in modules by simply commenting out their LoadModule
     directives.  [William Rowe]

  *) Saved Win32 module authors and porters many future headaches, by
     duplicating the appropriate .h files such as os.h into the include
     directory, including in the build tree.  [William Rowe]

  Also noticed that version stamp resources weren't generated for proxy
  modules, this too is now fixed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92804 13f79535-47bb-0310-9956-ffa450edef68
2002-01-10 08:47:23 +00:00
7d67fb731a Change _only_ the debug build to recognize the /Zi flag (which is portable
for debugging between VC 5.0/6.0/7.0) instead of the VC 6.0+ specific /ZI.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90675 13f79535-47bb-0310-9956-ffa450edef68
2001-08-26 03:58:52 +00:00
3032fea185 Allows Mod_proxy to be dynamically loaded on win32 systems
PR:
Obtained from:
Submitted by:	ianh
Reviewed by:	Chuck Murcko, Graham


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89085 13f79535-47bb-0310-9956-ffa450edef68
2001-05-11 17:32:41 +00:00
0a37cdf9fe Correction, commited the vc5. Need vc6 in the tree. Humble appologies.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87475 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 01:25:10 +00:00
4315b0c706 The Win32 overhaul, in summary;
Modules are named mod_foo.so
    Dynamic Libraries are named libfoo.dll, and are stored in bin/
    The former ApacheCoreDll is now libhttpd.dll
    Apache.exe moves to bin/
    The make install now copies include, lib, and libexec
    All build options are normalized, filenames adjusted appropriately


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87471 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 01:04:49 +00:00
bf57cf0335 The -big- fix, all the proper linkages for BaseAddr.ref plus a bit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87221 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 20:36:03 +00:00
56560e4293 A bit of inclusion for the apr-util package.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87213 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 17:38:40 +00:00
f119cafbaa This patch illustrates the new locations, and makes the majority of the
adjustments.  Now to actually try to build the thing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87212 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 16:37:50 +00:00
eaba82f661 Regardless of reaction to a symbol rename -within- the sources, these
external symbols change for clarity.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86540 13f79535-47bb-0310-9956-ffa450edef68
2000-10-11 17:20:12 +00:00
446a7805af Finish the ApacheModuleBleck -> mod_bleck cleanup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86537 13f79535-47bb-0310-9956-ffa450edef68
2000-10-11 14:26:00 +00:00
ec51d14985 proxy_cache.c was still in the ApacheModuleProxy project, although that
modules is deprecated.  Remove it from the project.
Submitted by:	Bill Rowe <wrowe@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86096 13f79535-47bb-0310-9956-ffa450edef68
2000-08-18 04:50:22 +00:00
639ee3f71d PR:
Obtained from:
Submitted by:
Reviewed by:

  Simple change to make these consistent with the other Apache module
  build files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85328 13f79535-47bb-0310-9956-ffa450edef68
2000-05-28 03:58:12 +00:00
ed7378f2ec PR:
Obtained from:
Submitted by:
Reviewed by:

  All waiting to bite us... just go ahead and ignore this commit.  Better
  now that when we are deciphering real changes.  This knocks all the
  projects into what I expect is a clean VC6 format.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85301 13f79535-47bb-0310-9956-ffa450edef68
2000-05-26 05:09:17 +00:00
2745ccdaf8 Win32: Convert ap_proc_t to tranparent type.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85292 13f79535-47bb-0310-9956-ffa450edef68
2000-05-24 23:45:37 +00:00
e2cb3c6457 Current and clean make files for Win95. Changes Include:
All projects link incrementally with no link maps in Debug mode.
  New cvstodsp6.pl and dsp6tocvs.pl will fix up /the /ZI - /Zi issue.
  Includes corrections noted by Tim Costello


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85254 13f79535-47bb-0310-9956-ffa450edef68
2000-05-19 05:09:20 +00:00
9a6e32864a Add ApacheModAuthDigest to apache.dsw. Get rid of compile warnings.
Submitted by:	William Rowe
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85014 13f79535-47bb-0310-9956-ffa450edef68
2000-04-22 15:44:57 +00:00
17c5e3fb7a Revamp the Win32 make environment. Makefiles have been removed and
Apache.dsw created to bring together all the pieces. Create new file
os/win32/BaseAddr.ref to define module base addresses (to prevent
dll relocation at start-up).

Submitted by:	William Rowe
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85004 13f79535-47bb-0310-9956-ffa450edef68
2000-04-20 19:28:08 +00:00
e3784eb925 linkwin20.diffs Resolves:
1) Explicit /base: addresses by the following table...

  Required sizes are for debug builds.  It is assumed that
  as we increase the size of aprlib, we will be trimming
  the size of ApacheCore, and the 278A0000 base can move down.

  ApacheCore.dll            27800000  80000 required

  aprlib.dll                278A0000  40000 required

  ApacheModuleAuthAnon.dsp  27900000
  ApacheModuleCERNMeta.dsp  27910000
  ApacheModuleDigest.dsp    27920000
  ApacheModuleExpires.dsp   27930000
  ApacheModuleHeaders.dsp   27940000
  ApacheModuleInfo.dll      27950000
  ApacheModuleRewrite.dsp   27960000  20000 required

  ApacheModuleSpeling.dsp   27980000
  ApacheModuleStatus.dsp    27990000
  ApacheModuleUserTrack.dsp 279A0000
  ApacheModuleProxy.dsp     279B0000  20000 anticipated

  3 slots still available   279C0000

2) Make APR consistent with the rest of the API and
   not build septypes for debugging (in other words,
   roll in the debug symbols as every other module does.)

   If we decide we LIKE /pdbtype:septypes... then we
   should be using them throughout.

3) Slide the current path specs into /libpath: options
   so the library list is more ledgible.

4) Drop all the gui crud from the library list.  Everything
   listed is referenced, with the following exceptions:

   *) don't do anything with msvcrtd/oldnames today.
   *) aprlib and ApacheCore have the same list, since functions
      may still be moving between them.
   *) apache.exe looses networking (it doesn't), while it keeps
      advapi, which I don't think it needs, but it could later.
   *) add aprlib to ApacheModuleProxy, since it will need it.
   *) hang mswsock whereever ws2_32 is invoked.  I believe
      the most special case was ApacheModuleProxy, which may
      become entirely APR.  But for today we hang onto both.

5) MAP, MAP, MAP, everything gets a map.  I for one have an
   untold number of installed OS's and boot mappings, and the
   debugger isn't installed to all of them.  We gotta be able
   to track down those renegade GP faults.  (What faults...
   I know, it's clean, but I am overly cautious that way.)

6) Set the DEFAULT linkage to be this linkage.  Because
   "it's a vc thing" the defaults were not all that
   useful as a starting point (take, for example, the
   joke of linking to the OLE libraries).


Submitted by:	William Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84982 13f79535-47bb-0310-9956-ffa450edef68
2000-04-17 13:56:41 +00:00
e3e87d34a0 Apache 1.3.9 baseline for the Apache 2.0 repository.
Obtained from: Apache 1.3.9 (minus unused files), tag APACHE_1_3_9
Submitted by: Apache Group


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83751 13f79535-47bb-0310-9956-ffa450edef68
1999-08-24 06:55:44 +00:00