Skip to content

Commit 0d857e7

Browse files
author
Federico Fissore
committed
libastyle update was wrong. here is right one
1 parent 3158139 commit 0d857e7

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

build/build.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -366,12 +366,12 @@
366366
<antcall target="unzip">
367367
<param name="archive_file" value="./libastylej-2.05.1.zip" />
368368
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
369-
<param name="final_folder" value="${staging_folder}/libastylej" />
369+
<param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
370370
<param name="dest_folder" value="${staging_folder}" />
371371
</antcall>
372-
<copy file="macosx/libastylej/libastylej.jnilib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
372+
<copy file="macosx/libastylej-2.05.1/libastylej.jnilib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
373373
<chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.jnilib" />
374-
<copy file="macosx/libastylej/libastylej.jnilib" tofile="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
374+
<copy file="macosx/libastylej-2.05.1/libastylej.jnilib" tofile="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
375375
<chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
376376

377377
</target>
@@ -540,10 +540,10 @@
540540
<antcall target="unzip">
541541
<param name="archive_file" value="./libastylej-2.05.1.zip" />
542542
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
543-
<param name="final_folder" value="${staging_folder}/libastylej" />
543+
<param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
544544
<param name="dest_folder" value="${staging_folder}" />
545545
</antcall>
546-
<copy file="linux/libastylej/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
546+
<copy file="linux/libastylej-2.05.1/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
547547
<chmod perm="755" file="linux/work/lib/libastylej.so" />
548548
</target>
549549

@@ -758,10 +758,10 @@
758758
<antcall target="unzip">
759759
<param name="archive_file" value="./libastylej-2.05.1.zip" />
760760
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
761-
<param name="final_folder" value="${staging_folder}/libastylej" />
761+
<param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
762762
<param name="dest_folder" value="${staging_folder}" />
763763
</antcall>
764-
<copy file="windows/libastylej/AStylej.dll" todir="windows/work/lib" />
764+
<copy file="windows/libastylej-2.05.1/AStylej.dll" todir="windows/work/lib" />
765765
<copy file="windows/msvcp100.dll" todir="windows/work" />
766766
<copy file="windows/msvcr100.dll" todir="windows/work" />
767767

build/libastylej-2.05.1.zip.sha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
328bdc3baf781193f3bc33a56fa477de67f5bfd8
1+
0b5e1be1985eed35657f60869a6cad916bd066fc

build/shared/lib/formatter.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,5 @@ pad-header
2828
# if you like one-liners, keep them
2929
keep-one-line-statements
3030

31+
remove-comment-prefix
32+

0 commit comments

Comments
 (0)