diff --git a/c_src/build_deps.sh b/c_src/build_deps.sh index d5a6628..65421e6 100755 --- a/c_src/build_deps.sh +++ b/c_src/build_deps.sh @@ -54,8 +54,9 @@ case "$1" in } } - (cd ../../snappy && git archive --format=tar --prefix=snappy-$SNAPPY_VSN/ $SNAPPY_VSN) \ - | tar xf - +# (cd ../../snappy && git archive --format=tar --prefix=snappy-$SNAPPY_VSN/ $SNAPPY_VSN) \ +# | tar xf - + tar -xzf snappy-$SNAPPY_VSN.tgz (cd snappy-$SNAPPY_VSN && \ sed -ibak '/^AC_ARG_WITH.*$/, /^fi$/d' configure.ac ) @@ -76,8 +77,9 @@ case "$1" in fi # leveldb if [ ! -f $BASEDIR/leveldb/lib/libleveldb.a ]; then - (cd ../../leveldb && git archive --format=tar --prefix=leveldb-$LEVELDB_VSN/ $LEVELDB_VSN) \ - | tar xf - +# (cd ../../leveldb && git archive --format=tar --prefix=leveldb-$LEVELDB_VSN/ $LEVELDB_VSN) \ +# | tar xf - + tar -xf leveldb-$LEVELDB_VSN.tgz (cd leveldb-$LEVELDB_VSN && \ echo "echo \"PLATFORM_CFLAGS+=-fPIC -I$BASEDIR/snappy/include\" >> build_config.mk" >> build_detect_platform && echo "echo \"PLATFORM_LDFLAGS+=-L $BASEDIR/snappy/lib -lsnappy\" >> build_config.mk" >> build_detect_platform && diff --git a/rebar.config b/rebar.config index e392608..01252e6 100644 --- a/rebar.config +++ b/rebar.config @@ -3,13 +3,14 @@ %% Require OTP version R13B04 or R14 {require_otp_vsn, "R13B04|R14"}. +{lib_dirs, ["deps"]}. + %% Depends -{deps_dir, "../"}. -{deps, [{meck, "", {git, "git://github.com/norton/meck.git"}} - , {edown, "", {git, "git://github.com/norton/edown.git"}} - , {asciiedoc, "", {git, "git://github.com/norton/asciiedoc.git"}} - , {qc, "", {git, "git://github.com/norton/qc.git"}} - , {sext, "", {git, "git://github.com/norton/sext.git"}} +{deps, [% {meck, ".*", {git, "git://github.com/norton/meck.git", "meck"}} + %, {edown, ".*", {git, "git://github.com/norton/edown.git", "edown"}} + %, {asciiedoc, ".*", {git, "git://github.com/norton/asciiedoc.git", "asciidoc"}} + %, {qc, ".*", {git, "git://github.com/norton/qc.git", "qc"}} + %, {sext, ".*", {git, "git://github.com/norton/sext.git", "sext"}} ]}. %% Erlang compiler options @@ -60,13 +61,13 @@ {compile, "c_src/build_deps.sh c_src/leveldb/lib/libleveldb.a"}]}. %% port_sources -{port_sources, ["c_src/lets_drv_lib.cc" +{port_sources, [ "c_src/lets_drv_lib.cc" , "c_src/lets_drv.cc" , "c_src/lets_nif_lib.cc" , "c_src/lets_nif.cc" ]}. %% so_specs -{so_specs, [{"priv/lib/lets_drv.so", ["c_src/lets_drv_lib.o", "c_src/lets_drv.o"]} +{so_specs, [ {"priv/lib/lets_drv.so", ["c_src/lets_drv_lib.o", "c_src/lets_drv.o"]} , {"priv/lib/lets_nif.so", ["c_src/lets_nif_lib.o", "c_src/lets_nif.o"]} ]}.