[Boost-commit] svn:boost r66699 - trunk/libs/regex/build

Subject: [Boost-commit] svn:boost r66699 - trunk/libs/regex/build
From: john_at_[hidden]
Date: 2010-11-23 08:09:09

Author: johnmaddock
Date: 2010-11-23 08:09:08 EST (Tue, 23 Nov 2010)
New Revision: 66699
URL: http://svn.boost.org/trac/boost/changeset/66699

Log:
Yes another attempt to fix the 64-bit paths issue.
Refs #4864.
Text files modified: 
   trunk/libs/regex/build/Jamfile.v2 |    29 ++++++++++-------------------           
   1 files changed, 10 insertions(+), 19 deletions(-)

Modified: trunk/libs/regex/build/Jamfile.v2
==============================================================================
--- trunk/libs/regex/build/Jamfile.v2	(original)
+++ trunk/libs/regex/build/Jamfile.v2	2010-11-23 08:09:08 EST (Tue, 23 Nov 2010)
@@ -12,18 +12,17 @@
 
 local disable-icu = [ MATCH (--disable-icu) : [ modules.peek : ARGV ] ] ;
 
-rule dll-path_options ( properties * )
+rule path_options ( properties * )
 {
     local result ;
     if <address-model>64 in $(properties)
     {
-    	result = <dll-path>$(ICU_PATH)/bin64 ;
+    	result = <search>$(ICU_PATH)/bin64 <search>$(ICU_PATH)/lib64 ;
     }
     else
     {
-    	result = <dll-path>$(ICU_PATH)/bin ;
+    	result = <search>$(ICU_PATH)/bin <search>$(ICU_PATH)/lib ;
     }
-    ECHO $(result) ;
     return $(result) ;
 }
 
@@ -49,24 +48,17 @@
    }
    else
    {
-      lib icuuc : :                   <search>$(ICU_PATH)/lib   <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
-      lib icuuc : : <address-model>64 <search>$(ICU_PATH)/lib64 <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
-      lib icuuc : :                   <toolset>msvc <variant>debug <name>icuucd <search>$(ICU_PATH)/lib   <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
-      lib icuuc : : <address-model>64 <toolset>msvc <variant>debug <name>icuucd <search>$(ICU_PATH)/lib64 <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
+      lib icuuc : :                                           <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <link>shared <runtime-link>shared <conditional>@path_options ;
       lib icuuc : : <name>this_is_an_invalid_library_name ;
 
-      lib icudt : :                   <search>$(ICU_PATH)/lib   <name>icudata <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
-      lib icudt : : <address-model>64 <search>$(ICU_PATH)/lib64 <name>icudata <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
-      lib icudt : :                   <search>$(ICU_PATH)/lib   <name>icudt <toolset>msvc <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
-      lib icudt : : <address-model>64 <search>$(ICU_PATH)/lib64 <name>icudt <toolset>msvc <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
+      lib icudt : : <name>icudata               <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icudt : : <name>icudt   <toolset>msvc <link>shared <runtime-link>shared <conditional>@path_options ;
       lib icudt : : <name>this_is_an_invalid_library_name ;
 
-      lib icuin : :                   <search>$(ICU_PATH)/lib   <name>icui18n <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
-      lib icuin : : <address-model>64 <search>$(ICU_PATH)/lib64 <name>icui18n <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
-      lib icuin : :                   <toolset>msvc <variant>debug <name>icuind <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
-      lib icuin : : <address-model>64 <toolset>msvc <variant>debug <name>icuind <search>$(ICU_PATH)/lib64 <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
-      lib icuin : :                   <toolset>msvc <variant>release <name>icuin <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
-      lib icuin : : <address-model>64 <toolset>msvc <variant>release <name>icuin <search>$(ICU_PATH)/lib64 <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
+      lib icuin : :                                <name>icui18n <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuin : : <toolset>msvc <variant>debug   <name>icuind  <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuin : : <toolset>msvc <variant>release <name>icuin   <link>shared <runtime-link>shared <conditional>@path_options ;
       lib icuin : : <name>this_is_an_invalid_library_name ;
 
       if $(ICU_PATH)
@@ -106,7 +98,6 @@
          <library>icudt/<link>shared/<runtime-link>shared 
          <library>icuin/<link>shared/<runtime-link>shared 
          <define>BOOST_HAS_ICU=1 
-         <dll-path>$(ICU_PATH)/bin
          <runtime-link>shared
          <toolset>msvc:<linkflags>/delayload:$(icuucd_name:B).dll
          <toolset>msvc:<linkflags>/delayload:$(icuuc_name:B).dll