Permalink
Browse files

.hgignore:

c_src/Makefile:
    Import Rusty's changes from riak/apps/erlang_js

rebar:
    Latest rebar
  • Loading branch information...
Ryan Tilder
Ryan Tilder committed Feb 12, 2010
1 parent 88d43bc commit c9b56132de42160aeece6fa4ce47a93103883379
Showing with 3 additions and 3 deletions.
  1. +1 −1 .hgignore
  2. +2 −2 c_src/Makefile
  3. BIN rebar
View
@@ -1,5 +1,5 @@
ebin/.*\.beam$
-c_src/deps/(js|mozilla|nspr_release)/.*
+c_src/deps/(nsprpub|js|mozilla|nspr_release)/.*
c_src/include/js/.*
c_src/.*(\.o|\.a)$
View
@@ -35,7 +35,7 @@ deps/nspr_release: deps
deps/js/src/libjs.a: deps/js
@echo "Building Spidermonkey... this can take a bit"
@for I in patches/deps-js-*.patch; do \
- patch -p1 < $${I}; \
+ (patch -p1 < $${I} || echo "Skipping patch"); \
done
@make -C deps/js/src BUILD_OPT=1 JS_DIST=../../nspr_release/dist \
JS_THREADSAFE=1 \
@@ -49,7 +49,7 @@ deps/js/src/libjs.a: deps/js
@cp deps/js/src/*_OPT.OBJ/*.h include/js
deps/js: deps
- @mkdir $(@)
+ @mkdir -p $(@)
@tar -C deps -xzf js-$(SMONKEY_VER).tar.gz
clean:
View
BIN rebar
Binary file not shown.

0 comments on commit c9b5613

Please sign in to comment.