apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r416113 - in /apr/apr/trunk: CHANGES libapr.dsp
Date Wed, 21 Jun 2006 21:24:34 GMT
Author: wrowe
Date: Wed Jun 21 14:24:34 2006
New Revision: 416113

URL: http://svn.apache.org/viewvc?rev=416113&view=rev
Log:

  Provide folding in autogenerated .manifest files for Win32 builders
  using VisualStudio 2005.  This actually describes the clib that is
  required at run time by this build of libapr-1.dll



Modified:
    apr/apr/trunk/CHANGES
    apr/apr/trunk/libapr.dsp

Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=416113&r1=416112&r2=416113&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES (original)
+++ apr/apr/trunk/CHANGES Wed Jun 21 14:24:34 2006
@@ -1,5 +1,8 @@
 Changes for APR 1.3.0
 
+  *) Provide folding in autogenerated .manifest files for Win32 builders
+     using VisualStudio 2005  [William Rowe]
+
   *) Utilise Solaris' native atomic_* functions for apr_atomics
      where appropriate. [Colm MacCarthaigh]
 

Modified: apr/apr/trunk/libapr.dsp
URL: http://svn.apache.org/viewvc/apr/apr/trunk/libapr.dsp?rev=416113&r1=416112&r2=416113&view=diff
==============================================================================
--- apr/apr/trunk/libapr.dsp (original)
+++ apr/apr/trunk/libapr.dsp Wed Jun 21 14:24:34 2006
@@ -56,6 +56,12 @@
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /opt:ref
 # ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /out:"Release/libapr-1.dll"
/opt:ref
+# Begin Special Build Tool
+OutDir=.\Release
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=echo if exist $(OUTDIR)\libapr-1.dll.manifest mt.exe -manifest $(OUTDIR)\libapr-1.dll.manifest
-outputresource:$(OUTDIR)\libapr-1.dll;2
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
 
@@ -82,6 +88,12 @@
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug
 # ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /out:"Debug/libapr-1.dll"
+# Begin Special Build Tool
+OutDir=.\Debug
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=echo if exist $(OUTDIR)\libapr-1.dll.manifest mt.exe -manifest $(OUTDIR)\libapr-1.dll.manifest
-outputresource:$(OUTDIR)\libapr-1.dll;2
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "libapr - Win32 ReleaseNT"
 
@@ -106,8 +118,12 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /out:"ReleaseNT/libapr-1.dll"
/opt:ref
+# Begin Special Build Tool
+OutDir=.\ReleaseNT
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=echo if exist $(OUTDIR)\libapr-1.dll.manifest mt.exe -manifest $(OUTDIR)\libapr-1.dll.manifest
-outputresource:$(OUTDIR)\libapr-1.dll;2
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "libapr - Win32 DebugNT"
 
@@ -134,6 +150,12 @@
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug
 # ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /out:"DebugNT/libapr-1.dll"
+# Begin Special Build Tool
+OutDir=.\DebugNT
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=echo if exist $(OUTDIR)\libapr-1.dll.manifest mt.exe -manifest $(OUTDIR)\libapr-1.dll.manifest
-outputresource:$(OUTDIR)\libapr-1.dll;2
+# End Special Build Tool
 
 !ENDIF 
 



Mime
View raw message