diff options
| author | Chris Dyer <cdyer@cs.cmu.edu> | 2012-05-27 15:34:57 -0400 |
|---|---|---|
| committer | Chris Dyer <cdyer@cs.cmu.edu> | 2012-05-27 15:34:57 -0400 |
| commit | 3b2b7e1fa0b5e95010b5b3353a176c0eb84be938 (patch) | |
| tree | f255199de0800ec99ae58892ea274bd674fb8a87 | |
| parent | 71c4918f05a4b380dfaebfabcc1847c1c6d497dd (diff) | |
| parent | 6fd22244aaa33cd5cbc4d9bd1003e6eef7b6e418 (diff) | |
Merge branch 'master' of github.com:redpony/cdec
| -rw-r--r-- | Jamroot | 2 | ||||
| -rw-r--r-- | jam-files/sanity.jam | 5 | ||||
| -rw-r--r-- | klm/util/file.cc | 3 | ||||
| -rw-r--r-- | klm/util/mmap.cc | 2 |
4 files changed, 8 insertions, 4 deletions
@@ -31,6 +31,8 @@ project : default-build <warnings>on <variant>release ; install-bin-libs dpmert//programs utils//programs mteval//programs klm/lm//programs training//liblbfgs decoder//cdec phrasinator//programs mira//kbest_mira ; +install perl-scripts : dpmert//dpmert.pl : <location>$(bindir) ; + build-projects mteval decoder dpmert klm/lm training/liblbfgs ; #Compile everything ending with _test.cc into a test and run it. diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam index 4e0432f9..957f4f43 100644 --- a/jam-files/sanity.jam +++ b/jam-files/sanity.jam @@ -182,9 +182,10 @@ if $(prefix) { } else { prefix = $(TOP)/dist$(GITTAG) ; } + +bindir = [ option.get "bindir" : $(prefix)/bin ] ; +libdir = [ option.get "libdir" : $(prefix)/lib ] ; rule install-bin-libs ( deps * ) { - local bindir = [ option.get "bindir" : $(prefix)/bin ] ; - local libdir = [ option.get "libdir" : $(prefix)/lib ] ; install prefix-bin : $(deps) : <location>$(bindir) <install-dependencies>on <install-type>EXE <link>shared:<dll-path>$(libdir) ; install prefix-lib : $(deps) : <location>$(libdir) <install-dependencies>on <install-type>LIB <link>shared:<dll-path>$(libdir) ; } diff --git a/klm/util/file.cc b/klm/util/file.cc index 1bd056fc..6a3885a7 100644 --- a/klm/util/file.cc +++ b/klm/util/file.cc @@ -10,11 +10,12 @@ #include <sys/stat.h> #include <fcntl.h> #include <stdint.h> -#include <unistd.h> #if defined(_WIN32) || defined(_WIN64) #include <windows.h> #include <io.h> +#else +#include <unistd.h> #endif namespace util { diff --git a/klm/util/mmap.cc b/klm/util/mmap.cc index e0d2570b..576fd4cc 100644 --- a/klm/util/mmap.cc +++ b/klm/util/mmap.cc @@ -14,12 +14,12 @@ #include <sys/types.h> #include <sys/stat.h> #include <stdlib.h> -#include <unistd.h> #if defined(_WIN32) || defined(_WIN64) #include <windows.h> #include <io.h> #else +#include <unistd.h> #include <sys/mman.h> #endif |