rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-26 20:54:22 +01:00
Code Issues Releases Activity

libastyle update was wrong. here is right one

Browse Source
This commit is contained in:
Federico Fissore 2015-07-06 13:31:15 +02:00
parent 3158139e76
commit 0d857e7e20
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/build.xml
View File

@ -366,12 +366,12 @@
<antcall target="unzip"> <antcall target="unzip">
<param name="archive_file" value="./libastylej-2.05.1.zip" /> <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="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}" /> <param name="dest_folder" value="${staging_folder}" />
</antcall> </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" /> <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" /> <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
</target> </target>
@ -540,10 +540,10 @@
<antcall target="unzip"> <antcall target="unzip">
<param name="archive_file" value="./libastylej-2.05.1.zip" /> <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="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}" /> <param name="dest_folder" value="${staging_folder}" />
</antcall> </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" /> <chmod perm="755" file="linux/work/lib/libastylej.so" />
</target> </target>
@ -758,10 +758,10 @@
<antcall target="unzip"> <antcall target="unzip">
<param name="archive_file" value="./libastylej-2.05.1.zip" /> <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="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}" /> <param name="dest_folder" value="${staging_folder}" />
</antcall> </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/msvcp100.dll" todir="windows/work" />
<copy file="windows/msvcr100.dll" todir="windows/work" /> <copy file="windows/msvcr100.dll" todir="windows/work" />

2
build/libastylej-2.05.1.zip.sha
View File

@ -1 +1 @@
328bdc3baf781193f3bc33a56fa477de67f5bfd8 0b5e1be1985eed35657f60869a6cad916bd066fc

2
build/shared/lib/formatter.conf
View File

@ -28,3 +28,5 @@ pad-header
# if you like one-liners, keep them # if you like one-liners, keep them
keep-one-line-statements keep-one-line-statements
remove-comment-prefix