Merge pull request #2940 from metalefty/astyle

Update astyle to 3.4.12

.github/workflows/build.yml

@@ -194,8 +194,8 @@ jobs:
       CC: gcc
       # This is required to use a version of astyle other than that
       # supplied with the operating system
-      ASTYLE_VER: 3.1
-      ASTYLE_REPO: https://svn.code.sf.net/p/astyle/code/tags
+      ASTYLE_VER: 3.4.12
+      ASTYLE_REPO: https://gitlab.com/saalen/astyle.git
     steps:
       # Set steps.os.outputs.image to the specific OS (e.g. 'ubuntu20')
       - name: Get operating system name and version.

astyle_config.as

@@ -19,13 +19,13 @@
 --convert-tabs
 
 # requires --convert-tabs to work properly
---indent-preprocessor
+--indent-preproc-define
 
 --indent-col1-comments
 
 --min-conditional-indent=2
 
---max-instatement-indent=40
+--max-continuation-indent=40
 
 # Insert space padding around operators.
 --pad-oper
@@ -35,7 +35,7 @@
 
 
 # Add brackets to unbracketed one line conditional statements (e.g. 'if', 'for', 'while'...).
---add-brackets
+--add-braces
 
 --align-pointer=name
 

scripts/install_astyle.sh

@@ -15,8 +15,8 @@ INSTALL_ROOT=~/astyle.local
 # ----------------------------------------------------------------------------
 usage()
 {
-    echo "** Usage: $0 <svn-tags-url> <tag-name>"
-    echo "   e.g. $0 https://svn.code.sf.net/p/astyle/code/tags 3.1"
+    echo "** Usage: $0 <git-repo> <version-tag>"
+    echo "   e.g. $0 https://gitlab.com/saalen/astyle.git 3.4.12"
 } >&2
 
 # ----------------------------------------------------------------------------
@@ -80,9 +80,8 @@ fi
     # Put everything in this directory
     FILESDIR=$INSTALL_ROOT/$ASTYLE_VER
 
-    svn checkout ${REPO_URL}/${ASTYLE_VER}/AStyle "$workdir"
-
-    cd "$workdir"
+    git clone -b "${ASTYLE_VER}" --depth 1 ${REPO_URL} "$workdir"
+    cd "$workdir"/AStyle
 
     make_args="DESTDIR=$FILESDIR"
 

scripts/run_astyle.sh

@@ -7,7 +7,7 @@
 # Note: the script must be run from the root directory of the xrdp repository
 
 INSTALL_ROOT=~/astyle.local
-ASTYLE_FROM_XRDP=$INSTALL_ROOT/3.1/usr/bin/astyle
+ASTYLE_FROM_XRDP=$INSTALL_ROOT/3.4.12/usr/bin/astyle
 MIN_ASTYLE_VER="3.1"
 
 # ----------------------------------------------------------------------------