From 90f05dd31a1799293c4a92ac73e3cd4405b3fbc2 Mon Sep 17 00:00:00 2001
From: James Kuszmaul <jabukuszmaul+collab@gmail.com>
Date: Tue, 26 May 2015 09:28:05 -0400
Subject: [PATCH] Removed confusing error on deploy.

rm no longer throws a file not found error on deploy.
Also, throw in a sync command at the end of the deploy so that we don't get corrupted files.

Change-Id: I561916e4fec1b8449f9a70b7ee2155b0b62abc80
---
 .../src/main/resources/cpp-zip/ant/build.xml     | 16 ++++++++++++----
 .../src/main/resources/java-zip/ant/build.xml    | 14 +++++++++++---
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.xml
index 2968a9b8c5..c64936357d 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.xml
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.xml
@@ -60,17 +60,19 @@
          password="${password}"
          trust="true"
          failonerror="no"
-         command="rm ${deploy.dir}/FRCUserProgram" />
+         command="rm -f ${deploy.dir}/FRCUserProgram" />
 
     <echo>[athena-deploy] Copying code over.</echo>
     <scp file="${out.exe}" sftp="true" todir="${username}@${target}:${deploy.dir}" password="${password}" trust="true"/>
 
+     <!-- Suppress the exit status so that if no netconsole was running then
+          it doesn't show up red on the output. -->
     <sshexec host="${target}"
                username="admin"
                password="${password}"
                trust="true"
                failonerror="false"
-               command="killall netconsole-host"/>
+               command="killall -q netconsole-host || :"/>
     <scp file="${wpilib.ant.dir}/netconsole-host" todir="admin@${target}:/usr/local/frc/bin" password="${password}" trust="true"/>
 
     <scp file="${wpilib.ant.dir}/robotCommand" todir="${username}@${target}:/home/lvuser/" password="${password}" trust="true"/>
@@ -82,8 +84,14 @@
        trust="true"
        command=". /etc/profile.d/natinst-path.sh; chmod a+x ${deploy.dir}/${out}; ${deploy.kill.command};"/>
 
+    <sshexec host="${target}"
+         username="${username}"
+         password="${password}"
+         trust="true"
+         command="sync" />
+
   </target>
-  
+
   <target name="kill-program" depends="get-target-ip" description="Kill the currently running FRC program">
 	  <sshexec host="${target}"
 		   username="${username}"
@@ -115,7 +123,7 @@
       </sequential>
     </parallel>
   </target>
-  
+
   <target name="dependencies" depends="get-target-ip">
     <property name="ant.enable.asserts" value="true"/>
 	<post to="http://${target}/nisysapi/server" logfile="sysProps.xml" verbose="false" encoding="UTF-16LE" append="false">
diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.xml
index 500904263d..8c34c98008 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.xml
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.xml
@@ -100,17 +100,19 @@
     <!-- We're running a clean here to get around a known ant issue where it does not detected changed constant variables.
      To get around this, we're recompiling the entire project, which is not an issue for most teams. If this is an issue
      for you, you can remove the clean here, just be sure to do a full rebuild after you've changed any constants.
-     Reference: http://stackoverflow.com/questions/6430001/ant-doesnt-recompile-constants -->	
+     Reference: http://stackoverflow.com/questions/6430001/ant-doesnt-recompile-constants -->
   <target name="deploy" depends="clean,jar,get-target-ip,dependencies" description="Deploy the jar and start the program running.">
     <echo>[athena-deploy] Copying code over.</echo>
     <scp file="${dist.jar}" todir="${username}@${target}:${deploy.dir}" password="${password}" trust="true"/>
 
+     <!-- Suppress the exit status so that if no netconsole was running then
+          it doesn't show up red on the output. -->
       <sshexec host="${target}"
                username="admin"
                password="${password}"
                trust="true"
                failonerror="false"
-               command="killall netconsole-host"/>
+               command="killall -q netconsole-host || :"/>
       <scp file="${wpilib.ant.dir}/netconsole-host" todir="admin@${target}:/usr/local/frc/bin" password="${password}" trust="true"/>
 
       <scp file="${wpilib.ant.dir}/robotCommand" todir="${username}@${target}:${command.dir}" password="${password}" trust="true"/>
@@ -122,6 +124,12 @@
        trust="true"
        command="${deploy.kill.command};"/>
 
+    <sshexec host="${target}"
+         username="${username}"
+         password="${password}"
+         trust="true"
+         command="sync" />
+
   </target>
 
   <target name="debug-deploy" depends="jar,get-target-ip,dependencies" description="Deploy the jar and start the program running.">
@@ -214,7 +222,7 @@
       </sequential>
     </parallel>
   </target>
-  
+
   <target name="dependencies" depends="get-target-ip">
     <property name="ant.enable.asserts" value="true"/>
 	<post to="http://${target}/nisysapi/server" logfile="sysProps.xml" verbose="false" encoding="UTF-16LE" append="false">