1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Commit Graph

35 Commits

Author SHA1 Message Date
Thomas J. Donovan
6ff5f3e156 Windows manifests are ;1 for .exe, ;2 for .dll and .so - ref: http://msdn.microsoft.com/en-us/library/ms235591.aspx
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@666726 13f79535-47bb-0310-9956-ffa450edef68
2008-06-11 16:34:20 +00:00
William A. Rowe Jr
b99945ec40 Introduce --kill argument to ApacheMonitor for use by the
installer.  This will permit the installation tool to remove
all running instances before attempting to remove the .exe.

Note that since the introduction of CriticalSections, our
compatibility with NT 4 was destroyed, and at this point that
is no loss (there are no more security updates to NT 4 ergo
it's not an OS we want connected to the internet, anyways).
The WTS api calls require 2000 or later, but I'm not wrapping
them since nobody notices the same issue with CriticalSections.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@603238 13f79535-47bb-0310-9956-ffa450edef68
2007-12-11 13:32:40 +00:00
William A. Rowe Jr
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
William A. Rowe Jr
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
William A. Rowe Jr
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
William A. Rowe Jr
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
William A. Rowe Jr
10be84690a Determined that yes; apr_general.h may be included in .rc files,
so eliminate a substitute declaration.

  Correct version and copyright generation, this involves 'long line'
  flavor of the first ASF copyright line;  next step will be no more
  awk generation of .rc files, so there we will use the new macro
  AP_SERVER_COPYRIGHT and defined tokens from this file for versions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@368395 13f79535-47bb-0310-9956-ffa450edef68
2006-01-12 16:11:01 +00:00
William A. Rowe Jr
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
William A. Rowe Jr
20e5f62e27 Relative paths were wrong, for the recent ap_release.h patch.
Correct to resolve to httpd-src-root/include.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@123885 13f79535-47bb-0310-9956-ffa450edef68
2005-01-02 08:07:41 +00:00
William A. Rowe Jr
b6bbf9791a Eliminate awk autogeneration of the ApacheMonitor's .rc resource
source file.

  By adding several macros to ap_release.h:

    - the stringize magic, in leiu of including a ton of cruft,
    - split subversion and "-dev" tokens (with a binary flag)
    - a _CSV token in the form of m,n,p (not a string)

  we are able to have use a static ApacheMonitor.rc file, which picks
  up all of the necessary values right from ap_release.h.

  If the group likes this approach, I will percolate it throughout
  the project, and we will lose the requirement of awk for everything
  -except- rewriting the installed httpd.conf script (developer builds
  always get an installed httpd.conf script - it's only 'fixed up' 
  with the correct @@ substitutions if they have awk.)

  This project was chosen because ApacheMonitor.rc already exists in svn.

  Comment please.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106313 13f79535-47bb-0310-9956-ffa450edef68
2004-11-23 16:57:18 +00:00
William A. Rowe Jr
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
William A. Rowe Jr
8607e55c42 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@98744 13f79535-47bb-0310-9956-ffa450edef68
2003-02-20 15:56:05 +00:00
William A. Rowe Jr
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
William A. Rowe Jr
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
William A. Rowe Jr
ebef197daf Update support utility filenames to reflect .exe extensions for the
newest apr/build/win32ver.awk script changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98376 13f79535-47bb-0310-9956-ffa450edef68
2003-01-20 18:51:57 +00:00
William A. Rowe Jr
9a4780a697 Forgot to change both release and debug opts at once
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96048 13f79535-47bb-0310-9956-ffa450edef68
2002-07-13 06:26:56 +00:00
William A. Rowe Jr
57a458394d Back to a slightly modified flavor of imajes' (James Cox'es) original
design, only stay with .rc file extensions so the original resources
  can be reviewed in the resource editor, rather than using .in files.

  Also significantly improve the explicit dependencies.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96043 13f79535-47bb-0310-9956-ffa450edef68
2002-07-13 05:34:07 +00:00
William A. Rowe Jr
14ddc05bc5 Ok. This gives us one warning - could not scan ApacheMonitorVer.h for
dependencies.  But it gives us back our top level, editable and commitable
  ApacheMonitor.rc file, and doesn't mess up dependencies due to the presence
  of two different .rc files in the schema (which is partly what messed up
  the original case.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96041 13f79535-47bb-0310-9956-ffa450edef68
2002-07-13 05:09:52 +00:00
William A. Rowe Jr
2ae737e3e9 Final tweak and CREDITs ... switch the order to simplify things, and
pull out the old dependency on ApacheMonitorVersion.rc


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96038 13f79535-47bb-0310-9956-ffa450edef68
2002-07-13 03:29:49 +00:00
William A. Rowe Jr
fa0248550a Totally different solution to our dependency problems provided by
James Cox <imajes@php.net> ... create ApacheMonitor.rc dynamically,
  and include our ApacheMonitor.rc.in templates of defined resources.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96037 13f79535-47bb-0310-9956-ffa450edef68
2002-07-13 03:18:21 +00:00
William A. Rowe Jr
00b1c6f5b9 While this fixed the bug, no resources were build for ApacheMonitor,
so the application couldn't start.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96023 13f79535-47bb-0310-9956-ffa450edef68
2002-07-12 05:55:21 +00:00
Ryan Bloom
898b8f7755 VC6 is unable to deal with dependencies that are still due to be made.
This moves around the order of compilation around so that the error goes
away.
PR:	10130
Submitted by:	James Cox [imajes@php.net]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95970 13f79535-47bb-0310-9956-ffa450edef68
2002-07-08 03:40:37 +00:00
William A. Rowe Jr
c6458d2501 Fix CoInitialize/CoUninitialize missing symbols, reported by Jerry Baker.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95137 13f79535-47bb-0310-9956-ffa450edef68
2002-05-16 16:40:54 +00:00
William A. Rowe Jr
b20e011389 Yesterday's patch went to far, add a missing library (and drop a release
reference to an unneeded one.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95085 13f79535-47bb-0310-9956-ffa450edef68
2002-05-14 12:38:40 +00:00
William A. Rowe Jr
0105166da0 Clean out some needless flags/libs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95063 13f79535-47bb-0310-9956-ffa450edef68
2002-05-13 14:56:04 +00:00
William A. Rowe Jr
01f26b0ff7 Eliminate cyclic dependency that broke 2.0.35 command line build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94582 13f79535-47bb-0310-9956-ffa450edef68
2002-04-09 15:36:42 +00:00
William A. Rowe Jr
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
William A. Rowe Jr
7c2044b3b9 /GZ RTL debug flag is not recognized across VC 5/6/7.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91219 13f79535-47bb-0310-9956-ffa450edef68
2001-10-01 15:57:38 +00:00
William A. Rowe Jr
f0362ccc07 Toggle the /Zi flag to allow all supportd versions of VC (5, 6, 7) to
build 'out of the box' in debugging mode.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90686 13f79535-47bb-0310-9956-ffa450edef68
2001-08-26 05:21:50 +00:00
William A. Rowe Jr
9062307073 The purpose of this patch is to toggle the debugging mode (default) to
Program Database (from Program Database for Modify on the fly debugging).

  The net effect of this patch is to clean up all of the irrelevant entries
  associated with either the debugging or release command line switches, and
  generally straighten the projects as they would be exported from VC6/SP5.

  The outcome of this patch is that VC5 users -should- be able to load and
  build the workspace without any errors (as they used to have no symbols
  database at all, the /ZI option doesn't work, they had to use cvtdsp.pl
  to toggle these to /Zi.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90269 13f79535-47bb-0310-9956-ffa450edef68
2001-08-17 03:45:35 +00:00
William A. Rowe Jr
0bf8fca519 Undo a very bad decision. By naming the version file .ver, I lost track
of it setting aside the generated resources.  This assures that file won't
  fall through the cracks when we generate zip files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90256 13f79535-47bb-0310-9956-ffa450edef68
2001-08-17 00:11:26 +00:00
William A. Rowe Jr
48f17616b6 ApacheMonitor versioning needs to click in with the httpd version.
Also remove the icons deprecated by Mladen late last week from the IDE.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90200 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 06:29:57 +00:00
Cliff Woolley
68c0c55c59 I accidentally committed the DOS line endings in that last commit. This
strips them back out again.  Diff this against v1.1 for the real changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90006 13f79535-47bb-0310-9956-ffa450edef68
2001-08-07 20:01:18 +00:00
Cliff Woolley
4c8044a5cd This is a nearly blind commit of an update posted by Mladen Turk just
after the initial import.  Mladen, please check this to see if I got it
right.

Submitted by:	Mladen Turk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90004 13f79535-47bb-0310-9956-ffa450edef68
2001-08-07 19:54:10 +00:00
William A. Rowe Jr
258b05fab1 The solution for an icon monitor app has arrived :)
Contributed by Mladen Turk <mturk@mappingsoft.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89985 13f79535-47bb-0310-9956-ffa450edef68
2001-08-07 15:51:29 +00:00