move all executables into bin

5 files changed, 10 insertions, 19 deletions

diff --git a/scripts/training/lexical-reordering/Jamfile b/scripts/training/lexical-reordering/Jamfile
index 2b18f9dde..0ff1af829 100644
--- a/scripts/training/lexical-reordering/Jamfile
+++ b/scripts/training/lexical-reordering/Jamfile
@@ -1,3 +1,2 @@
-exe score : InputFileStream.cpp reordering_classes.cpp score.cpp ../../..//z ;
+exe lexical-reordering-score : InputFileStream.cpp reordering_classes.cpp score.cpp ../../..//z ;
 
-install dist : score : <location>. <install-type>EXE ;
diff --git a/scripts/training/phrase-extract/Jamfile b/scripts/training/phrase-extract/Jamfile
index 9be67e80a..6fae90bb0 100644
--- a/scripts/training/phrase-extract/Jamfile
+++ b/scripts/training/phrase-extract/Jamfile
@@ -30,8 +30,3 @@ exe statistics : tables-core.o AlignmentPhrase.o statistics.cpp InputFileStream
 
 alias programs : extract extract-rules extract-lex score consolidate consolidate-direct consolidate-reverse relax-parse statistics ;
 
-install legacy : programs : <location>. <install-type>EXE ;
-
-build-project extract-ghkm ;
-build-project pcfg-extract ;
-build-project pcfg-score ;
diff --git a/scripts/training/phrase-extract/extract-ghkm/Jamfile b/scripts/training/phrase-extract/extract-ghkm/Jamfile
index e5a416f72..92adc2126 100644
--- a/scripts/training/phrase-extract/extract-ghkm/Jamfile
+++ b/scripts/training/phrase-extract/extract-ghkm/Jamfile
@@ -1,3 +1 @@
 exe extract-ghkm : [ glob *.cpp ] ..//filestreams ..//trees ../../../..//boost_iostreams ../../../..//boost_program_options ../../../..//z ;
-
-install tools : extract-ghkm : <install-type>EXE ;
diff --git a/scripts/training/symal/Jamfile b/scripts/training/symal/Jamfile
index 899046bd8..3ab564790 100644
--- a/scripts/training/symal/Jamfile
+++ b/scripts/training/symal/Jamfile
@@ -1,3 +1,2 @@
 exe symal : symal.cpp cmd.c ;
 
-install dist : symal : <location>. ;
diff --git a/scripts/training/train-model.perl.missing_bin_dir b/scripts/training/train-model.perl.missing_bin_dir
index f33067dc0..48911a891 100755
--- a/scripts/training/train-model.perl.missing_bin_dir
+++ b/scripts/training/train-model.perl.missing_bin_dir
@@ -248,28 +248,28 @@ my $__SORT_PARALLEL = "";
 $__SORT_PARALLEL = "--parallel $_SORT_PARALLEL" if $_SORT_PARALLEL;
 
 # supporting scripts/binaries from this package
-my $PHRASE_EXTRACT = "$SCRIPTS_ROOTDIR/training/phrase-extract/extract";
+my $PHRASE_EXTRACT = "$SCRIPTS_ROOTDIR/../bin/extract";
 $PHRASE_EXTRACT = "$SCRIPTS_ROOTDIR/generic/extract-parallel.perl $_CORES $SPLIT_EXEC \"$SORT_EXEC $__SORT_BUFFER_SIZE $__SORT_BATCH_SIZE $__SORT_COMPRESS $__SORT_PARALLEL\" $PHRASE_EXTRACT";
 
 my $RULE_EXTRACT;
 if (defined($_GHKM)) {
-  $RULE_EXTRACT = "$SCRIPTS_ROOTDIR/training/phrase-extract/extract-ghkm/tools/extract-ghkm";
+  $RULE_EXTRACT = "$SCRIPTS_ROOTDIR/../bin/extract-ghkm";
 }
 else {
-  $RULE_EXTRACT = "$SCRIPTS_ROOTDIR/training/phrase-extract/extract-rules";
+  $RULE_EXTRACT = "$SCRIPTS_ROOTDIR/../bin/extract-rules";
 }
 $RULE_EXTRACT = "$SCRIPTS_ROOTDIR/generic/extract-parallel.perl $_CORES $SPLIT_EXEC \"$SORT_EXEC $__SORT_BUFFER_SIZE $__SORT_BATCH_SIZE $__SORT_COMPRESS $__SORT_PARALLEL\" $RULE_EXTRACT";
 
-my $LEXICAL_REO_SCORER = "$SCRIPTS_ROOTDIR/training/lexical-reordering/score";
-my $MEMSCORE = "$SCRIPTS_ROOTDIR/training/memscore/memscore";
-my $EPPEX = "$SCRIPTS_ROOTDIR/training/eppex/eppex";
-my $SYMAL = "$SCRIPTS_ROOTDIR/training/symal/symal";
+my $LEXICAL_REO_SCORER = "$SCRIPTS_ROOTDIR/../bin/lexical-reordering-score";
+my $MEMSCORE = "$SCRIPTS_ROOTDIR/../bin/memscore";
+my $EPPEX = "$SCRIPTS_ROOTDIR/../bin/eppex";
+my $SYMAL = "$SCRIPTS_ROOTDIR/../bin/symal";
 my $GIZA2BAL = "$SCRIPTS_ROOTDIR/training/symal/giza2bal.pl";
 
-my $PHRASE_SCORE = "$SCRIPTS_ROOTDIR/training/phrase-extract/score";
+my $PHRASE_SCORE = "$SCRIPTS_ROOTDIR/../bin/score";
 $PHRASE_SCORE = "$SCRIPTS_ROOTDIR/generic/score-parallel.perl $_CORES \"$SORT_EXEC $__SORT_BUFFER_SIZE $__SORT_BATCH_SIZE $__SORT_COMPRESS $__SORT_PARALLEL\" $PHRASE_SCORE";
 
-my $PHRASE_CONSOLIDATE = "$SCRIPTS_ROOTDIR/training/phrase-extract/consolidate";
+my $PHRASE_CONSOLIDATE = "$SCRIPTS_ROOTDIR/../bin/consolidate";
 
 # utilities
 my $ZCAT = "gzip -cd";