Added support for Jenkins to generate doxygen.

Change-Id: I2febfe42cc9301446f796376cfe8e1ef6744f19a

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/.cproject

@@ -39,6 +39,7 @@
 									<listOptionValue builtIn="false" value="$cpp-location/lib"/>
 								</option>
 								<option id="gnu.cpp.link.option.libs.1072058280" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
+									<listOptionValue builtIn="false" value="WPILib"/>
 									<listOptionValue builtIn="false" value="WPILibAthena"/>
 									<listOptionValue builtIn="false" value="WPILib"/>
 									<listOptionValue builtIn="false" value="HALAthena"/>
@@ -154,7 +155,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/src&quot;"/>
 									<listOptionValue builtIn="false" value="$cpp-location/sim/include"/>
 									<listOptionValue builtIn="false" value="/usr/include"/>
-									<listOptionValue builtIn="false" value="/usr/include/gazebo-3.1"/>
+									<listOptionValue builtIn="false" value="/usr/include/gazebo-3.0"/>
 									<listOptionValue builtIn="false" value="/usr/include/sdformat-2.0"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.optimization.level.1648211502" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/command-based/Command.h

@@ -2,7 +2,6 @@
 #define $classname_H
 
 #include "../CommandBase.h"
-#include "WPILib.h"
 
 class $classname: public CommandBase
 {

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/command-based/CommandBase.h

@@ -5,7 +5,6 @@
 #include "Commands/Command.h"
 #include "Subsystems/ExampleSubsystem.h"
 #include "OI.h"
-#include "WPILib.h"
 
 /**
  * The base for all commands. All atomic commands should subclass CommandBase.

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/command-based/CommandGroup.h

@@ -2,7 +2,6 @@
 #define $classname_H
 
 #include "Commands/CommandGroup.h"
-#include "WPILib.h"
 
 class $classname: public CommandGroup
 {

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/command-based/ExampleCommand.h

@@ -2,7 +2,6 @@
 #define EXAMPLE_COMMAND_H
 
 #include "../CommandBase.h"
-#include "WPILib.h"
 
 class ExampleCommand: public CommandBase
 {

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/command-based/PIDSubsystem.cpp

@@ -3,6 +3,9 @@
 #include "SmartDashboard/SmartDashboard.h"
 #include "LiveWindow/LiveWindow.h"
 
+#@autogenerated_code("pid", "")
+#parse("${exporter-path}PIDSubsystem-pid.cpp")
+#end
 $classname::$classname() :
 		PIDSubsystem("$classname", 1.0, 0.0, 0.0)
 {

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/command-based/RobotMap.h

@@ -1,7 +1,6 @@
 #ifndef ROBOTMAP_H
 #define ROBOTMAP_H
 
-#include "WPILib.h"
 
 /**
  * The RobotMap is a mapping from the ports sensors and actuators are wired into

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/command-based/Trigger.cpp

@@ -1,12 +1,15 @@
-#include "$classname.h"
+// TODO: convert into C++ template
+#error "This is not a C++ file. I have no idea what this is doing here, so I'm leaving this message here to let someone else clean this up"
+import edu.wpi.first.wpilibj.command.Trigger;
 
-$classname::$classname()
+/**
+ * New and improved C++
+ */
+public class $classname extends Trigger
 {
-
+public:
+	bool get()
+	{
+		return false;
+	}
 }
-
-bool $classname::Get()
-{
-	return false;
-}
-

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/command-based/Trigger.h

@@ -1,13 +1,9 @@
-#ifndef $classname_H
-#define $classname_H
+// TODO: convert into C++ template
+#error "This is not a C++ file. I have no idea what this is doing here, so I'm leaving this message here to let someone else clean this up"
+import edu.wpi.first.wpilibj.command.Trigger;
 
-#include "WPILib.h"
-
-class $classname: public Trigger
+public class $classname extends Trigger
 {
 public:
-	$classname();
-	bool Get();
-};
-
-#endif
+	bool get();
+}

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/GearsBot/src/Subsystems/DriveTrain.cpp

@@ -26,6 +26,9 @@ DriveTrain::DriveTrain() : Subsystem("DriveTrain") {
 		right_encoder->SetDistancePerPulse((double) (4.0/12.0*M_PI) / 360.0);
 	#endif
 
+	left_encoder->Start();
+	right_encoder->Start();
+
 	rangefinder = new AnalogInput(6);
 	gyro = new Gyro(1);
 

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/GearsBot/src/Subsystems/DriveTrain.h

@@ -1,6 +1,7 @@
 #ifndef DriveTrain_H
 #define DriveTrain_H
 
+#include "Commands/Subsystem.h"
 #include "WPILib.h"
 
 /**

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/Network Table Counter/Robot.cpp

@@ -0,0 +1,24 @@
+#include <networktables/NetworkTable.h>
+#include <iostream>
+using namespace std;
+
+// This is a simple robot program
+int main()
+{
+	NetworkTable::SetServerMode();
+	NetworkTable::SetTeam(190);
+	NetworkTable* table = NetworkTable::GetTable("SmartDashboard");
+	cout << "Started up" << endl;
+
+	long i = 0;
+	while (true)
+	{
+		cout << i << endl;
+		table->PutNumber("i", i);
+		i++;
+
+		sleep(1);
+	}
+
+	return 0;
+}

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/PacGoat/src/Commands/CheckForHotGoal.h

@@ -9,7 +9,7 @@
  * points than get none. When called sequentially, this command will block until
  * the hot goal is detected or until it is timed out.
  */
-class CheckForHotGoal : public Command {
+class CheckForHotGoal : Command {
 public:
 	CheckForHotGoal(double time);
 	void Initialize();

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/PacGoat/src/Commands/DriveAndShootAutonomous.cpp

@@ -6,7 +6,6 @@
 #include "Commands/SetPivotSetpoint.h"
 #include "Commands/DriveForward.h"
 #include "Commands/Shoot.h"
-#include "Commands/CheckForHotGoal.h"
 
 DriveAndShootAutonomous::DriveAndShootAutonomous() {
     AddSequential(new CloseClaw());

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/PacGoat/src/Subsystems/DriveTrain.cpp

@@ -43,6 +43,8 @@ DriveTrain::DriveTrain() :
 		leftEncoder->SetDistancePerPulse((4.0/*in*/*M_PI)/(360.0*12.0/*in/ft*/));
 	#endif
 
+	rightEncoder->Start();
+	leftEncoder->Start();
 	LiveWindow::GetInstance()->AddSensor("DriveTrain", "Right Encoder", rightEncoder);
 	LiveWindow::GetInstance()->AddSensor("DriveTrain", "Left Encoder", leftEncoder);
 

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/Simple Robot Example/Robot.java

@@ -0,0 +1,17 @@
+package $package;
+
+/**
+ * Simplest possible robot program
+ * 
+ * @author Team $team-number
+  */
+public class Robot {
+
+    /**
+     * @param args Input....
+     */
+    public static void main(String[] args) {
+    	// Do stuff here!
+    }
+
+}

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/examples.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <examples>
-  <!-- TODO add back in when there are enough samples to justify tags
   <tagDescription>
     <name>Simple Robot</name>
     <description>Examples for simple robot programs.</description>
@@ -11,14 +10,47 @@
     variety of tasks such as sending and receiving values to both
     dashboards and co-processors.</description>
   </tagDescription>
-  <tagDescription>
-    <name>Simulation</name>
-    <description>Examples that can be run in simulation.</description>
-  </tagDescription>-->
   <tagDescription>
     <name>CommandBased Robot</name>
     <description>Examples for CommandBased robot programs.</description>
   </tagDescription>
+  <tagDescription>
+    <name>Simulation</name>
+    <description>Examples that can be run in simulation.</description>
+  </tagDescription>
+  
+  <example>
+    <name>Simple Robot Example</name>
+    <description>The simplest possible program that compiles. This
+    shows the structure of a simple program that does nothing at
+    all.</description>
+    <tags>
+      <tag>Simple Robot</tag>
+    </tags>
+    <packages>
+      <package>src</package>
+    </packages>
+    <files>
+      <file source="examples/Simple Robot Example/Robot.java" destination="src/Robot.cpp" />
+    </files>
+  </example>
+  
+  <example>
+    <name>Network Table Counter</name>
+    <description>A simple program that increments a network table
+    variable once every second. This shows the structure of a simple
+    program that only uses network tables.</description>
+    <tags>
+      <tag>Simple Robot</tag>
+      <tag>Network Tables</tag>
+    </tags>
+    <packages>
+      <package>src</package>
+    </packages>
+    <files>
+      <file source="examples/Network Table Counter/Robot.cpp" destination="src/Robot.cpp" />
+    </files>
+  </example>
 
   <example>
     <name>GearsBot</name>
@@ -27,6 +59,7 @@
     supports simulation.</description>
     <tags>
       <tag>CommandBased Robot</tag>
+      <tag>Simulation</tag>
     </tags>
     <packages>
       <package>src</package>
@@ -104,12 +137,14 @@
             destination="src/Subsystems/Wrist.h"></file>
     </files>
   </example>
-
+  
   <example>
     <name>PacGoat</name>
     <description>A fully functional example CommandBased program for FRC Team 190&#39;s 2014 robot. This code can run on your computer if it supports simulation.</description>
     <tags>
       <tag>CommandBased Robot</tag>
+      <tag>Simulation</tag>
+      <tag>2014 Season</tag>
     </tags>
     <packages>
       <package>src</package>

eclipse-plugins/edu.wpi.first.wpilib.plugins.java/pom.xml

@@ -92,7 +92,7 @@
                 </artifactItem>
                 <artifactItem>
 				  <groupId>edu.wpi.first.wpilibj</groupId>
-				  <artifactId>wpilibJavaFinal</artifactId>
+				  <artifactId>wpilibJavaDevices</artifactId>
 				  <version>0.1.0-SNAPSHOT</version>
 				  <classifier>sources</classifier>
 				  <outputDirectory>${java-zip}/lib</outputDirectory>
@@ -107,13 +107,6 @@
 				  <type>javadoc</type>
 				  <outputDirectory>${java-zip}/javadoc-jar</outputDirectory>
                 </artifactItem>
-                <artifactItem>
-				  <groupId>edu.wpi.first.wpilibj</groupId>
-				  <artifactId>wpilibJava</artifactId>
-				  <version>0.1.0-SNAPSHOT</version>
-				  <type>javadoc</type>
-				  <outputDirectory>${java-zip}/javadoc-jar</outputDirectory>
-                </artifactItem>
               </artifactItems>
               
               <overWriteReleases>false</overWriteReleases>
@@ -336,12 +329,6 @@
 			  <version>0.1.0-SNAPSHOT</version>
 			  <type>jar</type>
 	</dependency>
-	<dependency>
-			  <groupId>edu.wpi.first.wpilibj</groupId>
-			  <artifactId>wpilibJavaFinal</artifactId>
-			  <version>0.1.0-SNAPSHOT</version>
-			  <classifier>sources</classifier>
-	</dependency>
 	<!-- dependency>
 			  <groupId>net.java.dev.jna</groupId>
 			  <artifactId>jna</artifactId>
@@ -374,12 +361,6 @@
 	</dependency>
 
 	<!-- Javadoc -->
-	<dependency>
-			  <groupId>edu.wpi.first.wpilibj</groupId>
-			  <artifactId>wpilibJava</artifactId>
-			  <version>0.1.0-SNAPSHOT</version>
-			  <type>javadoc</type>
-	</dependency>
 	<dependency>
 			  <groupId>edu.wpi.first.wpilibj</groupId>
 			  <artifactId>wpilibJavaDevices</artifactId>

eclipse-plugins/edu.wpi.first.wpilib.plugins.java/resources/templates/examples/Network Table Counter/Robot.java

@@ -0,0 +1,39 @@
+package $package;
+
+import edu.wpi.first.wpilibj.networktables.NetworkTable;
+
+/**
+ * An example of a network table counter. 
+ * 
+ * @author Team $team-number
+  */
+public class Robot {
+
+    private static NetworkTable table;
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+		NetworkTable.setServerMode();
+		NetworkTable.setTeam(190);
+		table = NetworkTable.getTable("SmartDashboard");
+		System.out.println("Started up");
+			
+		long i = 0;
+		while (true) {
+		    System.out.println(i);
+		    table.putNumber("i", i);
+		    i++;
+				
+		    try {
+		    	Thread.sleep(1000);
+		    } catch (InterruptedException e) {
+		    	// TODO Auto-generated catch block
+		    	e.printStackTrace();
+		    }
+		}
+		
+    }
+
+}

eclipse-plugins/edu.wpi.first.wpilib.plugins.java/resources/templates/examples/Simple Robot Example/Robot.java

@@ -0,0 +1,17 @@
+package $package;
+
+/**
+ * Simplest possible robot program
+ * 
+ * @author Team $team-number
+  */
+public class Robot {
+
+    /**
+     * @param args Input....
+     */
+    public static void main(String[] args) {
+    	// Do stuff here!
+    }
+
+}

eclipse-plugins/edu.wpi.first.wpilib.plugins.java/resources/templates/examples/examples.xml

@@ -1,30 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <examples>
-  <!-- TODO add back in when there are enough samples to justify tags
   <tagDescription>
     <name>Simple Robot</name>
     <description>Examples for simple robot programs.</description>
   </tagDescription>
+  <tagDescription>
+    <name>CommandBased Robot</name>
+    <description>Examples for CommandBased robot programs.</description>
+  </tagDescription>
+  <tagDescription>
+    <name>Simulation</name>
+    <description>Examples that can be run in simulation.</description>
+  </tagDescription>
   <tagDescription>
     <name>Network Tables</name>
     <description>Examples of how to use Network Tables to accomplish a
     variety of tasks such as sending and receiving values to both
     dashboards and co-processors.</description>
   </tagDescription>
-  <tagDescription>
-    <name>Simulation</name>
-    <description>Examples that can be run in simulation.</description>
-  </tagDescription>-->
-  <tagDescription>
-    <name>CommandBased Robot</name>
-    <description>Examples for CommandBased robot programs.</description>
-  </tagDescription>
+  
+  <example>
+    <name>Simple Robot Example</name>
+    <description>The simplest possible program that compiles. This
+    shows the structure of a simple program that does nothing at
+    all.</description>
+    <tags>
+      <tag>Simple Robot</tag>
+    </tags>
+    <packages>
+      <package>src/$package-dir</package>
+    </packages>
+    <files>
+      <file source="examples/Simple Robot Example/Robot.java" destination="src/$package-dir/Robot.java" />
+    </files>
+  </example>
+  
+  <example>
+    <name>Network Table Counter</name>
+    <description>A simple program that increments a network table
+    variable once every second. This shows the structure of a simple
+    program that only uses network tables.</description>
+    <tags>
+      <tag>Simple Robot</tag>
+      <tag>Network Tables</tag>
+    </tags>
+    <packages>
+      <package>src/$package-dir</package>
+    </packages>
+    <files>
+      <file source="examples/Network Table Counter/Robot.java" destination="src/$package-dir/Robot.java" />
+    </files>
+  </example>
 
   <example>
     <name>GearsBot</name>
     <description>A fully functional example CommandBased program for WPIs GearsBot robot. This code can run on your computer if it supports simulation.</description>
     <tags>
       <tag>CommandBased Robot</tag>
+      <tag>Simulation</tag>
     </tags>
     <packages>
       <package>src/$package-dir</package>
@@ -57,6 +90,8 @@
     <description>A fully functional example CommandBased program for FRC Team 190&#39;s 2014 robot. This code can run on your computer if it supports simulation.</description>
     <tags>
       <tag>CommandBased Robot</tag>
+      <tag>Simulation</tag>
+      <tag>2014 Season</tag>
     </tags>
     <packages>
       <package>src/$package-dir</package>

jenkins/docs/Makefile

@@ -1,5 +1,4 @@
 allwpilib=../..
-version=DEVELOPMENT
 
 all: java cpp site
 
@@ -9,7 +8,7 @@ java:
 	cp -r $(allwpilib)/wpilibj/wpilibJava/src/main/java/* build/java/
 	cp -r $(allwpilib)/wpilibj/wpilibJavaDevices/src/main/java/* build/java/
 	# cp -r $(allwpilib)/networktables/java/src/main/java/* build/java/
-	( cat java.doxy ; echo "PROJECT_NUMBER=${version}" ) | doxygen -
+	doxygen java.doxy
 
 cpp:
 	mkdir -p build/cpp/
@@ -20,7 +19,7 @@ cpp:
 	cp -r $(allwpilib)/wpilibc/wpilibC++Devices/include build/cpp/
 	# cp -r $(allwpilib)/networktables/cpp/lib build/cpp/
 	# cp -r $(allwpilib)/networktables/cpp/include build/cpp/
-	( cat cpp.doxy ; echo "PROJECT_NUMBER=${version}" ) | doxygen -
+	doxygen cpp.doxy
 
 # TODO: HAL
 

jenkins/docs/cpp.doxy

@@ -794,9 +794,7 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = nivision.h \
-                         pcre.h \
-                         */NetworkCommunication/*
+EXCLUDE_PATTERNS       =
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the

wpilibc/wpilibC++/CMakeLists.txt

@@ -6,7 +6,7 @@ include_directories(include/ ${NWT_API_INCLUDES} ${HAL_API_INCLUDES})
 add_library(WPILib STATIC ${SRC_FILES})
 set(CMAKE_CXX_FLAGS "-fPIC")
 target_link_libraries(WPILib)
-INSTALL(TARGETS WPILib ARCHIVE DESTINATION lib COMPONENT lib)
+INSTALL(TARGETS WPILib ARCHIVE DESTINATION src COMPONENT src)
 INSTALL(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX} COMPONENT headers)
 # lib/ c m gcc_s ld-linux
 # usr/lib stdc++

wpilibc/wpilibC++Devices/CMakeLists.txt

@@ -5,7 +5,7 @@ file(GLOB_RECURSE SRC_FILES src/*.cpp)
 include_directories(include/ ${WPILIB_INCLUDES} ${HAL_API_INCLUDES} ${NWT_API_INCLUDES})
 add_library(WPILibAthena STATIC ${SRC_FILES})
 target_link_libraries(WPILibAthena WPILib HALAthena NetworkTables ${NI_LIBS})
-INSTALL(TARGETS WPILibAthena ARCHIVE DESTINATION lib COMPONENT lib)
+INSTALL(TARGETS WPILibAthena ARCHIVE DESTINATION src COMPONENT src)
 INSTALL(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX} COMPONENT headers)
 # lib/ c m gcc_s ld-linux
 # usr/lib stdc++

wpilibj/wpilibJava/pom.xml

@@ -63,18 +63,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-      	  <sourceFileExcludes>
-      	    <exclude>edu/wpi/first/wpilibj/image/</exclude>
-      	    <exclude>edu/wpi/first/wpilibj/camera/</exclude>
-      	    <exclude>edu/wpi/first/wpilibj/visa/</exclude>
-      	    <exclude>edu/wpi/first/wpilibj/SerialPort.java</exclude>
-      	  </sourceFileExcludes>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>

wpilibj/wpilibJavaFinal/pom.xml

@@ -30,20 +30,7 @@
 	  <artifactId>wpilibJavaJNI</artifactId>
 	  <version>0.1.0-SNAPSHOT</version>
 	  <type>so</type>
-	</dependency>
-    
-	<dependency>
-	  <groupId>edu.wpi.first.wpilibj</groupId>
-	  <artifactId>wpilibJava</artifactId>
-	  <version>0.1.0-SNAPSHOT</version>
-	  <classifier>sources</classifier>
-	</dependency>
-	<dependency>
-	  <groupId>edu.wpi.first.wpilibj</groupId>
-	  <artifactId>wpilibJavaDevices</artifactId>
-	  <version>0.1.0-SNAPSHOT</version>
-	  <classifier>sources</classifier>
-	</dependency>
+	  </dependency>
   </dependencies>
 
   <build>
@@ -112,30 +99,6 @@
               </target>
             </configuration>
           </execution>
-          
-          <execution>
-            <id>generate-sources</id>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <phase>generate-sources</phase>
-            <configuration>
-              <target>
-                <taskdef resource="net/sf/antcontrib/antcontrib.properties"
-                         classpathref="maven.plugin.classpath" />
-                <mkdir dir="${project.build.directory}/sources" />
-
-                <property name="mvn.wpilibJava.sources.path" value="${edu.wpi.first.wpilibj:wpilibJava:jar:sources}"/>
-                <unzip src="${mvn.wpilibJava.sources.path}" dest="${project.build.directory}/sources" />
-
-                <property name="mvn.wpilibJavaDevices.sources.path" value="${edu.wpi.first.wpilibj:wpilibJavaDevices:jar:sources}"/>
-                <unzip src="${mvn.wpilibJavaDevices.sources.path}" dest="${project.build.directory}/sources" />
-
-                <zip basedir="${project.build.directory}/sources" destfile="${project.build.directory}/sources.jar"/>
-                <attachartifact file="${project.build.directory}/sources.jar" classifier="sources" type="jar" />
-              </target>
-            </configuration>
-          </execution>
         </executions>
         <dependencies>
           <dependency>