[Boost-commit] svn:boost r73214 - trunk/libs/locale/build

Subject: [Boost-commit] svn:boost r73214 - trunk/libs/locale/build
From: artyomtnk_at_[hidden]
Date: 2011-07-18 07:44:43

Author: artyom
Date: 2011-07-18 07:44:42 EDT (Mon, 18 Jul 2011)
New Revision: 73214
URL: http://svn.boost.org/trac/boost/changeset/73214

Log:
Added support of search of a libraries in lib64/bin64
directories with full checks

Text files modified: 
   trunk/libs/locale/build/Jamfile.v2 |   164 +++++++++++++++++++++++++++++++++++---- 
   1 files changed, 145 insertions(+), 19 deletions(-)

Modified: trunk/libs/locale/build/Jamfile.v2
==============================================================================
--- trunk/libs/locale/build/Jamfile.v2	(original)
+++ trunk/libs/locale/build/Jamfile.v2	2011-07-18 07:44:42 EDT (Mon, 18 Jul 2011)
@@ -46,33 +46,140 @@
 
 ICU_PATH =  [ modules.peek : ICU_PATH ] ;
 ICU_LINK =  [ modules.peek : ICU_LINK ] ;
+
 if $(ICU_LINK)
 {
     ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <runtime-link>shared ;
+    ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ;
 }
 else
 {
-    searched-lib icuuc : : <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
-    searched-lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
-    searched-lib icuuc : : <name>this_is_an_invalid_library_name ;
-    searched-lib icudt : : <search>$(ICU_PATH)/lib <name>icudata <link>shared <runtime-link>shared ;
-    searched-lib icudt : : <search>$(ICU_PATH)/lib <name>icudt <toolset>msvc <link>shared <runtime-link>shared ;
-    searched-lib icudt : : <name>this_is_an_invalid_library_name ;
-    searched-lib icuin : : <search>$(ICU_PATH)/lib <name>icui18n <link>shared <runtime-link>shared ;
-    searched-lib icuin : : <toolset>msvc <variant>debug <name>icuind <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
-    searched-lib icuin : : <toolset>msvc <variant>release <name>icuin <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
-    searched-lib icuin : : <name>this_is_an_invalid_library_name ;
+    searched-lib icuuc : :  <name>icuuc
+                            <search>$(ICU_PATH)/lib 
+                            <link>shared 
+                            <runtime-link>shared ;
+
+    searched-lib icuuc : :  <toolset>msvc
+                            <variant>debug
+                            <name>icuucd
+                            <search>$(ICU_PATH)/lib
+                            <link>shared
+                            <runtime-link>shared ;
+
+    searched-lib icuuc : :  <name>this_is_an_invalid_library_name ;
+
+    searched-lib icudt : :  <search>$(ICU_PATH)/lib
+                            <name>icudata
+                            <link>shared
+                            <runtime-link>shared ;
+
+    searched-lib icudt : :  <search>$(ICU_PATH)/lib
+                            <name>icudt
+                            <toolset>msvc
+                            <link>shared
+                            <runtime-link>shared ;
+
+    searched-lib icudt : :  <name>this_is_an_invalid_library_name ;
+
+    searched-lib icuin : :  <search>$(ICU_PATH)/lib
+                            <name>icui18n
+                            <link>shared
+                            <runtime-link>shared ;
+
+    searched-lib icuin : :  <toolset>msvc
+                            <variant>debug
+                            <name>icuind
+                            <search>$(ICU_PATH)/lib
+                            <link>shared
+                            <runtime-link>shared ;
+
+    searched-lib icuin : :  <toolset>msvc
+                            <variant>release
+                            <name>icuin
+                            <search>$(ICU_PATH)/lib
+                            <link>shared
+                            <runtime-link>shared ;
+
+    searched-lib icuin : :  <name>this_is_an_invalid_library_name ;
+
     explicit icuuc icudt icuin ;
-    
+
     ICU_OPTS =   <include>$(ICU_PATH)/include 
       <library>icuuc/<link>shared/<runtime-link>shared 
       <library>icudt/<link>shared/<runtime-link>shared 
       <library>icuin/<link>shared/<runtime-link>shared
       <dll-path>$(ICU_PATH)/bin
         <runtime-link>shared ;
+
+
+
+    searched-lib icuuc_64 : :   <name>icuuc
+                                <search>$(ICU_PATH)/lib64 
+                                <link>shared 
+                                <runtime-link>shared ;
+
+    searched-lib icuuc_64 : :   <toolset>msvc
+                                <variant>debug
+                                <name>icuucd
+                                <search>$(ICU_PATH)/lib64
+                                <link>shared
+                                <runtime-link>shared ;
+
+    searched-lib icuuc_64 : :   <name>this_is_an_invalid_library_name ;
+
+    searched-lib icudt_64 : :   <search>$(ICU_PATH)/lib64
+                                <name>icudata
+                                <link>shared
+                                <runtime-link>shared ;
+
+    searched-lib icudt_64 : :   <search>$(ICU_PATH)/lib64
+                                <name>icudt
+                                <toolset>msvc
+                                <link>shared
+                                <runtime-link>shared ;
+
+    searched-lib icudt_64 : :   <name>this_is_an_invalid_library_name ;
+
+    searched-lib icuin_64 : :   <search>$(ICU_PATH)/lib64
+                                <name>icui18n
+                                <link>shared
+                                <runtime-link>shared ;
+
+    searched-lib icuin_64 : :   <toolset>msvc
+                                <variant>debug
+                                <name>icuind
+                                <search>$(ICU_PATH)/lib64
+                                <link>shared
+                                <runtime-link>shared ;
+
+    searched-lib icuin_64 : :   <toolset>msvc
+                                <variant>release
+                                <name>icuin
+                                <search>$(ICU_PATH)/lib64
+                                <link>shared
+                                <runtime-link>shared ;
+
+    searched-lib icuin_64 : :   <name>this_is_an_invalid_library_name ;
+
+    explicit icuuc_64 icudt_64 icuin_64 ;
+
+    ICU64_OPTS =   <include>$(ICU_PATH)/include 
+      <library>icuuc_64/<link>shared/<runtime-link>shared 
+      <library>icudt_64/<link>shared/<runtime-link>shared 
+      <library>icuin_64/<link>shared/<runtime-link>shared
+      <dll-path>$(ICU_PATH)/bin64
+        <runtime-link>shared ;
+ 
+    
 }
-exe has_icu : ../build/has_icu_test.cpp  : $(ICU_OPTS) ;
-explicit has_icu ;
+
+obj has_icu_obj     : ../build/has_icu_test.cpp ;
+obj has_icu64_obj   : ../build/has_icu_test.cpp ;
+
+exe has_icu   : has_icu_obj   : $(ICU_OPTS)   ;
+exe has_icu64 : has_icu64_obj : $(ICU64_OPTS) ;
+
+explicit has_icu has_icu64 ;
 
 
 # This function is called whenever the 'boost_locale' metatarget
@@ -110,20 +217,39 @@
     }
 
     local found-icu ;
+
     if ! <boost.locale.icu>off in $(properties)
     {
         if [ configure.builds has_icu : $(properties) : "icu" ]
         {
             found-icu = true ;
             flags-result += <define>BOOST_LOCALE_WITH_ICU=1 $(ICU_OPTS) ;
+        }
+        else if [ configure.builds has_icu64 : $(properties) : "icu (lib64)" ]
+        {
+            found-icu = true ;
+            flags-result += <define>BOOST_LOCALE_WITH_ICU=1 $(ICU64_OPTS) ;
+        }
 
-            for s in boundary codecvt collator conversion date_time formatter
-                     icu_backend numeric time_zone
-            {
-                result += <source>icu/$(s).cpp ;
-            }
-            result += <library>../../thread/build//boost_thread ;
+        if $(found-icu)
+        {
+            ICU_SOURCES = 
+                boundary
+                codecvt
+                collator
+                conversion
+                date_time
+                formatter
+                icu_backend
+                numeric
+                time_zone
+                ;
+            
+            result += <source>icu/$(ICU_SOURCES).cpp 
+                      <library>../../thread/build//boost_thread 
+                      ;
         }
+
     }
         
     if ! $(found-iconv) && ! $(found-icu) && ! <target-os>windows in $(properties) && ! <target-os>cygwin in $(properties)