Merge CreateOnDisk into OnDiskPt, pop out of src

33 files changed, 51 insertions, 51 deletions

diff --git a/CreateOnDisk/src/Jamfile b/CreateOnDisk/src/Jamfile
deleted file mode 100644
index 093dc0122..000000000
--- a/CreateOnDisk/src/Jamfile
+++ /dev/null
@@ -1 +0,0 @@
-exe CreateOnDisk : Main.cpp ../../moses/src//moses ../../OnDiskPt/src//OnDiskPt ;
diff --git a/Jamroot b/Jamroot
index 1a4a25cdc..40d3bca9b 100644
--- a/Jamroot
+++ b/Jamroot
@@ -191,7 +191,7 @@ if [ option.get "git" : : "yes" ] {
   constant GITTAG : "" ;
 }
 
-alias programs : lm//query lm//build_binary moses-chart-cmd/src//moses_chart moses-cmd/src//programs CreateOnDisk/src//CreateOnDisk mert//programs contrib/server//mosesserver misc//programs ;
+alias programs : lm//query lm//build_binary moses-chart-cmd/src//moses_chart moses-cmd/src//programs OnDiskPt//CreateOnDisk mert//programs contrib/server//mosesserver misc//programs ;
 
 prefix = [ option.get "prefix" : $(TOP)/dist$(GITTAG) ] ;
 bindir = [ option.get "bindir" : $(prefix)/bin ] ;
diff --git a/OnDiskPt/src/Jamfile b/OnDiskPt/Jamfile
index 80ca813d2..f9811c05b 100644
--- a/OnDiskPt/src/Jamfile
+++ b/OnDiskPt/Jamfile
@@ -1 +1,2 @@
-lib OnDiskPt : OnDiskWrapper.cpp SourcePhrase.cpp TargetPhrase.cpp Word.cpp Phrase.cpp PhraseNode.cpp TargetPhraseCollection.cpp Vocab.cpp ../../moses/src//headers ;
+lib OnDiskPt : OnDiskWrapper.cpp SourcePhrase.cpp TargetPhrase.cpp Word.cpp Phrase.cpp PhraseNode.cpp TargetPhraseCollection.cpp Vocab.cpp ../moses/src//headers ;
+exe CreateOnDisk : Main.cpp ../moses/src//moses OnDiskPt ;
diff --git a/CreateOnDisk/src/Main.cpp b/OnDiskPt/Main.cpp
index 74af77f46..d8899def5 100644
--- a/CreateOnDisk/src/Main.cpp
+++ b/OnDiskPt/Main.cpp
@@ -23,15 +23,15 @@
 #include <string>
 #include <vector>
 #include <iterator>
-#include "../../moses/src/InputFileStream.h"
-#include "../../moses/src/Util.h"
-#include "../../moses/src/UserMessage.h"
-#include "../../OnDiskPt/src/OnDiskWrapper.h"
-#include "../../OnDiskPt/src/SourcePhrase.h"
-#include "../../OnDiskPt/src/TargetPhrase.h"
-#include "../../OnDiskPt/src/TargetPhraseCollection.h"
-#include "../../OnDiskPt/src/Word.h"
-#include "../../OnDiskPt/src/Vocab.h"
+#include "../moses/src/InputFileStream.h"
+#include "../moses/src/Util.h"
+#include "../moses/src/UserMessage.h"
+#include "../OnDiskPt/OnDiskWrapper.h"
+#include "../OnDiskPt/SourcePhrase.h"
+#include "../OnDiskPt/TargetPhrase.h"
+#include "../OnDiskPt/TargetPhraseCollection.h"
+#include "../OnDiskPt/Word.h"
+#include "../OnDiskPt/Vocab.h"
 #include "Main.h"
 
 using namespace std;
diff --git a/CreateOnDisk/src/Main.h b/OnDiskPt/Main.h
index cd677f596..41a24a239 100644
--- a/CreateOnDisk/src/Main.h
+++ b/OnDiskPt/Main.h
@@ -19,8 +19,8 @@
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  ***********************************************************************/
 #include <string>
-#include "../../OnDiskPt/src/SourcePhrase.h"
-#include "../../OnDiskPt/src/TargetPhrase.h"
+#include "../OnDiskPt/SourcePhrase.h"
+#include "../OnDiskPt/TargetPhrase.h"
 
 typedef std::pair<size_t, size_t>  AlignPair;
 typedef std::vector<AlignPair> AlignType;
diff --git a/OnDiskPt/src/OnDiskWrapper.cpp b/OnDiskPt/OnDiskWrapper.cpp
index 79b0563a8..79b0563a8 100644
--- a/OnDiskPt/src/OnDiskWrapper.cpp
+++ b/OnDiskPt/OnDiskWrapper.cpp
diff --git a/OnDiskPt/src/OnDiskWrapper.h b/OnDiskPt/OnDiskWrapper.h
index 2d3d6ed64..c49afdda1 100644
--- a/OnDiskPt/src/OnDiskWrapper.h
+++ b/OnDiskPt/OnDiskWrapper.h
@@ -22,7 +22,7 @@
 #include <fstream>
 #include "Vocab.h"
 #include "PhraseNode.h"
-#include "../../moses/src/Word.h"
+#include "../moses/src/Word.h"
 
 namespace OnDiskPt
 {
diff --git a/OnDiskPt/src/Phrase.cpp b/OnDiskPt/Phrase.cpp
index ce6dc208c..b6ccd0721 100644
--- a/OnDiskPt/src/Phrase.cpp
+++ b/OnDiskPt/Phrase.cpp
@@ -19,7 +19,7 @@
  ***********************************************************************/
 #include <iostream>
 #include "util/check.hh"
-#include "../../moses/src/Util.h"
+#include "../moses/src/Util.h"
 #include "Phrase.h"
 
 using namespace std;
diff --git a/OnDiskPt/src/Phrase.h b/OnDiskPt/Phrase.h
index 093510e64..093510e64 100644
--- a/OnDiskPt/src/Phrase.h
+++ b/OnDiskPt/Phrase.h
diff --git a/OnDiskPt/src/PhraseNode.cpp b/OnDiskPt/PhraseNode.cpp
index a479294e5..98a55dbc1 100644
--- a/OnDiskPt/src/PhraseNode.cpp
+++ b/OnDiskPt/PhraseNode.cpp
@@ -22,7 +22,7 @@
 #include "OnDiskWrapper.h"
 #include "TargetPhraseCollection.h"
 #include "SourcePhrase.h"
-#include "../../moses/src/Util.h"
+#include "../moses/src/Util.h"
 
 using namespace std;
 
diff --git a/OnDiskPt/src/PhraseNode.h b/OnDiskPt/PhraseNode.h
index 279ca278a..279ca278a 100644
--- a/OnDiskPt/src/PhraseNode.h
+++ b/OnDiskPt/PhraseNode.h
diff --git a/OnDiskPt/src/SourcePhrase.cpp b/OnDiskPt/SourcePhrase.cpp
index 595748c70..595748c70 100644
--- a/OnDiskPt/src/SourcePhrase.cpp
+++ b/OnDiskPt/SourcePhrase.cpp
diff --git a/OnDiskPt/src/SourcePhrase.h b/OnDiskPt/SourcePhrase.h
index b4ae46705..b4ae46705 100644
--- a/OnDiskPt/src/SourcePhrase.h
+++ b/OnDiskPt/SourcePhrase.h
diff --git a/OnDiskPt/src/TargetPhrase.cpp b/OnDiskPt/TargetPhrase.cpp
index 7480368e0..b740811d8 100644
--- a/OnDiskPt/src/TargetPhrase.cpp
+++ b/OnDiskPt/TargetPhrase.cpp
@@ -20,10 +20,10 @@
 
 #include <algorithm>
 #include <iostream>
-#include "../../moses/src/Util.h"
-#include "../../moses/src/TargetPhrase.h"
-#include "../../moses/src/PhraseDictionary.h"
-#include "../../moses/src/DummyScoreProducers.h"
+#include "../moses/src/Util.h"
+#include "../moses/src/TargetPhrase.h"
+#include "../moses/src/PhraseDictionary.h"
+#include "../moses/src/DummyScoreProducers.h"
 #include "TargetPhrase.h"
 #include "OnDiskWrapper.h"
 
diff --git a/OnDiskPt/src/TargetPhrase.h b/OnDiskPt/TargetPhrase.h
index 56c7b6d3f..56c7b6d3f 100644
--- a/OnDiskPt/src/TargetPhrase.h
+++ b/OnDiskPt/TargetPhrase.h
diff --git a/OnDiskPt/src/TargetPhraseCollection.cpp b/OnDiskPt/TargetPhraseCollection.cpp
index bb9c74364..b57ce4ee3 100644
--- a/OnDiskPt/src/TargetPhraseCollection.cpp
+++ b/OnDiskPt/TargetPhraseCollection.cpp
@@ -20,9 +20,9 @@
 
 #include <algorithm>
 #include <iostream>
-#include "../../moses/src/Util.h"
-#include "../../moses/src/TargetPhraseCollection.h"
-#include "../../moses/src/PhraseDictionary.h"
+#include "../moses/src/Util.h"
+#include "../moses/src/TargetPhraseCollection.h"
+#include "../moses/src/PhraseDictionary.h"
 #include "TargetPhraseCollection.h"
 #include "Vocab.h"
 #include "OnDiskWrapper.h"
diff --git a/OnDiskPt/src/TargetPhraseCollection.h b/OnDiskPt/TargetPhraseCollection.h
index 6d95fb356..6d95fb356 100644
--- a/OnDiskPt/src/TargetPhraseCollection.h
+++ b/OnDiskPt/TargetPhraseCollection.h
diff --git a/OnDiskPt/src/Vocab.cpp b/OnDiskPt/Vocab.cpp
index 9c0470b32..86072edc6 100644
--- a/OnDiskPt/src/Vocab.cpp
+++ b/OnDiskPt/Vocab.cpp
@@ -21,7 +21,7 @@
 #include <fstream>
 #include "OnDiskWrapper.h"
 #include "Vocab.h"
-#include "../../moses/src/FactorCollection.h"
+#include "../moses/src/FactorCollection.h"
 
 using namespace std;
 
diff --git a/OnDiskPt/src/Vocab.h b/OnDiskPt/Vocab.h
index 9bb361251..360aedf4a 100644
--- a/OnDiskPt/src/Vocab.h
+++ b/OnDiskPt/Vocab.h
@@ -20,7 +20,7 @@
  ***********************************************************************/
 #include <string>
 #include <map>
-#include "../../moses/src/TypeDef.h"
+#include "../moses/src/TypeDef.h"
 
 namespace Moses
 {
diff --git a/OnDiskPt/src/Word.cpp b/OnDiskPt/Word.cpp
index 972f74584..a8d4c683a 100644
--- a/OnDiskPt/src/Word.cpp
+++ b/OnDiskPt/Word.cpp
@@ -18,8 +18,8 @@
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  ***********************************************************************/
 
-#include "../../moses/src/Util.h"
-#include "../../moses/src/Word.h"
+#include "../moses/src/Util.h"
+#include "../moses/src/Word.h"
 #include "Word.h"
 
 using namespace std;
diff --git a/OnDiskPt/src/Word.h b/OnDiskPt/Word.h
index 0c0b55a09..0c0b55a09 100644
--- a/OnDiskPt/src/Word.h
+++ b/OnDiskPt/Word.h
diff --git a/moses-chart-cmd/src/Jamfile b/moses-chart-cmd/src/Jamfile
index 9cc3d100f..583b4664e 100644
--- a/moses-chart-cmd/src/Jamfile
+++ b/moses-chart-cmd/src/Jamfile
@@ -1,3 +1,3 @@
-exe moses_chart : Main.cpp mbr.cpp IOWrapper.cpp TranslationAnalysis.cpp ../../moses/src//moses ../../OnDiskPt/src//OnDiskPt ;
+exe moses_chart : Main.cpp mbr.cpp IOWrapper.cpp TranslationAnalysis.cpp ../../moses/src//moses ;
 
 install legacy-install : moses_chart : <location>. <install-type>EXE <install-dependencies>on <link>shared:<dll-path>$(TOP)/moses-chart-cmd/src <link>shared:<install-type>LIB ;
diff --git a/moses-cmd/src/Jamfile b/moses-cmd/src/Jamfile
index e08befa48..d4eb9d0b2 100644
--- a/moses-cmd/src/Jamfile
+++ b/moses-cmd/src/Jamfile
@@ -1,4 +1,4 @@
-alias deps : ../../moses/src//moses ../../OnDiskPt/src//OnDiskPt ;
+alias deps : ../../moses/src//moses ;
 
 exe moses : Main.cpp mbr.cpp IOWrapper.cpp TranslationAnalysis.cpp LatticeMBR.cpp deps ;
 exe lmbrgrid : LatticeMBRGrid.cpp LatticeMBR.cpp IOWrapper.cpp deps ;
diff --git a/moses/src/ChartRuleLookupManagerOnDisk.cpp b/moses/src/ChartRuleLookupManagerOnDisk.cpp
index b752e03a3..b8c0674f5 100644
--- a/moses/src/ChartRuleLookupManagerOnDisk.cpp
+++ b/moses/src/ChartRuleLookupManagerOnDisk.cpp
@@ -25,7 +25,7 @@
 #include "StaticData.h"
 #include "DotChartOnDisk.h"
 #include "ChartTranslationOptionList.h"
-#include "../../OnDiskPt/src/TargetPhraseCollection.h"
+#include "../../OnDiskPt/TargetPhraseCollection.h"
 
 using namespace std;
 
diff --git a/moses/src/ChartRuleLookupManagerOnDisk.h b/moses/src/ChartRuleLookupManagerOnDisk.h
index 5ab2fb74e..ba87dbbf8 100644
--- a/moses/src/ChartRuleLookupManagerOnDisk.h
+++ b/moses/src/ChartRuleLookupManagerOnDisk.h
@@ -21,7 +21,7 @@
 #ifndef moses_ChartRuleLookupManagerOnDisk_h
 #define moses_ChartRuleLookupManagerOnDisk_h
 
-#include "../../OnDiskPt/src/OnDiskWrapper.h"
+#include "../../OnDiskPt/OnDiskWrapper.h"
 
 #include "ChartRuleLookupManager.h"
 #include "ChartTranslationOptionList.h"
diff --git a/moses/src/DotChartOnDisk.cpp b/moses/src/DotChartOnDisk.cpp
index 5144cfc7c..1674f0e21 100644
--- a/moses/src/DotChartOnDisk.cpp
+++ b/moses/src/DotChartOnDisk.cpp
@@ -20,7 +20,7 @@
 #include <algorithm>
 #include "DotChartOnDisk.h"
 #include "Util.h"
-#include "../../OnDiskPt/src/PhraseNode.h"
+#include "../../OnDiskPt/PhraseNode.h"
 
 using namespace std;
 
diff --git a/moses/src/Jamfile b/moses/src/Jamfile
index 946a757d2..f89fe4118 100644
--- a/moses/src/Jamfile
+++ b/moses/src/Jamfile
@@ -14,4 +14,4 @@ if [ option.get "with-synlm" : no : yes ] = yes
 lib moses :
 #All cpp files except those listed
 [ glob *.cpp DynSAInclude/*.cpp : ThreadPool.cpp SyntacticLanguageModel.cpp ]
-synlm ThreadPool LM//LM headers ../..//z ../../OnDiskPt/src//OnDiskPt ;
+synlm ThreadPool LM//LM headers ../..//z ../../OnDiskPt//OnDiskPt ;
diff --git a/moses/src/PhraseDictionaryOnDisk.h b/moses/src/PhraseDictionaryOnDisk.h
index 6ef183589..0a8dfc808 100644
--- a/moses/src/PhraseDictionaryOnDisk.h
+++ b/moses/src/PhraseDictionaryOnDisk.h
@@ -25,9 +25,9 @@
 #include <vector>
 #include <string>
 #include "PhraseDictionary.h"
-#include "../../OnDiskPt/src/OnDiskWrapper.h"
-#include "../../OnDiskPt/src/Word.h"
-#include "../../OnDiskPt/src/PhraseNode.h"
+#include "../../OnDiskPt/OnDiskWrapper.h"
+#include "../../OnDiskPt/Word.h"
+#include "../../OnDiskPt/PhraseNode.h"
 
 namespace Moses
 {
diff --git a/scripts/ems/example/config.basic b/scripts/ems/example/config.basic
index a8bfbfdd3..018da1c68 100644
--- a/scripts/ems/example/config.basic
+++ b/scripts/ems/example/config.basic
@@ -30,13 +30,13 @@ wmt10-data = $working-dir/data
 ### basic tools
 #
 # moses decoder
-decoder = $moses-src-dir/moses-cmd/src/moses
+decoder = $moses-src-dir/dist/bin/moses
 
 # conversion of phrase table into binary on-disk format
-ttable-binarizer = $moses-src-dir/misc/processPhraseTable
+ttable-binarizer = $moses-src-dir/dist/bin/processPhraseTable
 
 # conversion of rule table into binary on-disk format
-#ttable-binarizer = "$moses-src-dir/CreateOnDisk/src/CreateOnDiskPt 1 1 5 100 2"
+#ttable-binarizer = "$moses-src-dir/dist/bin/CreateOnDiskPt 1 1 5 100 2"
 
 # tokenizers - comment out if all your data is already tokenized
 input-tokenizer = "$moses-script-dir/tokenizer/tokenizer.perl -a -l $input-extension"
diff --git a/scripts/ems/example/config.factored b/scripts/ems/example/config.factored
index 5bbe72a66..e9e62c7f4 100644
--- a/scripts/ems/example/config.factored
+++ b/scripts/ems/example/config.factored
@@ -30,13 +30,13 @@ wmt10-data = $working-dir/data
 ### basic tools
 #
 # moses decoder
-decoder = $moses-src-dir/moses-cmd/src/moses
+decoder = $moses-src-dir/dist/bin/moses
 
 # conversion of phrase table into binary on-disk format
 ttable-binarizer = $moses-src-dir/misc/processPhraseTable
 
 # conversion of rule table into binary on-disk format
-#ttable-binarizer = "$moses-src-dir/CreateOnDisk/src/CreateOnDiskPt 1 1 5 100 2"
+#ttable-binarizer = "$moses-src-dir/dist/bin/CreateOnDiskPt 1 1 5 100 2"
 
 # tokenizers - comment out if all your data is already tokenized
 input-tokenizer = "$moses-script-dir/tokenizer/tokenizer.perl -a -l $input-extension"
diff --git a/scripts/ems/example/config.hierarchical b/scripts/ems/example/config.hierarchical
index 7f2e8a5fd..3a27411a1 100644
--- a/scripts/ems/example/config.hierarchical
+++ b/scripts/ems/example/config.hierarchical
@@ -30,13 +30,13 @@ wmt10-data = $working-dir/data
 ### basic tools
 #
 # moses decoder
-decoder = $moses-src-dir/moses-chart-cmd/src/moses_chart
+decoder = $moses-src-dir/dist/bin/moses_chart
 
 # conversion of phrase table into binary on-disk format
-#ttable-binarizer = $moses-src-dir/misc/processPhraseTable
+#ttable-binarizer = $moses-src-dir/dist/bin/processPhraseTable
 
 # conversion of rule table into binary on-disk format
-ttable-binarizer = "$moses-src-dir/CreateOnDisk/src/CreateOnDiskPt 1 1 5 100 2"
+ttable-binarizer = "$moses-src-dir/dist/bin/CreateOnDiskPt 1 1 5 100 2"
 
 # tokenizers - comment out if all your data is already tokenized
 input-tokenizer = "$moses-script-dir/tokenizer/tokenizer.perl -a -l $input-extension"
diff --git a/scripts/ems/example/config.syntax b/scripts/ems/example/config.syntax
index 7d25ed1c2..9f9b2c48b 100644
--- a/scripts/ems/example/config.syntax
+++ b/scripts/ems/example/config.syntax
@@ -30,13 +30,13 @@ wmt10-data = $working-dir/data
 ### basic tools
 #
 # moses decoder
-decoder = $moses-src-dir/moses-chart-cmd/src/moses_chart
+decoder = $moses-src-dir/dist/bin/moses_chart
 
 # conversion of phrase table into binary on-disk format
-#ttable-binarizer = $moses-src-dir/misc/processPhraseTable
+#ttable-binarizer = $moses-src-dir/dist/bin/processPhraseTable
 
 # conversion of rule table into binary on-disk format
-ttable-binarizer = "$moses-src-dir/CreateOnDisk/src/CreateOnDiskPt 1 1 5 100 2"
+ttable-binarizer = "$moses-src-dir/dist/bin/CreateOnDiskPt 1 1 5 100 2"
 
 # tokenizers - comment out if all your data is already tokenized
 input-tokenizer = "$moses-script-dir/tokenizer/tokenizer.perl -a -l $input-extension"
diff --git a/scripts/ems/example/config.toy b/scripts/ems/example/config.toy
index 5aa4945a2..1ed657c3b 100644
--- a/scripts/ems/example/config.toy
+++ b/scripts/ems/example/config.toy
@@ -30,13 +30,13 @@ toy-data = $moses-script-dir/ems/example/data
 ### basic tools
 #
 # moses decoder
-decoder = $moses-src-dir/moses-cmd/src/moses
+decoder = $moses-src-dir/dist/bin/moses
 
 # conversion of phrase table into binary on-disk format
-ttable-binarizer = $moses-src-dir/misc/processPhraseTable
+ttable-binarizer = $moses-src-dir/dist/bin/processPhraseTable
 
 # conversion of rule table into binary on-disk format
-#ttable-binarizer = "$moses-src-dir/CreateOnDisk/src/CreateOnDiskPt 1 1 5 100 2"
+#ttable-binarizer = "$moses-src-dir/dist/bin/CreateOnDiskPt 1 1 5 100 2"
 
 # tokenizers - comment out if all your data is already tokenized
 input-tokenizer = "$moses-script-dir/tokenizer/tokenizer.perl -a -l $input-extension"