Permalink
Browse files

Add sudo to jake install. Add narwhal.local.conf. Remove tusk engine.

  • Loading branch information...
1 parent 13c5736 commit f4b37fbf3ba3282e51a35f978a1d8e10e292c49c tlrobinson committed Nov 13, 2009
Showing with 13 additions and 8 deletions.
  1. +1 −1 Jakefile
  2. +9 −7 bootstrap.sh
  3. +3 −0 narwhal.local.conf
View
@@ -48,7 +48,7 @@ task ("install", ["CommonJS"], function()
{
// FIXME: require("narwhal/tusk/install").install({}, $COMMONJS);
// Doesn't work due to some weird this.print business.
- OS.system("tusk install --force " + $BUILD_CJS_OBJECTIVE_J + " " + $BUILD_CJS_CAPPUCCINO);
+ OS.system("sudo tusk install --force " + $BUILD_CJS_OBJECTIVE_J + " " + $BUILD_CJS_CAPPUCCINO);
});
// Documentation
View
@@ -66,13 +66,13 @@ if [ `uname` = "Darwin" ]; then
make webkit
popd
- echo "================================================================================"
- echo "Rhino is the default Narwhal engine, should we change the default to JavaScriptCore for you?"
- echo "This can by overridden by setting the NARWHAL_ENGINE environment variable to \"jsc\" or \"rhino\"."
- echo "(Note: you must use Rhino for certain tools such as \"tusk\")"
- if prompt; then
- tusk engine jsc
- fi
+ # echo "================================================================================"
+ # echo "Rhino is the default Narwhal engine, should we change the default to JavaScriptCore for you?"
+ # echo "This can by overridden by setting the NARWHAL_ENGINE environment variable to \"jsc\" or \"rhino\"."
+ # echo "(Note: you must use Rhino for certain tools such as \"tusk\")"
+ # if prompt; then
+ # tusk engine jsc
+ # fi
fi
fi
@@ -108,3 +108,5 @@ if ! which -s "narwhal"; then
path_instructions
fi
fi
+
+echo "Bootstrapping of Narwhal and other required tools is complete. You can now build Cappuccino."
View
@@ -0,0 +1,3 @@
+if [ -z "$NARWHAL_ENGINE" ] && [ -d "$NARWHAL_HOME/packages/narwhal-jsc" ]; then
+ export NARWHAL_ENGINE=jsc
+fi

0 comments on commit f4b37fb

Please sign in to comment.