moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-12-27 05:55:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/moses-smt/mosesdecoder

Browse Source 
Conflicts:
	moses/Jamfile
This commit is contained in:
Ulrich Germann 2014-03-11 22:29:55 +00:00
commit b26eabba39
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jam-files/sanity.jam
View File

@ -288,11 +288,11 @@ rule failure-message ( ok ? ) {
echo "If you need support, attach the full output to your e-mail." ;
} else {
echo "The build failed. If you need support, run:" ;
echo " $(args) --debug-configuration -d2 >build.log" ;
echo "then attach build.log to your e-mail." ;
echo " $(args) --debug-configuration -d2 |gzip >build.log.gz" ;
echo "then attach build.log.gz to your e-mail." ;
echo "You MUST do 3 things before sending to the mailing list:" ;
echo " 1. Subscribe to the mailing list at http://mailman.mit.edu/mailman/listinfo/moses-support" ;
echo " 2. Zip up your build.log file before attaching it to the email" ;
echo " 2. Attach build.log.gz to your e-mail" ;
echo " 3. Say what is the EXACT command you executed when you got the error" ;
}
echo "ERROR" ;

10
moses/Jamfile
View File

@ -23,14 +23,6 @@ if [ option.get "with-synlm" : no : yes ] = yes
alias synlm ;
}
local have-clock = [ SHELL "bash -c \"g++ -dM -x c++ -E /dev/null -include time.h 2>/dev/null |grep CLOCK_MONOTONIC\"" : exit-status ] ;
if $(have-clock[2]) = 0 {
#required for clock_gettime. Threads already have rt.
lib rt : : <runtime-link>static:<link>static <runtime-link>shared:<link>shared ;
} else {
alias rt ;
}
#This is a kludge to force rebuilding if different --with options are passed.
#Could have used features like <srilm>on but getting these to apply only to
#linking was ugly and it still didn't trigger an install (since the install
@ -75,7 +67,7 @@ TranslationModel/UG/generic//generic TranslationModel/UG/mm//mm
$(TOP)//boost_iostreams ;
alias headers-to-install : [ glob-tree [^.]*.h ] ;
alias headers-to-install : [ glob-tree *.h ] ;
import testing ;

14
util/Jamfile
View File

@ -11,8 +11,13 @@ if [ test_library "lzma" ] && [ test_header "lzma.h" ] {
compressed_deps += lzma ;
}
#rt is needed for clock_gettime on linux. But it's already included with threading=multi
lib rt ;
local have-clock = [ SHELL "bash -c \"g++ -dM -x c++ -E /dev/null -include time.h 2>/dev/null |grep CLOCK_MONOTONIC\"" : exit-status ] ;
if $(have-clock[2]) = 0 {
#required for clock_gettime. Threads already have rt.
lib rt : : <runtime-link>static:<link>static <runtime-link>shared:<link>shared ;
} else {
alias rt ;
}
obj read_compressed.o : read_compressed.cc : $(compressed_flags) ;
alias read_compressed : read_compressed.o $(compressed_deps) ;
@ -24,7 +29,10 @@ fakelib kenutil : bit_packing.cc ersatz_progress.cc exception.cc file.cc file_pi
import testing ;
run file_piece_test.o kenutil /top//boost_unit_test_framework : : file_piece.cc ;
for local t in [ glob *_test.cc : file_piece_test.cc read_compressed_test.cc ] {
unit-test pcqueue_test : pcqueue_test.cc kenutil /top//boost_unit_test_framework /top//boost_system : <threading>single:<build>no ;
for local t in [ glob *_test.cc : file_piece_test.cc read_compressed_test.cc pcqueue_test.cc ] {
local name = [ MATCH "(.*)\.cc" : $(t) ] ;
unit-test $(name) : $(t) kenutil /top//boost_unit_test_framework /top//boost_system ;
}