[Boost-build] [BBv2] [msvc] Embedding a manifest into an executable does not work as expected.

From: Alexey Pakhunov (alexeypa_at_[hidden])
Date: 2005-11-12 12:59:32

Hi All,

I just encounter a small problem with manifests on VS 2005. Resource ID 
of a manifest should be 1 for an executable and 2 for dll. The attached 
patch fixes this issue.

Best regards/Venlig hilsen,
   Alexey Pakhunov.

Index: msvc.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/msvc.jam,v
retrieving revision 1.63
diff -u -r1.63 msvc.jam
--- msvc.jam    9 Nov 2005 13:56:41 -0000   1.63
+++ msvc.jam    12 Nov 2005 17:50:15 -0000
@@ -652,13 +652,13 @@
 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]);#2
+    $(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
+    $(MANIFEST)$(<[1]).manifest $(OUTPUTRESOURCE)$(<[1]);2
 }