From: Thomas J. Donovan Date: Wed, 11 Jun 2008 16:34:20 +0000 (+0000) Subject: Windows manifests are ;1 for .exe, ;2 for .dll and .so - ref: http://msdn.microsoft... X-Git-Tag: 2.3.0~499 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ff5f3e156f6209c4f84d7e2c17cbf057258cc06;p=thirdparty%2Fapache%2Fhttpd.git 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 --- diff --git a/httpd.dsp b/httpd.dsp index c080269ce12..96b5f4460ed 100644 --- a/httpd.dsp +++ b/httpd.dsp @@ -55,7 +55,7 @@ LINK32=link.exe TargetPath=.\Release\httpd.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ELSEIF "$(CFG)" == "httpd - Win32 Debug" @@ -86,7 +86,7 @@ LINK32=link.exe TargetPath=.\Debug\httpd.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ENDIF diff --git a/support/ab.dsp b/support/ab.dsp index 5c67d09772a..5925691f5b3 100644 --- a/support/ab.dsp +++ b/support/ab.dsp @@ -55,7 +55,7 @@ LINK32=link.exe TargetPath=.\Release\ab.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ELSEIF "$(CFG)" == "ab - Win32 Debug" @@ -85,7 +85,7 @@ LINK32=link.exe TargetPath=.\Debug\ab.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ENDIF diff --git a/support/abs.dsp b/support/abs.dsp index 1e7ed1df00c..c8ba600e743 100644 --- a/support/abs.dsp +++ b/support/abs.dsp @@ -55,7 +55,7 @@ LINK32=link.exe TargetPath=.\Release\abs.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ELSEIF "$(CFG)" == "abs - Win32 Debug" @@ -85,7 +85,7 @@ LINK32=link.exe TargetPath=.\Debug\abs.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ENDIF diff --git a/support/htcacheclean.dsp b/support/htcacheclean.dsp index ccca4b2534e..d3d4b8fa60e 100644 --- a/support/htcacheclean.dsp +++ b/support/htcacheclean.dsp @@ -55,7 +55,7 @@ LINK32=link.exe TargetPath=.\Release\htcacheclean.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ELSEIF "$(CFG)" == "htcacheclean - Win32 Debug" @@ -85,7 +85,7 @@ LINK32=link.exe TargetPath=.\Debug\htcacheclean.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ENDIF diff --git a/support/htdbm.dsp b/support/htdbm.dsp index 541e330b29a..e6864072e76 100644 --- a/support/htdbm.dsp +++ b/support/htdbm.dsp @@ -55,7 +55,7 @@ LINK32=link.exe TargetPath=.\Release\htdbm.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ELSEIF "$(CFG)" == "htdbm - Win32 Debug" @@ -85,7 +85,7 @@ LINK32=link.exe TargetPath=.\Debug\htdbm.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ENDIF diff --git a/support/htdigest.dsp b/support/htdigest.dsp index 1f235f7dc9f..63c23baf00d 100644 --- a/support/htdigest.dsp +++ b/support/htdigest.dsp @@ -55,7 +55,7 @@ LINK32=link.exe TargetPath=.\Release\htdigest.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ELSEIF "$(CFG)" == "htdigest - Win32 Debug" @@ -85,7 +85,7 @@ LINK32=link.exe TargetPath=.\Debug\htdigest.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ENDIF diff --git a/support/htpasswd.dsp b/support/htpasswd.dsp index 4bd9b5361b2..36a57259bed 100644 --- a/support/htpasswd.dsp +++ b/support/htpasswd.dsp @@ -55,7 +55,7 @@ LINK32=link.exe TargetPath=.\Release\htpasswd.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ELSEIF "$(CFG)" == "htpasswd - Win32 Debug" @@ -85,7 +85,7 @@ LINK32=link.exe TargetPath=.\Debug\htpasswd.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ENDIF diff --git a/support/httxt2dbm.dsp b/support/httxt2dbm.dsp index f6b36ae094e..cba28a0b082 100644 --- a/support/httxt2dbm.dsp +++ b/support/httxt2dbm.dsp @@ -55,7 +55,7 @@ LINK32=link.exe TargetPath=.\Release\httxt2dbm.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ELSEIF "$(CFG)" == "httxt2dbm - Win32 Debug" @@ -85,7 +85,7 @@ LINK32=link.exe TargetPath=.\Debug\httxt2dbm.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ENDIF diff --git a/support/logresolve.dsp b/support/logresolve.dsp index ac404dbca11..24c946ddd88 100644 --- a/support/logresolve.dsp +++ b/support/logresolve.dsp @@ -55,7 +55,7 @@ LINK32=link.exe TargetPath=.\Release\logresolve.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ELSEIF "$(CFG)" == "logresolve - Win32 Debug" @@ -85,7 +85,7 @@ LINK32=link.exe TargetPath=.\Debug\logresolve.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ENDIF diff --git a/support/rotatelogs.dsp b/support/rotatelogs.dsp index 5a043208bfe..7fda0e05c5a 100644 --- a/support/rotatelogs.dsp +++ b/support/rotatelogs.dsp @@ -55,7 +55,7 @@ LINK32=link.exe TargetPath=.\Release\rotatelogs.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ELSEIF "$(CFG)" == "rotatelogs - Win32 Debug" @@ -85,7 +85,7 @@ LINK32=link.exe TargetPath=.\Debug\rotatelogs.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ENDIF diff --git a/support/win32/ApacheMonitor.dsp b/support/win32/ApacheMonitor.dsp index 84369aaa723..3465ecd7a6b 100644 --- a/support/win32/ApacheMonitor.dsp +++ b/support/win32/ApacheMonitor.dsp @@ -58,7 +58,7 @@ LINK32=link.exe TargetPath=.\Release\ApacheMonitor.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ELSEIF "$(CFG)" == "ApacheMonitor - Win32 Debug" @@ -90,7 +90,7 @@ LINK32=link.exe TargetPath=.\Debug\ApacheMonitor.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ENDIF diff --git a/support/win32/wintty.dsp b/support/win32/wintty.dsp index 8d5b9df6ebd..337ba17a2f2 100644 --- a/support/win32/wintty.dsp +++ b/support/win32/wintty.dsp @@ -55,7 +55,7 @@ LINK32=link.exe TargetPath=.\Release\wintty.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ELSEIF "$(CFG)" == "wintty - Win32 Debug" @@ -85,7 +85,7 @@ LINK32=link.exe TargetPath=.\Debug\wintty.exe SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest -PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);1 # End Special Build Tool !ENDIF