diff --git a/Jamroot b/Jamroot index b8180c132..40180553f 100644 --- a/Jamroot +++ b/Jamroot @@ -14,9 +14,15 @@ #Note that, like language models, this is the --prefix where the library was #installed, not some executable within the library. # +#--with-giza=/path/to/giza +#Indicates where binaries GIZA++, snt2cooc.out, and mkcls live. +#Builds scripts/training/train-model.perl using these paths. +# #--notrace compiles without TRACE macros # +#INSTALLATION #--install=/path/to/install sets the install directory (default dist). +#--install-scripts=/path/to/scripts copies scripts into a directory. #--git appends the git revision to the install directory name. # # By default, the build is multi-threaded, optimized, and statically linked. @@ -136,6 +142,8 @@ build-project util ; #Trigger instllation into legacy paths. build-project moses-cmd/src ; build-project moses-chart-cmd/src ; +#Scripts have their own binaries +build-project scripts ; install-location = [ option.get "install" : $(TOP)/dist ] ; diff --git a/scripts/Jamfile b/scripts/Jamfile index ab44144d2..8ca5df8ae 100644 --- a/scripts/Jamfile +++ b/scripts/Jamfile @@ -1,20 +1,9 @@ -#MOSES SCRIPTS INSTRUCTIONS -# -#--with-giza=/path/to/giza where GIZA++ binaries GIZA++, snt2cooc.out, and -# mkcls live. -# -#--install=/path/to/install to set a path to install (default dist) -#--git appends the git revision to the install directory -# -#--with-boost=/path/to/boost to specify a non-standard Boost installation -# -#See also: bjam --help one level up. - +#See ../Jamroot for options. import option ; build-project training ; -location = [ option.get "install" : $(TOP)/scripts/dist ] ; +location = [ option.get "install-scripts" : $(TOP)/scripts/dist ] ; location = $(location)$(GITTAG) ; #These two used to live in a tools directory. @@ -44,8 +33,9 @@ if $(with-giza) { install train-model : training//train-model.perl : $(location)/training ; } else { - echo "If you want training/train-model.perl, pass --with-giza=/path/to/giza" ; + echo "If you want scripts/training/train-model.perl, pass --with-giza=/path/to/giza" ; constant WITH-GIZA : "no" ; + alias train-model ; } install scripts : @@ -145,3 +135,6 @@ install scripts : recaser/detruecase.perl recaser/train-truecaser.perl : . $(location) ; + +alias install : ghkm compactify phrase-extract lexical-reordering symal scripts train-model ; +explicit install ghkm compactify phrase-extract lexical-reordering symal scripts train-model ;