From 2c217893e517eaeb288c70b51816015a3a8a8124 Mon Sep 17 00:00:00 2001
From: Chris Dyer <cdyer@cab.ark.cs.cmu.edu>
Date: Wed, 23 May 2012 00:36:29 -0400
Subject: support for cab, pay attention to BOOST_ROOT in bjam

---
 jam-files/sanity.jam | 1 +
 1 file changed, 1 insertion(+)

(limited to 'jam-files/sanity.jam')

diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam
index 9c75c247..2a5fc381 100644
--- a/jam-files/sanity.jam
+++ b/jam-files/sanity.jam
@@ -74,6 +74,7 @@ if $(with-macports) {
 }
 else {
   with-boost = [ option.get "with-boost" ] ;
+  with-boost ?= [ os.environ "BOOST_ROOT" ] ;
   if $(with-boost) {
     L-boost-search = -L$(with-boost)/lib" "-L$(with-boost)/lib64 ;
     boost-search = <search>$(with-boost)/lib <search>$(with-boost)/lib64 ;
-- 
cgit v1.2.3


From a7bb404456734765b2e46a74410024e293b8c2d3 Mon Sep 17 00:00:00 2001
From: Kenneth Heafield <github@kheafield.com>
Date: Fri, 25 May 2012 12:00:45 -0400
Subject: Force multi-threaded build if only multi-threaded Boost is present.

---
 Jamroot              |  3 +--
 jam-files/sanity.jam | 14 +++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'jam-files/sanity.jam')

diff --git a/Jamroot b/Jamroot
index edc28e23..938a9764 100644
--- a/Jamroot
+++ b/Jamroot
@@ -26,9 +26,8 @@ if [ test_header boost/serialization/map.hpp ] && [ test_library boost_serializa
   requirements += <define>HAVE_BOOST_ARCHIVE_TEXT_OARCHIVE_HPP ;
 }
 
-# project : requirements $(requirements) ;
 project : requirements $(requirements) <toolset>darwin:<link>static ;
-project : default-build <threading>single <warnings>on <variant>release ;
+project : default-build <warnings>on <variant>release ;
 
 install-bin-libs dpmert//programs utils//programs mteval//programs klm/lm//programs training//liblbfgs decoder//cdec creg//creg phrasinator//programs mira//kbest_mira ;
 
diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam
index 2a5fc381..4e0432f9 100644
--- a/jam-files/sanity.jam
+++ b/jam-files/sanity.jam
@@ -87,6 +87,8 @@ else {
     boost-include = ;
   }
 }
+
+requirements = ;
  
 #Are we linking static binaries against shared boost?
 boost-auto-shared = [ auto-shared "boost_program_options" : $(L-boost-search) ] ;
@@ -96,8 +98,15 @@ rule boost-lib ( name macro ) {
   #versions of boost do not have -mt tagged versions of all libraries.   Sadly,
   #boost.jam does not handle this correctly.  
   if [ test_flags $(L-boost-search)" -lboost_"$(name)"-mt" ] {
-    lib inner_boost_$(name) : : <threading>single $(boost-search) <name>boost_$(name) ;
-    lib inner_boost_$(name) : : <threading>multi $(boost-search) <name>boost_$(name)-mt ;
+#    if [ test_flags $(L-boost-search)" -lboost_"$(name) ] {
+#      lib inner_boost_$(name) : : <threading>single $(boost-search) <name>boost_$(name) ;
+#      lib inner_boost_$(name) : : <threading>multi $(boost-search) <name>boost_$(name)-mt ;
+#    } else {
+      if ! <threading>multi in $(requirements) {
+        requirements += <threading>multi ;
+      }
+      lib inner_boost_$(name) : : <threading>multi $(boost-search) <name>boost_$(name)-mt ;
+#    }
   } else {
     lib inner_boost_$(name) : : $(boost-search) <name>boost_$(name) ;
   }
@@ -149,7 +158,6 @@ rule external-lib ( name : search-path * ) {
   local ignored = @($(build-log):E=$(script)) ;
 }
 
-requirements = ;
 {
   #Boost jam's static clang is buggy.  
   requirements += <cxxflags>$(cxxflags) <cflags>$(cflags) <linkflags>$(ldflags) <toolset>clang:<link>shared ;
-- 
cgit v1.2.3


From 6fd22244aaa33cd5cbc4d9bd1003e6eef7b6e418 Mon Sep 17 00:00:00 2001
From: Kenneth Heafield <kheafiel@cluster01.lti.ece.cmu.local>
Date: Sun, 27 May 2012 15:05:56 -0400
Subject: Add example installing perl script

---
 Jamroot              | 2 ++
 jam-files/sanity.jam | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'jam-files/sanity.jam')

diff --git a/Jamroot b/Jamroot
index c2e250d0..87a5a53d 100644
--- a/Jamroot
+++ b/Jamroot
@@ -31,6 +31,8 @@ project : default-build <warnings>on <variant>release ;
 
 install-bin-libs dpmert//programs utils//programs mteval//programs klm/lm//programs training//liblbfgs decoder//cdec phrasinator//programs mira//kbest_mira ;
 
+install perl-scripts : dpmert//dpmert.pl : <location>$(bindir) ;
+
 build-projects mteval decoder dpmert klm/lm training/liblbfgs ;
 
 #Compile everything ending with _test.cc into a test and run it.
diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam
index 4e0432f9..957f4f43 100644
--- a/jam-files/sanity.jam
+++ b/jam-files/sanity.jam
@@ -182,9 +182,10 @@ if $(prefix) {
 } else {
   prefix = $(TOP)/dist$(GITTAG) ;
 }
+
+bindir = [ option.get "bindir" : $(prefix)/bin ] ;
+libdir = [ option.get "libdir" : $(prefix)/lib ] ;
 rule install-bin-libs ( deps * ) {
-  local bindir = [ option.get "bindir" : $(prefix)/bin ] ;
-  local libdir = [ option.get "libdir" : $(prefix)/lib ] ;
   install prefix-bin : $(deps) : <location>$(bindir) <install-dependencies>on <install-type>EXE <link>shared:<dll-path>$(libdir) ;
   install prefix-lib : $(deps) : <location>$(libdir) <install-dependencies>on <install-type>LIB <link>shared:<dll-path>$(libdir) ;
 }
-- 
cgit v1.2.3