Skip to content
This repository has been archived by the owner on Jul 25, 2018. It is now read-only.

Commit

Permalink
Bunches of changes, it's not quite there yet
Browse files Browse the repository at this point in the history
  • Loading branch information
virtuald committed Dec 30, 2014
1 parent cd26da9 commit d0b4e9d
Show file tree
Hide file tree
Showing 28 changed files with 366 additions and 452 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Expand Up @@ -3,5 +3,4 @@
.classpath
target

META-INF
target
target
20 changes: 15 additions & 5 deletions pom.xml
Expand Up @@ -8,9 +8,9 @@
<packaging>pom</packaging>

<modules>
<module>io.github.robotpy.plugins.robotpy</module>
<module>io.github.robotpy.plugins.robotpy.feature</module>
<module>io.github.robotpy.plugins.updatesite</module>
<module>robotpy</module>
<module>robotpy.feature</module>
<module>robotpy.updatesite</module>
</modules>

<properties>
Expand All @@ -22,11 +22,21 @@
<id>juno</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/luna</url>
</repository><!--
</repository>
<repository>
<id>pydev</id>
<layout>p2</layout>
<url>http://pydev.org/updates</url>
</repository>
<repository>
<id>FRC Eclipse Plugins</id>
<layout>p2</layout>
<url>http://first.wpi.edu/FRC/roborio/release/eclipse/</url>
</repository>
<repository>
<id>FRC Binaries</id>
<url>http://first.wpi.edu/FRC/c/maven/</url>
</repository> -->
</repository>
</repositories>

<build>
Expand Down
6 changes: 3 additions & 3 deletions robotpy.feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="io.github.robotpy.plugins.java.feature"
label="Robot Java Development"
id="io.github.robotpy.plugins.robotpy.feature"
label="Robot Python Development"
version="0.1.0.qualifier"
provider-name="Worcester Polytechnic Institute">

Expand Down Expand Up @@ -47,7 +47,7 @@
</license>

<includes
id="edu.wpi.first.wpilib.plugins.feature"
id="edu.wpi.first.wpilib.plugins.core.feature"
version="0.0.0"/>

<plugin
Expand Down
42 changes: 42 additions & 0 deletions robotpy/META-INF/MANIFEST.MF
@@ -0,0 +1,42 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: io.github.robotpy.plugins.robotpy
Bundle-SymbolicName: io.github.robotpy.plugins.robotpy;singleton:=true
Bundle-Version: 0.1.0.qualifier
Bundle-Activator: io.github.robotpy.plugins.robotpy.WPILibPythonPlugin
Bundle-Vendor: RobotPy Development Team
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.resources,
edu.wpi.first.wpilib.plugins.core;bundle-version="0.1.0",
org.python.pydev;bundle-version="3.9.0.201411111611",
org.python.pydev.core;bundle-version="3.9.0.201411111611"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
universal.jar,
ant-antlr.jar,
ant-apache-bcel.jar,
ant-apache-bsf.jar,
ant-apache-log4j.jar,
ant-apache-oro.jar,
ant-apache-regexp.jar,
ant-apache-resolver.jar,
ant-apache-xalan2.jar,
ant-commons-logging.jar,
ant-commons-net.jar,
ant-jai.jar,
ant-javamail.jar,
ant-jdepend.jar,
ant-jmf.jar,
ant-jsch.jar,
ant-junit.jar,
ant-junit4.jar,
ant-launcher.jar,
ant-netrexx.jar,
ant-swing.jar,
ant-testutil.jar,
ant.jar,
jdi.jar,
jdimodel.jar,
junit.jar
8 changes: 8 additions & 0 deletions robotpy/build.properties
@@ -0,0 +1,8 @@
source.. = src/main/java/
output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
resources/
src.includes = src/,\
resources/
104 changes: 52 additions & 52 deletions robotpy/plugin.xml
Expand Up @@ -5,151 +5,151 @@
point="org.eclipse.ui.newWizards">
<category
name="WPILib Robot Java Development"
id="io.github.robotpy.plugins.java">
id="io.github.robotpy.plugins.robotpy">
</category>
<wizard
category="io.github.robotpy.plugins.java"
class="io.github.robotpy.plugins.java.wizards.newproject.NewJavaWizard"
category="io.github.robotpy.plugins.robotpy"
class="io.github.robotpy.plugins.robotpy.wizards.newproject.NewRobotpyWizard"
icon="resources/icons/wpi.ico"
id="io.github.robotpy.plugins.java.wizards.newproject.NewJavaWizard"
id="io.github.robotpy.plugins.robotpy.wizards.newproject.NewJavaWizard"
name="Robot Java Project"
project="true">
</wizard>
<wizard
category="io.github.robotpy.plugins.java"
class="io.github.robotpy.plugins.java.wizards.examples.ExampleJavaWizard"
category="io.github.robotpy.plugins.robotpy"
class="io.github.robotpy.plugins.robotpy.wizards.examples.ExampleRobotpyWizard"
icon="resources/icons/wpi.ico"
id="io.github.robotpy.plugins.java.wizards.examples.ExampleWizard"
id="io.github.robotpy.plugins.robotpy.wizards.examples.ExampleWizard"
name="Example Robot Java Project"
project="true">
</wizard>
<wizard
category="io.github.robotpy.plugins.java"
class="io.github.robotpy.plugins.java.wizards.file_template.CommandWizard"
category="io.github.robotpy.plugins.robotpy"
class="io.github.robotpy.plugins.robotpy.wizards.file_template.CommandWizard"
icon="resources/icons/Command.png"
id="io.github.robotpy.plugins.java.wizards.file_template.CommandWizard"
id="io.github.robotpy.plugins.robotpy.wizards.file_template.CommandWizard"
name="Command">
</wizard>
<wizard
category="io.github.robotpy.plugins.java"
class="io.github.robotpy.plugins.java.wizards.file_template.CommandGroupWizard"
category="io.github.robotpy.plugins.robotpy"
class="io.github.robotpy.plugins.robotpy.wizards.file_template.CommandGroupWizard"
icon="resources/icons/CommandGroup.png"
id="io.github.robotpy.plugins.java.wizards.file_template.CommandGroupWizard"
id="io.github.robotpy.plugins.robotpy.wizards.file_template.CommandGroupWizard"
name="CommandGroup">
</wizard>
<wizard
category="io.github.robotpy.plugins.java"
class="io.github.robotpy.plugins.java.wizards.file_template.SubsystemWizard"
category="io.github.robotpy.plugins.robotpy"
class="io.github.robotpy.plugins.robotpy.wizards.file_template.SubsystemWizard"
icon="resources/icons/Subsystem.png"
id="io.github.robotpy.plugins.java.wizards.file_template.SubsystemWizard"
id="io.github.robotpy.plugins.robotpy.wizards.file_template.SubsystemWizard"
name="Subsytem">
</wizard>
<wizard
category="io.github.robotpy.plugins.java"
class="io.github.robotpy.plugins.java.wizards.file_template.PIDSubsystemWizard"
category="io.github.robotpy.plugins.robotpy"
class="io.github.robotpy.plugins.robotpy.wizards.file_template.PIDSubsystemWizard"
icon="resources/icons/PIDSubsystem.png"
id="io.github.robotpy.plugins.java.wizards.file_template.PIDSubsystemWizard"
id="io.github.robotpy.plugins.robotpy.wizards.file_template.PIDSubsystemWizard"
name="PIDSubsystem">
</wizard>
<wizard
category="io.github.robotpy.plugins.java"
class="io.github.robotpy.plugins.java.wizards.file_template.TriggerWizard"
category="io.github.robotpy.plugins.robotpy"
class="io.github.robotpy.plugins.robotpy.wizards.file_template.TriggerWizard"
icon="resources/icons/Button.png"
id="io.github.robotpy.plugins.java.wizards.file_template.TriggerWizard"
id="io.github.robotpy.plugins.robotpy.wizards.file_template.TriggerWizard"
name="Trigger">
</wizard>
</extension>
<extension
point="org.eclipse.ui.navigator.navigatorContent">
<commonWizard
menuGroupId="io.github.robotpy.plugins.java"
menuGroupId="io.github.robotpy.plugins.robotpy"
type="new"
wizardId="io.github.robotpy.plugins.java.wizards.file_template.CommandWizard">
wizardId="io.github.robotpy.plugins.robotpy.wizards.file_template.CommandWizard">
<enablement>
<with variable="selection"><iterate>
<and>
<test
args="io.github.robotpy.plugins.core.nature.FRCProjectNature"
args="edu.wpi.first.wpilib.plugins.core.nature.FRCProjectNature"
property="org.eclipse.jdt.launching.hasProjectNature">
</test>
<test
args="org.eclipse.jdt.core.javanature"
args="org.python.pydev.pythonNature"
property="org.eclipse.jdt.launching.hasProjectNature">
</test>
</and>
</iterate></with>
</enablement>
</commonWizard>
<commonWizard
menuGroupId="io.github.robotpy.plugins.java"
menuGroupId="io.github.robotpy.plugins.robotpy"
type="new"
wizardId="io.github.robotpy.plugins.java.wizards.file_template.CommandGroupWizard">
wizardId="io.github.robotpy.plugins.robotpy.wizards.file_template.CommandGroupWizard">
<enablement>
<with variable="selection"><iterate>
<and>
<test
args="io.github.robotpy.plugins.core.nature.FRCProjectNature"
args="edu.wpi.first.wpilib.plugins.core.nature.FRCProjectNature"
property="org.eclipse.jdt.launching.hasProjectNature">
</test>
<test
args="org.eclipse.jdt.core.javanature"
args="org.python.pydev.pythonNature"
property="org.eclipse.jdt.launching.hasProjectNature">
</test>
</and>
</iterate></with>
</enablement>
</commonWizard>
<commonWizard
menuGroupId="io.github.robotpy.plugins.java"
menuGroupId="io.github.robotpy.plugins.robotpy"
type="new"
wizardId="io.github.robotpy.plugins.java.wizards.file_template.SubsystemWizard">
wizardId="io.github.robotpy.plugins.robotpy.wizards.file_template.SubsystemWizard">
<enablement>
<with variable="selection"><iterate>
<and>
<test
args="io.github.robotpy.plugins.core.nature.FRCProjectNature"
args="edu.wpi.first.wpilib.plugins.core.nature.FRCProjectNature"
property="org.eclipse.jdt.launching.hasProjectNature">
</test>
<test
args="org.eclipse.jdt.core.javanature"
args="org.python.pydev.pythonNature"
property="org.eclipse.jdt.launching.hasProjectNature">
</test>
</and>
</iterate></with>
</enablement>
</commonWizard>
<commonWizard
menuGroupId="io.github.robotpy.plugins.java"
menuGroupId="io.github.robotpy.plugins.robotpy"
type="new"
wizardId="io.github.robotpy.plugins.java.wizards.file_template.PIDSubsystemWizard">
wizardId="io.github.robotpy.plugins.robotpy.wizards.file_template.PIDSubsystemWizard">
<enablement>
<with variable="selection"><iterate>
<and>
<test
args="io.github.robotpy.plugins.core.nature.FRCProjectNature"
args="edu.wpi.first.wpilib.plugins.core.nature.FRCProjectNature"
property="org.eclipse.jdt.launching.hasProjectNature">
</test>
<test
args="org.eclipse.jdt.core.javanature"
args="org.python.pydev.pythonNature"
property="org.eclipse.jdt.launching.hasProjectNature">
</test>
</and>
</iterate></with>
</enablement>
</commonWizard>
<commonWizard
menuGroupId="io.github.robotpy.plugins.java"
menuGroupId="io.github.robotpy.plugins.robotpy"
type="new"
wizardId="io.github.robotpy.plugins.java.wizards.file_template.TriggerWizard">
wizardId="io.github.robotpy.plugins.robotpy.wizards.file_template.TriggerWizard">
<enablement>
<with variable="selection"><iterate>
<and>
<test
args="io.github.robotpy.plugins.core.nature.FRCProjectNature"
args="edu.wpi.first.wpilib.plugins.core.nature.FRCProjectNature"
property="org.eclipse.jdt.launching.hasProjectNature">
</test>
<test
args="org.eclipse.jdt.core.javanature"
args="org.python.pydev.pythonNature"
property="org.eclipse.jdt.launching.hasProjectNature">
</test>
</and>
Expand All @@ -160,16 +160,16 @@
<extension
point="org.eclipse.core.runtime.preferences">
<initializer
class="io.github.robotpy.plugins.java.preferences.PreferenceInitializer">
class="io.github.robotpy.plugins.robotpy.preferences.PreferenceInitializer">
</initializer>
</extension>
<extension
point="org.eclipse.debug.ui.launchShortcuts">
<shortcut
class="io.github.robotpy.plugins.java.launching.DeployLaunchShortcut"
class="io.github.robotpy.plugins.robotpy.launching.DeployLaunchShortcut"
description="Deploy the WPILib project to the roboRIO"
icon="resources/icons/wpi.ico"
id="io.github.robotpy.plugins.java.launching.deploy"
id="io.github.robotpy.plugins.robotpy.launching.deploy"
label="WPILib Java Deploy"
modes="run,debug">
<contextualLaunch>
Expand All @@ -179,11 +179,11 @@
<iterate>
<and>
<test
args="io.github.robotpy.plugins.core.nature.FRCProjectNature"
args="edu.wpi.first.wpilib.plugins.core.nature.FRCProjectNature"
property="org.eclipse.jdt.launching.hasProjectNature">
</test>
<test
args="org.eclipse.jdt.core.javanature"
args="org.python.pydev.pythonNature"
property="org.eclipse.jdt.launching.hasProjectNature">
</test>
</and>
Expand All @@ -201,10 +201,10 @@
</description>
</shortcut>
<shortcut
class="io.github.robotpy.plugins.java.launching.SimulateLaunchShortcut"
class="io.github.robotpy.plugins.robotpy.launching.SimulateLaunchShortcut"
description="Test your WPILib program with the Gazebo simulator."
icon="resources/icons/Gazebo.png"
id="io.github.robotpy.plugins.java.launching.simulate"
id="io.github.robotpy.plugins.robotpy.launching.simulate"
label="WPILib Java Simulation"
modes="run,debug">
<contextualLaunch>
Expand All @@ -214,11 +214,11 @@
<iterate>
<and>
<test
args="io.github.robotpy.plugins.core.nature.FRCProjectNature"
args="edu.wpi.first.wpilib.plugins.core.nature.FRCProjectNature"
property="org.eclipse.jdt.launching.hasProjectNature">
</test>
<test
args="org.eclipse.jdt.core.javanature"
args="org.python.pydev.pythonNature"
property="org.eclipse.jdt.launching.hasProjectNature">
</test>
</and>
Expand All @@ -239,7 +239,7 @@
<extension
point="org.eclipse.ui.startup">
<startup
class="io.github.robotpy.plugins.java.WPILibJavaPlugin">
class="io.github.robotpy.plugins.robotpy.WPILibPythonPlugin">
</startup>
</extension>
</plugin>

0 comments on commit d0b4e9d

Please sign in to comment.