From c5933f39d0bae05fd789df79334fb31b33858097 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Sat, 8 Nov 2008 08:22:14 +0000 Subject: [PATCH] Rename 'standalone-manifest' to 'embed-manifest'. [SVN r49647] --- src/tools/msvc.jam | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/tools/msvc.jam b/src/tools/msvc.jam index 2fba1255e..be3e3a1df 100644 --- a/src/tools/msvc.jam +++ b/src/tools/msvc.jam @@ -38,7 +38,7 @@ import type ; type.register MANIFEST : manifest ; -feature.feature standalone-manifest : off on : incidental propagated ; +feature.feature embed-manifest : on off : incidental propagated ; ################################################################################ # @@ -421,7 +421,7 @@ actions compile.rc rule link ( targets + : sources * : properties * ) { - if ! on in $(properties) + if on in $(properties) { msvc.manifest $(targets) : $(sources) : $(properties) ; } @@ -430,13 +430,12 @@ rule link ( targets + : sources * : properties * ) rule link.dll ( targets + : sources * : properties * ) { DEPENDS $(<) : [ on $(<) return $(DEF_FILE) ] ; - if ! on in $(properties) + if on in $(properties) { msvc.manifest.dll $(targets) : $(sources) : $(properties) ; } } - # Incremental linking a DLL causes no end of problems: if the actual exports do # not change, the import .lib file is never updated. Therefore, the .lib is # always out-of-date and gets rebuilt every time. I am not sure that incremental @@ -993,7 +992,7 @@ class msvc-linking-generator : linking-generator { local result = [ generator.generated-targets $(sources) : $(property-set) : $(project) $(name) ] ; - if [ $(property-set).get ] = "on" + if [ $(property-set).get ] = "off" { if ! $(name) {