From 8c395ca2926141d13c311bb417f1d19ecd491c6e Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Fri, 12 Sep 2014 17:01:45 -0400 Subject: [PATCH] Move user program to home\lvuser based on comments from Joe Change-Id: I289cfb4603a4ead6641161191129cb5ca0ea9858 --- .../resources/templates/build.properties | 2 +- .../wpilib/plugins/cpp/launching/DeployLaunchShortcut.java | 2 +- .../src/main/resources/cpp-zip/ant/robotCommand | 2 +- .../src/main/resources/java-zip/ant/build.properties | 2 +- .../src/main/resources/java-zip/ant/robotCommand | 2 +- .../src/main/resources/java-zip/ant/robotDebugCommand | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/build.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/build.properties index bd9aa1e25f..f807678b4a 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/build.properties +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/build.properties @@ -1,7 +1,7 @@ # Deployment information username=admin password= -deploy.dir=/home/admin +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/ diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/launching/DeployLaunchShortcut.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/launching/DeployLaunchShortcut.java index 4950baa695..b8c3943a26 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/launching/DeployLaunchShortcut.java +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/launching/DeployLaunchShortcut.java @@ -154,7 +154,7 @@ public class DeployLaunchShortcut implements ILaunchShortcut "Debug/FRCUserProgram"); config.setAttribute("org.eclipse.cdt.dsf.gdb.DEBUG_NAME", "arm-frc-linux-gnueabi-gdb"); - config.setAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_PATH, "/home/admin/FRCUserProgram"); + config.setAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_PATH, "/home/lvuser/FRCUserProgram"); config.setAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_CONNECTION, remote_connection); config.setAttribute(IRemoteConnectionConfigurationConstants.ATTR_SKIP_DOWNLOAD_TO_TARGET, false); config.setAttribute(IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT, "2345"); diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/robotCommand b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/robotCommand index d7713d7fe9..85b3b5689a 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/robotCommand +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/robotCommand @@ -1 +1 @@ -/home/admin/FRCUserProgram +/home/lvuser/FRCUserProgram 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 7c0a0717c1..35ac1d0750 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 @@ -1,7 +1,7 @@ # Deployment information username=admin password= -deploy.dir=/home/admin +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} diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/robotCommand b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/robotCommand index 217bbc7a51..93d1cad290 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/robotCommand +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/robotCommand @@ -1,3 +1,3 @@ /usr/local/frc/JRE/bin/java --jar /home/admin/FRCUserProgram.jar +-jar /home/lvuser/FRCUserProgram.jar diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/robotDebugCommand b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/robotDebugCommand index 317e4a4c82..5032c29c75 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/robotDebugCommand +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/robotDebugCommand @@ -1,3 +1,3 @@ /usr/local/frc/JRE/bin/java -XX:+UsePerfData -agentlib:jdwp=transport=dt_socket,address=8348,server=y,suspend=y --jar /home/admin/FRCUserProgram.jar +-jar /home/lvuser/FRCUserProgram.jar