aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvax Software <[email protected]>2011-05-06 08:55:55 +0200
committerEvax Software <[email protected]>2011-05-06 08:55:55 +0200
commit69bf09d1885d489081b27a10811fa6e877ed8c26 (patch)
treeea7cade076c033c644d3b8458a65e0e5db28b4cd
parent2b5dfc5042fc0bd56d42a0a743b7b06d7b2a4db8 (diff)
downloadkerl-69bf09d1885d489081b27a10811fa6e877ed8c26.tar.gz
kerl-69bf09d1885d489081b27a10811fa6e877ed8c26.tar.bz2
kerl-69bf09d1885d489081b27a10811fa6e877ed8c26.zip
README update
-rw-r--r--README.md14
-rwxr-xr-xkerl10
2 files changed, 13 insertions, 11 deletions
diff --git a/README.md b/README.md
index 6f90a12..2e1e342 100644
--- a/README.md
+++ b/README.md
@@ -58,20 +58,22 @@ Pick your choice and build it:
Note that named builds allow you to have different builds for the same Erlang/OTP release with different configure options:
- $ KERL_CONFIGURE_OPTIONS=--disable-hipe kerl build R14B02 r14b02_nohipe
+ $ KERL_CONFIGURE_OPTIONS=--enable-hipe kerl build R14B02 r14b02_hipe
Verifying archive checksum...
Checksum verified (229fb8f193b09ac04a57a9d7794349b7)
Extracting source code
- Building Erlang/OTP R14B02 (r14b02_nohipe), please wait...
- Erlang/OTP R14B02 (r14b02_nohipe) has been successfully built
+ Building Erlang/OTP R14B02 (r14b02_hipe), please wait...
+ Erlang/OTP R14B02 (r14b02_hipe) has been successfully built
Fetching and building agner...
Agner has been successfully built
+(Note that kerl uses the otp_build script internally, and './otp_build configure' disables HiPE on linux)
+
You can verify your build has been registered:
$ kerl list builds
R14B02,r14b02
- R14B02,r14b02_nohipe
+ R14B02,r14b02_hipe
Now install a build to some location (optionally you can disable agner support by adding KERL_DISABLE_AGNER=yes to your $HOME/.kerlrc file, or on the contrary define a list of additional packages to install using the KERL_AGNER_AUTOINSTALL directive in the same file or on the command line):
@@ -130,7 +132,7 @@ You can get an overview of the current kerl state with:
$ kerl status
Available builds:
R14B02,r14b02
- R14B02,r14b02_nohipe
+ R14B02,r14b02_hipe
----------
Available installations:
r14b02 /path/to/install/dir
@@ -216,7 +218,7 @@ You can disable agner support by setting KERL_DISABLE_AGNER=yes in your $HOME/.k
You can specify the configure options to use when building Erlang/OTP with the KERL_CONFIGURE_OPTIONS variable, either in your $HOME/.kerlrc file or prepending it to the command line.
- $ KERL_CONFIGURE_OPTIONS=--disable-hipe kerl build R14B02 r14b02_nohipe
+ $ KERL_CONFIGURE_OPTIONS=--enable-hipe kerl build R14B02 r14b02_hipe
#### Enable autoconf
diff --git a/kerl b/kerl
index 3a00890..402f48f 100755
--- a/kerl
+++ b/kerl
@@ -102,7 +102,7 @@ get_releases()
update_checksum_file()
{
- echo "Getting the checksum file from erlang.org..."
+ echo "Getting the checksum file from erlang.org..."
curl $ERLANG_DOWNLOAD_URL/MD5 > "$KERL_DOWNLOAD_DIR/MD5" || exit 1
}
@@ -137,7 +137,7 @@ agner_support()
done
return 0
fi
- return 1
+ return 1
}
@@ -155,7 +155,7 @@ is_valid_release()
assert_valid_release()
{
if ! is_valid_release $1; then
- echo "$1 is not a valid Erlang/OTP release"
+ echo "$1 is not a valid Erlang/OTP release"
exit 1
fi
return 0
@@ -273,7 +273,7 @@ do_build()
{
assert_valid_release $1
assert_build_name_unused $2
-
+
FILENAME=otp_src_$1.tar.gz
if [ ! -f "$KERL_DOWNLOAD_DIR/$FILENAME" ]; then
echo "Downloading $FILENAME to $KERL_DOWNLOAD_DIR"
@@ -512,7 +512,7 @@ case "$1" in
echo "usage: $0 $1 <build_name> [directory]"
exit 1
fi
- if [ $# -eq 3 ]; then
+ if [ $# -eq 3 ]; then
do_install $2 "$3"
else
do_install $2 .