From 0231c33e0db5f09936b88311b3930aac92772077 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 24 May 2018 23:19:36 +0200 Subject: [PATCH] Remove astyle --- contrib/styles/astyle.rc | 33 -------------- contrib/utilities/setup_astyle.sh | 74 ------------------------------- 2 files changed, 107 deletions(-) delete mode 100644 contrib/styles/astyle.rc delete mode 100755 contrib/utilities/setup_astyle.sh diff --git a/contrib/styles/astyle.rc b/contrib/styles/astyle.rc deleted file mode 100644 index 817fa3b3ac..0000000000 --- a/contrib/styles/astyle.rc +++ /dev/null @@ -1,33 +0,0 @@ -## --------------------------------------------------------------------- -## -## Copyright (C) 2012 - 2013 by the deal.II authors -## -## This file is part of the deal.II library. -## -## The deal.II library is free software; you can use it, redistribute -## it, and/or modify it under the terms of the GNU Lesser General -## Public License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## The full text of the license can be found in the file LICENSE at -## the top level of the deal.II distribution. -## -## --------------------------------------------------------------------- - -# astyle 2.02 indentation style for deal.II - ---style=gnu - ---convert-tabs ---indent=spaces=2 ---indent-namespaces ---keep-one-line-blocks ---min-conditional-indent=0 ---pad-header - -# write things as 'char *p' ---align-pointer=name ---align-reference=name - ---max-instatement-indent=60 ---suffix=none ---quiet diff --git a/contrib/utilities/setup_astyle.sh b/contrib/utilities/setup_astyle.sh deleted file mode 100755 index 8005442b54..0000000000 --- a/contrib/utilities/setup_astyle.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash -## --------------------------------------------------------------------- -## -## Copyright (C) 2018 by the deal.II authors -## -## This file is part of the deal.II library. -## -## The deal.II library is free software; you can use it, redistribute -## it, and/or modify it under the terms of the GNU Lesser General -## Public License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## The full text of the license can be found in the file LICENSE at -## the top level of the deal.II distribution. -## -## --------------------------------------------------------------------- - -# -# This script downloads and installs astyle-2.04 in programs/astyle/bin. -# The installed binary is used in the 'indent' script in case astyle is -# installed by this script. -# -# This script only works on Linux and macOS, and also puts the 'astyle' -# executable into a very specific place. This is not a general purpose -# solution. A better solution is to essentially execute the commands -# below in a shell and make sure that the executable is installed into -# a central directory -- say, /usr/bin or /usr/local/bin. -# - -PRG="$(cd "$(dirname "$0")" && pwd)/programs" - -# Find out which kind of OS we are running and set the appropriate settings -case "$OSTYPE" in - darwin*) - FILENAME="astyle_2.04_macosx.tar.gz" - CHECKSUM_CMD="shasum" - CHECKSUM="e0ba90723463172fd8a063897092284993eeebb87c63cf26ee36f555b0d89368 $FILENAME" - BUILD_PATH="$PRG/astyle/build/mac" - ;; - linux*) - FILENAME="astyle_2.04_linux.tar.gz" - CHECKSUM_CMD="sha256sum" - CHECKSUM="70b37f4853c418d1e2632612967eebf1bdb93dfbe558c51d7d013c9b4e116b60 $FILENAME" - BUILD_PATH="$PRG/astyle/build/gcc" - ;; - *) - echo "unknown: $OSTYPE" - exit 1 - ;; -esac - -INSTALL_PATH="$BUILD_PATH"/../../ - -if [ ! -d "$PRG" ] -then - echo "create folder $PRG" - mkdir "$PRG" -fi - -# astyle -if [ ! -d "$PRG/astyle" ] -then - echo "Downloading and installing astyle." - mkdir "$PRG/astyle" - curl -s -L "https://downloads.sourceforge.net/project/astyle/astyle/astyle%202.04/$FILENAME" -O > /dev/null - if echo "$CHECKSUM" | "${CHECKSUM_CMD}" -c; then - tar xfz "$FILENAME" -C "$PRG" > /dev/null - cd "$BUILD_PATH" || exit 1 - make -j4 > /dev/null - cp -r "$BUILD_PATH"/bin "$INSTALL_PATH" - else - echo "*** The downloaded file has the wrong SHA256 checksum!" - exit 1 - fi -fi -- 2.39.5