From 0d857e7e20896b83106b7c74502a7f733baab45a Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Mon, 6 Jul 2015 13:31:15 +0200
Subject: [PATCH] libastyle update was wrong. here is right one

---
 build/build.xml                 | 14 +++++++-------
 build/libastylej-2.05.1.zip.sha |  2 +-
 build/shared/lib/formatter.conf |  2 ++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 5c33daad9..139a34c43 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -366,12 +366,12 @@
     <antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.1.zip" />
       <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
-      <param name="final_folder" value="${staging_folder}/libastylej" />
+      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
-    <copy file="macosx/libastylej/libastylej.jnilib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
+    <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
     <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.jnilib" />
-    <copy file="macosx/libastylej/libastylej.jnilib" tofile="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
+    <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" tofile="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
     <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
 
   </target>
@@ -540,10 +540,10 @@
     <antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.1.zip" />
       <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
-      <param name="final_folder" value="${staging_folder}/libastylej" />
+      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
-    <copy file="linux/libastylej/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
+    <copy file="linux/libastylej-2.05.1/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
     <chmod perm="755" file="linux/work/lib/libastylej.so" />
   </target>
 
@@ -758,10 +758,10 @@
     <antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.1.zip" />
       <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
-      <param name="final_folder" value="${staging_folder}/libastylej" />
+      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
-    <copy file="windows/libastylej/AStylej.dll" todir="windows/work/lib" />
+    <copy file="windows/libastylej-2.05.1/AStylej.dll" todir="windows/work/lib" />
     <copy file="windows/msvcp100.dll" todir="windows/work" />
     <copy file="windows/msvcr100.dll" todir="windows/work" />
 
diff --git a/build/libastylej-2.05.1.zip.sha b/build/libastylej-2.05.1.zip.sha
index fb8096195..919065add 100644
--- a/build/libastylej-2.05.1.zip.sha
+++ b/build/libastylej-2.05.1.zip.sha
@@ -1 +1 @@
-328bdc3baf781193f3bc33a56fa477de67f5bfd8
+0b5e1be1985eed35657f60869a6cad916bd066fc
diff --git a/build/shared/lib/formatter.conf b/build/shared/lib/formatter.conf
index bae28ba7b..7065e54cc 100644
--- a/build/shared/lib/formatter.conf
+++ b/build/shared/lib/formatter.conf
@@ -28,3 +28,5 @@ pad-header
 # if you like one-liners, keep them
 keep-one-line-statements
 
+remove-comment-prefix
+