Re: [Boost-build] Missing manifest file

From: Alexey Pakhunov (alexeypa_at_[hidden])
Date: 2005-12-01 11:00:13

Deane Yang wrote:
> I had posted a fairly incoherent message about this problem before; I'd 
> like to try to post something a little clearer. If anyone can help me 
> with this, I'd be really grateful.

Sorry for the delay. I attached the patch that should fix your problem. 
It adds a check whether the manifest has been created by a linker. If it 
wasn't created there is no reason to embed it into the executable/library.

Best regards/Venlig hilsen,
   Alexey Pakhunov.

Index: msvc.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/msvc.jam,v
retrieving revision 1.66
diff -u -r1.66 msvc.jam
--- msvc.jam	23 Nov 2005 08:25:31 -0000	1.66
+++ msvc.jam	1 Dec 2005 15:55:59 -0000
@@ -353,12 +353,6 @@
             }
         }
 
-        if ! $(below-8.0)
-        {
-            flags msvc.link MANIFEST $(condition) : "mt -nologo -manifest " ;
-            flags msvc.link OUTPUTRESOURCE $(condition) : "-outputresource:" ;
-        }
-
 
         # Set version-specific flags
         configure-version-specific $(version) : $(condition) ;
@@ -672,13 +666,19 @@
 actions link bind DEF_FILE
 {
     $(.LD) /NOLOGO $(LINKFLAGS) /out:"$(<[1]:W)" /INCREMENTAL:NO /LIBPATH:"$(LINKPATH:W)" $(USER_LINKFLAGS) @"@($(<[1]:W).rsp:E=$(nl)"$(>)" $(nl)$(LIBRARIES) $(nl)"$(LIBRARY_OPTION)$(FINDLIBS_ST:S=.lib)" $(nl)"$(LIBRARY_OPTION)$(FINDLIBS_SA:S=.lib)")"
-    $(MANIFEST)$(<[1]).manifest $(OUTPUTRESOURCE)$(<[1]);1
+
+    if exist "$(<[1]).manifest" (
+        mt -nologo -manifest "$(<[1]).manifest" "-outputresource:$(<[1]);1"
+    )
 }
 
 actions link.dll bind DEF_FILE
 {
     $(.LD) /NOLOGO $(LINKFLAGS) /out:"$(<[1]:W)" /INCREMENTAL:NO /IMPLIB:"$(<[2]:W)" /LIBPATH:"$(LINKPATH:W)" /def:$(DEF_FILE) $(USER_LINKFLAGS) @"@($(<[1]:W).rsp:E=$(nl)"$(>)" $(nl)$(LIBRARIES) $(nl)"$(LIBRARY_OPTION)$(FINDLIBS_ST:S=.lib)" $(nl)"$(LIBRARY_OPTION)$(FINDLIBS_SA:S=.lib)")"
-    $(MANIFEST)$(<[1]).manifest $(OUTPUTRESOURCE)$(<[1]);2
+
+    if exist "$(<[1]).manifest" (
+        mt -nologo -manifest "$(<[1]).manifest" "-outputresource:$(<[1]);2"
+    )
 }