diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/pom.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/pom.xml index d5113624c9..fc2f95a597 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/pom.xml +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/pom.xml @@ -1,6 +1,6 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 edu.wpi.first.wpilib.plugins.core eclipse-plugin @@ -11,4 +11,188 @@ 0.1.0.qualifier .. + + + DEVELOPMENT + ${project.build.directory}/tools-zip + + + + + WPILib Maven Repository + http://first.wpi.edu/FRC/roborio/maven/ + + + + + + + . + + resources/configuration.properties + + true + + + + + maven-resources-plugin + 2.6 + + + copy-ant-resources-to-tools-zip + generate-sources + + copy-resources + + + ${tools-zip} + + + src/main/resources/tools-zip + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + + fetch-jar-zip-dependencies + compile + + copy + + + + + edu.wpi.first.wpilib + RobotBuilder + 2.0.0-SNAPSHOT + ${tools-zip} + RobotBuilder.jar + + + edu.wpi.first.wpilib + SmartDashboard + 1.0.0-SNAPSHOT + ${tools-zip} + SmartDashboard.jar + + + + false + true + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + + + set-version-info + + run + + process-sources + + + + + + + + + + + true + + + + + + generate-jar-zip + compile + + run + + + + + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-dependency-plugin + + [2.8,) + + copy + + + + + + + + + + + + + + + + + + + + edu.wpi.first.wpilib + RobotBuilder + 2.0.0-SNAPSHOT + + + edu.wpi.first.wpilib + SmartDashboard + 1.0.0-SNAPSHOT + + diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/resources/configuration.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/resources/configuration.properties new file mode 100644 index 0000000000..cbfaca2ede --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/resources/configuration.properties @@ -0,0 +1,2 @@ +timestamp=${timestamp} +version=${version} diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/resources/tools.zip b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/resources/tools.zip deleted file mode 100644 index 0fe1052626..0000000000 Binary files a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/resources/tools.zip and /dev/null differ diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/WPILibCore.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/WPILibCore.java index d540d142d1..1b168c94d9 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/WPILibCore.java +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/WPILibCore.java @@ -134,7 +134,17 @@ public class WPILibCore extends AbstractUIPlugin { } public String getDefaultVersion() { - return "0.2"; + try { + Properties props = new AntPropertiesParser(WPILibCore.class.getResourceAsStream("/resources/configuration.properties")).getProperties(); + if (props.getProperty("version").startsWith("$")) { + return "DEVELOPMENT"; + } else { + return props.getProperty("version"); + } + } catch (CoreException e) { + WPILibCore.logError("Error getting properties.", e); + return "DEVELOPMENT"; + } } public String getCurrentVersion() {