User-config file required for windows build.

Author: Ayla Khan

.gitignore

@@ -1,14 +1,20 @@
 b2*
 bjam*
 bootstrap.log
-tools/build/v2/engine/bin.*
+boost/architecture
+boost/bin.v2
 tools/build/v2/engine/bootstrap
+tools/build/src/engine/bootstrap
+tools/build/src/engine/bin*
 project-config.jam*
+user-config.jam
 CMakeCache.txt
 CMakeFiles
 cmake_install.cmake
 Makefile
 lib
-boost/architecture
-boost/bin.v2
-tools/build/src/engine/bootstrap
+x64
+*.vcxproj*
+Boost.sdf
+Boost.sln
+Boost.v12.suo

CMakeLists.txt

@@ -109,11 +109,26 @@ if(SCI_BOOST_LIBRARIES)
 endif()
 
 if (BUILD_PYTHON)
- list(APPEND BOOTSTRAP_ARGS
-    "--with-python=${SCI_PYTHON_EXE}"
-    "--with-python-root=${SCI_PYTHON_ROOT}"
-    "--with-python-version=${SCI_PYTHON_VERSION_SHORT}"
-  )
+  if(WIN32)
+    # TO_NATIVE_PATH does not escape backslashes
+    file(TO_NATIVE_PATH "${SCI_PYTHON_EXE}" TMP)
+    string(REPLACE "\\" "\\\\" WIN32_PYTHON_EXE ${TMP})
+    file(TO_NATIVE_PATH "${SCI_PYTHON_INCLUDE}" TMP)
+    string(REPLACE "\\" "\\\\" WIN32_PYTHON_INCLUDE ${TMP})
+    file(TO_NATIVE_PATH "${SCI_PYTHON_LIBRARY_DIR}" TMP)
+    string(REPLACE "\\" "\\\\" WIN32_PYTHON_LIBRARY_DIR ${TMP})
+	configure_file(user-config.jam.in user-config.jam @ONLY)
+    list(APPEND BOOTSTRAP_ARGS
+	  "--user-config=user-config.jam"
+    )
+  else()
+    # TODO: try user-config.jam instead...
+    list(APPEND BOOTSTRAP_ARGS
+      "--with-python=${SCI_PYTHON_EXE}"
+      "--with-python-root=${SCI_PYTHON_ROOT}"
+      "--with-python-version=${SCI_PYTHON_VERSION_SHORT}"
+    )
+  endif()
 endif()
 
 

user-config.jam.in

@@ -0,0 +1,92 @@
+# Copyright 2003, 2005 Douglas Gregor
+# Copyright 2004 John Maddock
+# Copyright 2002, 2003, 2004, 2007 Vladimir Prus
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
+
+#   This file is used to configure your Boost.Build installation. You can modify
+# this file in place, or you can place it in a permanent location so that it
+# does not get overwritten should you get a new version of Boost.Build. See:
+#
+#   http://www.boost.org/boost-build2/doc/html/bbv2/overview/configuration.html
+#
+# for documentation about possible permanent locations.
+
+#   This file specifies which toolsets (C++ compilers), libraries, and other
+# tools are available. Often, you should be able to just uncomment existing
+# example lines and adjust them to taste. The complete list of supported tools,
+# and configuration instructions can be found at:
+#
+#   http://boost.org/boost-build2/doc/html/bbv2/reference/tools.html
+#
+
+#   This file uses Jam language syntax to describe available tools. Mostly,
+# there are 'using' lines, that contain the name of the used tools, and
+# parameters to pass to those tools -- where paremeters are separated by
+# semicolons. Important syntax notes:
+#
+#   - Both ':' and ';' must be separated from other tokens by whitespace
+#   - The '\' symbol is a quote character, so when specifying Windows paths you
+#     should use '/' or '\\' instead.
+#
+# More details about the syntax can be found at:
+#
+#   http://boost.org/boost-build2/doc/html/bbv2/advanced.html#bbv2.advanced.jam_language
+#
+
+# ------------------
+# GCC configuration.
+# ------------------
+
+# Configure gcc (default version).
+# using gcc ;
+
+# Configure specific gcc version, giving alternative name to use.
+# using gcc : 3.2 : g++-3.2 ;
+
+
+# -------------------
+# MSVC configuration.
+# -------------------
+
+# Configure msvc (default version, searched for in standard locations and PATH).
+# using msvc ;
+
+# Configure specific msvc version (searched for in standard locations and PATH).
+# using msvc : 8.0 ;
+
+
+# ----------------------
+# Borland configuration.
+# ----------------------
+# using borland ;
+
+
+# ----------------------
+# STLPort configuration.
+# ----------------------
+
+#   Configure specifying location of STLPort headers. Libraries must be either
+# not needed or available to the compiler by default.
+# using stlport : : /usr/include/stlport ;
+
+# Configure specifying location of both headers and libraries explicitly.
+# using stlport : : /usr/include/stlport /usr/lib ;
+
+
+# -----------------
+# QT configuration.
+# -----------------
+
+# Configure assuming QTDIR gives the installation prefix.
+# using qt ;
+
+# Configure with an explicit installation prefix.
+# using qt : /usr/opt/qt ;
+
+# ---------------------
+# Python configuration.
+# ---------------------
+
+# Configure specific Python version.
+using python : @SCI_PYTHON_VERSION_SHORT@ : @WIN32_PYTHON_EXE@ : @WIN32_PYTHON_INCLUDE@ : @WIN32_PYTHON_LIBRARY_DIR@ ;