Changeset 19017

Timestamp:

07/11/06 09:55:36 (2 years ago)

Author:

patrick

Message:

MF20 [rev 19016]: Now that we are using automatic linking with Boost

libraries, we do not need to worry about which Boost.Build
toolset to use. The Boost automatic linking stuff figures
that out on its own.

Files:

• juggler/trunk/README-WINDOWS.html (modified) (1 diff)
• juggler/trunk/build_windows.py (modified) (4 diffs)

juggler/trunk/README-WINDOWS.html

@@ -127 +127 @@
-    which the Boost headers will be found.
-  </dd>
-  <dt><tt>BOOST_TOOL</tt></dt>
-  <dd>
-    The name of the Boost Jam toolset used to compile Boost.  Generally,
-    this will be either <tt>vc7</tt>, <tt>vc71</tt>, or <tt>vc80</tt>, but it
-    depends on how Boost was compiled.  To determine which toolset was used, look
-    at the names of the libraries in <tt>%BOOST_ROOT%\lib</tt>.  For example,
-    the name of the Boost.Filesystem DLL may be
-    <tt>boost_filesystem-<b>vc7</b>-mt-1_31.dll</tt> where the
-    <tt>vc7</tt> part of the file name is the value to use for this
-    setting.
-
-    <blockquote>
-      <b>NOTE:</b> There is some inconsistency between the name of the
-      toolset specified when running <tt>bjam</tt> to compile and install
-      Boost.  For example, the name of the Visual C++ 7.1 toolset is
-      <tt>vc7_1</tt>, but the compiled libraries names contain the
-      substring <tt>vc71</tt>.  <i>The value to use is the substring in the
-      library name.</i>
-    </blockquote>
-  </dd>
-  <dt><tt>BOOST_VERSION</tt></dt>
-  <dd>

juggler/trunk/build_windows.py

@@ -151 +151 @@
-   return (cl_ver_major, cl_ver_minor, vc_dir)
-
-def guessBoostToolset(clVerMajor, clVerMinor):
-   if clVerMajor == 13 and clVerMinor < 10:
-      boost_tool_guess = 'vc7'
-   elif clVerMajor == 13 and clVerMinor >= 10:
-      boost_tool_guess = 'vc71'
-   else:
-      boost_tool_guess = 'vc80'
-
-   return boost_tool_guess
-
-def printStatus(msg):
-   '''
@@ -198 +188 @@
-
-def getDefaultVars(clVerMajor, clVerMinor):
-   boost_tool_fallback = guessBoostToolset(clVerMajor, clVerMinor)
-
-   required = []
-   required.append(BuildOption('BOOST_ROOT',
@@ -208 +196 @@
-                               'Directory containing the Boost C++ header tree',
-                               ''))
-   required.append(BuildOption('BOOST_TOOL',
-                               'The Boost.Build toolset library name component',
-                               boost_tool_fallback, False))
-   required.append(BuildOption('NSPR_ROOT', 'NSPR installation directory', ''))
-   required.append(BuildOption('CPPDOM_ROOT', 'CppDOM installation directory',
@@ -294 +279 @@
-def postProcessOptions(options):
-   os.environ['instprefix'] = options['prefix'].replace('\\', '\\\\')
-
-   # Check for Boost 1.32 Visual C++ toolset names.
-   match = re.compile(r'vc-(\d)_(\d)').match(options['BOOST_TOOL'])
-
-   if match is not None:
-      os.environ['BOOST_TOOL'] = 'vc%s%s' % (match.group(1), match.group(2))
-
-   # If the %JAVA_HOME% setting is a valid directory, add its bin subdirectory