Added clang-format download in build.xml

Author: cmaglie

.gitignore

@@ -29,6 +29,7 @@ build/windows/launch4j-*.zip
 build/windows/launcher/launch4j
 build/windows/WinAVR-*.zip
 build/macosx/arduino-*.zip
+build/macosx/clang*.zip
 build/macosx/dist/*.tar.gz
 build/macosx/dist/*.tar.bz2
 build/macosx/*.tar.bz2

app/src/cc/arduino/packages/formatter/clangformat/ClangFormat.java

@@ -40,12 +40,15 @@
 import org.apache.commons.compress.utils.IOUtils;
 import org.apache.logging.log4j.core.util.NullOutputStream;
 
+import processing.app.Base;
 import processing.app.Editor;
 import processing.app.helpers.ProcessUtils;
 import processing.app.tools.Tool;
 
 public class ClangFormat implements Tool {
 
+  private final String clangExecutable = Base.getContentFile("clang-format")
+      .getAbsolutePath();
   private Editor editor;
 
   public ClangFormat() {
@@ -103,7 +106,7 @@ private Thread copyAndClose(InputStream input, OutputStream output) {
 
   String runClangFormatOn(String source)
       throws IOException, InterruptedException {
-    String cmd[] = new String[] { "clang-format" };
+    String cmd[] = new String[] { clangExecutable };
 
     Process process = ProcessUtils.exec(cmd);
     ByteArrayOutputStream result = new ByteArrayOutputStream();

build/build.xml

@@ -50,6 +50,16 @@
   <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linuxarm" /></condition>
   <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linuxaarch64" /></condition>
 
+  <condition property="download_os" value="macOS_64bit"><equals arg1="${platform}" arg2="macosx" /></condition>
+  <condition property="download_os" value="Windows_32bit"><equals arg1="${platform}" arg2="windows" /></condition>
+  <condition property="download_os" value="Linux_32bit"><equals arg1="${platform}" arg2="linux32" /></condition>
+  <condition property="download_os" value="Linux_64bit"><equals arg1="${platform}" arg2="linux64" /></condition>
+  <condition property="download_os" value="Linux_ARMv6"><equals arg1="${platform}" arg2="linuxarm" /></condition>
+  <condition property="download_os" value="Linux_ARM64"><equals arg1="${platform}" arg2="linuxaarch64" /></condition>
+
+  <condition property="exec_ext" value=".exe"><isset property="windows" /></condition>
+  <property name="exec_ext" value="" />
+
   <condition property="arch-bits" value="32">
     <equals arg1="${platform}" arg2="linux32"/>
   </condition>
@@ -108,6 +118,7 @@
   <property name="WIFI101-FW-UPDATER_VERSION" value="0.11.0" />
   <!-- https://github.com/arduino/built-in-examples -->
   <property name="BUILT-IN-EXAMPLES-VERSION" value="1.9.1" />
+  <property name="CLANG-FORMAT-VERSION" value="12.0.0" />
 
   <!-- Libraries required for running arduino -->
   <fileset dir=".." id="runtime.jars">
@@ -223,6 +234,8 @@
 
     <antcall target="assemble-libraries" />
 
+    <antcall target="assemble-clang-format" />
+
     <!-- Add WiFi101 updater tool -->
     <antcall target="unzip">
       <param name="archive_file" value="shared/WiFi101-Updater-ArduinoIDE-Plugin-${WIFI101-FW-UPDATER_VERSION}.zip" />
@@ -316,6 +329,24 @@
     <copy file="../hardware/package_index_bundled.json" todir="${target.path}/hardware/" />
   </target>
 
+  <!-- clang-format -->
+  <target name="assemble-clang-format" unless="light_bundle">
+    <property name="clang_arch_name" value="clang_${CLANG-FORMAT-VERSION}_${download_os}" />
+    <antcall target="unzip">
+      <param name="archive_file" value="${staging_folder}/${clang_arch_name}.zip"/>
+      <param name="archive_url" value="https://github.com/arduino/clang-static-binaries/releases/download/${CLANG-FORMAT-VERSION}/${clang_arch_name}.zip"/>
+      <param name="dest_folder" value="${staging_folder}/${clang_arch_name}/"/>
+      <param name="final_folder" value="${staging_folder}/${clang_arch_name}/clang-format"/>
+    </antcall>
+
+    <copy file="${staging_folder}/${clang_arch_name}/clang-format${exec_ext}" tofile="${staging_folder}/work/${staging_hardware_folder}/../clang-format${exec_ext}" overwrite="true"/>
+    <antcall target="make-file-executable">
+      <param name="file" value="${staging_folder}/work/${staging_hardware_folder}/../clang-format${exec_ext}" />
+    </antcall>
+
+    <delete dir="${staging_folder}/${clang_arch_name}"/>
+  </target>
+
   <!-- - - - - - - - - -->
   <!-- Revision check  -->
   <!-- - - - - - - - - -->

build/linux/clang_12.0.0_Linux_32bit.zip.sha

@@ -0,0 +1 @@
+b10e77fb79a41880766439dc65cd8aaa328af5bc

build/linux/clang_12.0.0_Linux_64bit.zip.sha

@@ -0,0 +1 @@
+e3fe347cdb2e4b7b1c92b8e21b4aae49eeaaad55

build/linux/clang_12.0.0_Linux_ARM64.zip.sha

@@ -0,0 +1 @@
+a81b7e8c6c5922fbcd423228f13a1148a91a3932

build/linux/clang_12.0.0_Linux_ARMv6.zip.sha

@@ -0,0 +1 @@
+d10ae0b04eadf9fd0fa52d16549a2c6bec482738

build/macosx/clang_12.0.0_macOS_64bit.zip.sha

@@ -0,0 +1 @@
+154b62e3062b5040594155702c7c7508d18c6b3a

build/windows/clang_12.0.0_Windows_32bit.zip.sha

@@ -0,0 +1 @@
+d2a5246fed18b61d96de49887e16520be5dad944