Fix bjam from any directory. Add iostreams dependency to score for Hieu.

This commit is contained in:
Kenneth Heafield 2012-05-10 12:18:49 -04:00
parent 80e3198dd2
commit 952f4b2523
3 changed files with 4 additions and 7 deletions

View File

@ -63,7 +63,8 @@
import option ;
import modules ;
import path ;
include jam-files/sanity.jam ;
path-constant TOP : . ;
include $(TOP)/jam-files/sanity.jam ;
boost 103600 ;
external-lib z ;

View File

@ -4,11 +4,6 @@ import os ;
import path ;
import project ;
local prj = [ project.current ] ;
mod = [ $(prj).project-module ] ;
path-constant TOP : . ;
#Shell with trailing line removed http://lists.boost.org/boost-build/2007/08/17051.php
rule trim-nl ( str extras * ) {
return [ MATCH "([^
@ -111,6 +106,7 @@ rule boost ( min-version ) {
boost-lib thread THREAD_DYN_DLL ;
boost-lib program_options PROGRAM_OPTIONS_DYN_LINK ;
boost-lib unit_test_framework TEST_DYN_LINK ;
boost-lib iostreams IOSTREAMS_DYN_LINK ;
}
#Link normally to a library, but sometimes static isn't installed so fall back to dynamic.

View File

@ -7,7 +7,7 @@ exe extract-rules : tables-core.cpp SentenceAlignment.cpp SentenceAlignmentWithS
exe extract-lex : extract-lex.cpp InputFileStream ;
exe score : tables-core.cpp AlignmentPhrase.cpp score.cpp PhraseAlignment.cpp InputFileStream ;
exe score : tables-core.cpp AlignmentPhrase.cpp score.cpp PhraseAlignment.cpp InputFileStream ../../..//boost_iostreams ;
exe consolidate : consolidate.cpp tables-core.cpp InputFileStream ;