diff options
author | Yurii Rashkovskii <[email protected]> | 2012-12-02 11:26:22 -0800 |
---|---|---|
committer | Yurii Rashkovskii <[email protected]> | 2012-12-02 11:26:22 -0800 |
commit | 2146953c02fbc71cfeba20ac06d49d755a20a12b (patch) | |
tree | 7d1b963eecc2ad2fbd056659d8ed72404a668a22 /kerl | |
parent | f69b5cf6671459651efef3428c07e061031b8c89 (diff) | |
download | kerl-2146953c02fbc71cfeba20ac06d49d755a20a12b.tar.gz kerl-2146953c02fbc71cfeba20ac06d49d755a20a12b.tar.bz2 kerl-2146953c02fbc71cfeba20ac06d49d755a20a12b.zip |
Drop agner support
Closes #32
Diffstat (limited to 'kerl')
-rwxr-xr-x | kerl | 94 |
1 files changed, 2 insertions, 92 deletions
@@ -106,7 +106,7 @@ usage() echo " build Build specified release or git repository" echo " install Install the specified release at the given location" echo " deploy Deploy the specified installation to the given host and location" - echo " update Update agner or the list of available releases from erlang.org" + echo " update Update the list of available releases from erlang.org" echo " list List releases, builds and installations" echo " delete Delete builds and installations" echo " active Print the path of the active installation" @@ -146,31 +146,10 @@ check_releases() fi } -# c.f. agner issue #98 -# https://github.com/agner/agner/issues/#issue/98 -KERL_NO_AGNER_SUPPORT="R10B-0 R10B-2 R10B-3 R10B-4 R10B-5 R10B-6 R10B-7 -R10B-8 R10B-9 R11B-0 R11B-1 R11B-2 R11B-3 R11B-4 R11B-5 R12B-0 R12B-1 -R12B-2 R12B-3 R12B-4 R12B-5 R13A R13B R13B01 R13B02 R13B03 R13B04" - KERL_NO_LION_SUPPORT="R10B-0 R10B-2 R10B-3 R10B-4 R10B-5 R10B-6 R10B-7 R10B-8 R10B-9 R11B-0 R11B-1 R11B-2 R11B-3 R11B-4 R11B-5 R12B-0 R12B-1 R12B-2 R12B-3 R12B-4 R12B-5 R13A R13B R13B01 R13B02 R13B03 R13B04 R14A R14B R14B01 R14B02 R14B03" -agner_support() -{ - if [ -n "$KERL_DISABLE_AGNER" ]; then - return 1; - fi - - for v in $KERL_NO_AGNER_SUPPORT; do - if [ "$v" = "$1" ]; then - return 1 - fi - done - - return 0 -} - lion_support() { for v in $KERL_NO_LION_SUPPORT; do if [ "$v" = "$1" ]; then @@ -232,24 +211,6 @@ assert_valid_installation() return 0 } -do_update_agner() -{ - rel=`get_release_from_name $1` - if [ $? -ne 0 ]; then - echo "Unknown build name $1" - exit 1 - fi - TARGET="$KERL_BUILD_DIR/$1/release_$rel" - cd "$KERL_BUILD_DIR/$1/agner_$rel" && \ - git pull && - PATH="$KERL_BUILD_DIR/$1/otp_src_$rel/bin:$PATH" \ - make > /dev/null 2>&1 - if [ $? -ne 0 ]; then - return 1 - fi - return 0 -} - assert_build_name_unused() { if [ -f "$KERL_BASE_DIR/otp_builds" ]; then @@ -342,17 +303,6 @@ do_git_build() ./Install $INSTALL_OPT "$KERL_BUILD_DIR/$3/release_git" > /dev/null 2>&1 echo "Erlang/OTP $3 from git has been successfully built" list_add builds "git,$3" - if [ -z "$KERL_DISABLE_AGNER" ]; then - echo "Fetching and building agner..." - cd "$KERL_BUILD_DIR/$3" && \ - git clone https://github.com/agner/agner.git agner_git > /dev/null 2>&1 && \ - cd agner_git && \ - PATH="$KERL_BUILD_DIR/$3/otp_src_git/bin:$PATH" make > /dev/null 2>&1 && \ - if [ $? -ne 0 ]; then - echo "Agner install failed"; exit 1 - fi - echo "Agner has been successfully built" - fi } do_build() @@ -424,17 +374,6 @@ do_build() ./Install $INSTALL_OPT "$KERL_BUILD_DIR/$2/release_$1" > /dev/null 2>&1 echo "Erlang/OTP $1 ($2) has been successfully built" list_add builds "$1,$2" - if agner_support $1; then - echo "Fetching and building agner..." - cd "$KERL_BUILD_DIR/$2" && \ - git clone https://github.com/agner/agner.git agner_$1 > /dev/null 2>&1 && \ - cd agner_$1 && \ - PATH="$KERL_BUILD_DIR/$2/otp_src_$1/bin:$PATH" make > /dev/null 2>&1 && \ - if [ $? -ne 0 ]; then - echo "Agner install failed"; exit 1 - fi - echo "Agner has been successfully built" - fi } do_install() @@ -521,20 +460,6 @@ if [ -n "\$BASH" -o -n "\$ZSH_VERSION" ]; then hash -r fi ACTIVATE - if agner_support $1; then - echo "Installing agner in $absdir..." - cp "$KERL_BUILD_DIR/$1/agner_$rel/agner" "$absdir/bin/" - if [ -n "$KERL_INSTALL_AGNERIZED_REBAR" ]; then - echo "Installing agnerized rebar in $absdir..." - cp "$KERL_BUILD_DIR/$1/agner_$rel/agner" "$absdir/bin/rebar" - fi - if [ -n "$KERL_AGNER_AUTOINSTALL" ]; then - for i in $KERL_AGNER_AUTOINSTALL; do - echo "Autoinstalling $i" - agner install $i > /dev/null 2>&1 - done - fi - fi if [ "$rel" != "git" -a -n "$KERL_INSTALL_MANPAGES" ]; then echo "Fetching and installing manpages..." FILENAME=otp_doc_man_$rel.tar.gz @@ -668,7 +593,7 @@ cleanup_usage() update_usage() { - echo "usage: $0 $1 <releases|agner>" + echo "usage: $0 $1 <releases>" } get_active_path() @@ -777,21 +702,6 @@ case "$1" in echo "The available releases are:" list_print releases spaces ;; - agner) - if [ $# -ne 3 ]; then - echo "usage: $0 $1 $2 <build_name>" - exit 1 - fi - if agner_support $3; then - echo "Updating agner for build $3..." - if do_update_agner $3; then - echo "agner has been updated successfully" - else - echo "failed to update agner" - exit 1 - fi - fi - ;; *) update_usage exit 1 |