From e4babbe4d661c71980dabd49d8d89bb43cf11b40 Mon Sep 17 00:00:00 2001 From: Fredric Silberberg Date: Wed, 19 Nov 2014 14:20:53 -0500 Subject: [PATCH] Removed the tail command The build scripts were still calling the tail command for following the log file, even though we're now using netconsole. I've removed them. Change-Id: I48498c1ef338f99130e447097081db92b394e1aa --- .../src/main/resources/cpp-zip/ant/build.properties | 3 +-- .../src/main/resources/cpp-zip/ant/build.xml | 5 ----- .../src/main/resources/java-zip/ant/build.properties | 2 -- .../src/main/resources/java-zip/ant/build.xml | 10 ---------- 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties index c409af4cc3..3032388f2c 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties @@ -3,7 +3,6 @@ username=admin password= deploy.dir=/home/lvuser deploy.kill.command=/usr/local/frc/bin/frcKillRobot.sh -t -r -deploy.log.file=/var/local/natinst/log/FRC_UserProgram.log command.dir=/home/lvuser/ # Libraries to use @@ -14,4 +13,4 @@ roboRIOAllowedImages=18 # Ant support wpilib.ant.dir=${wpilib}/ant jsch.jar=${wpilib.ant.dir}/jsch-0.1.50.jar -classloadertask.jar=${wpilib.ant.dir}/ant-classloadertask.jar \ No newline at end of file +classloadertask.jar=${wpilib.ant.dir}/ant-classloadertask.jar 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 fc22f0d8be..1f2b051f0d 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 @@ -57,11 +57,6 @@ trust="true" command=". /etc/profile.d/natinst-path.sh; chmod a+x ${deploy.dir}/${out}; ${deploy.kill.command};"/> - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties index b259e7fa85..cb8d6e363d 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties @@ -3,8 +3,6 @@ username=admin password= deploy.dir=/home/lvuser deploy.kill.command=. /etc/profile.d/natinst-path.sh; /usr/local/frc/bin/frcKillRobot.sh -t -r -deploy.log.file=/var/local/natinst/log/FRC_UserProgram.log -deploy.log.command=tail -F -n 0 ${deploy.log.file} debug.flag.dir=/tmp/ debug.flag.command=chown lvuser:ni ${debug.flag.dir}frcdebug command.dir=/home/lvuser/ 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 d457e689c6..7d2bc6d202 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 @@ -97,11 +97,6 @@ trust="true" command="${deploy.kill.command};"/> - @@ -124,11 +119,6 @@ trust="true" command="${deploy.kill.command}"/> -