Fixed building of the frcsim-libwpilibsim-cpp deb.

There is still a bug where the examples have been updated to use 0 based
joysticks, but the simulation libraries have not been updated. I'll fix
that as a separate commit focused on fixing the joystick APIs.

Change-Id: I3b358e67b7fa18b30d1fd2b53098659cfefdfd76
This commit is contained in:
Alex Henning
2014-10-26 20:39:52 -04:00
parent 97be9765cd
commit fa8d7b843c
6 changed files with 27 additions and 68 deletions

View File

@@ -0,0 +1,19 @@
prefix = /usr
lib.dir = $(prefix)/lib
build.dir = build
allwpilib = ../..
all:
mkdir -p $(build.dir)
cd build && cmake .. && make
# cp -r $(allwpilib)/wpilibc/wpilibC++ build
# cd ${build.dir} && ALLWPILIB=$(allwpilib) cmake .. && make
clean:
rm -rf $(build.dir)
install: all
mkdir -p $(DESTDIR)$(lib.dir)
install build/allwpilib/wpilibc/wpilibC++Sim/libWPILibSim.so $(DESTDIR)$(lib.dir)
# install $(build.dir)/libWPILibSim.so $(DESTDIR)$(lib.dir)
# install $(build.dir)/build/wpilibC++/libWPILib.a $(DESTDIR)$(lib.dir)

View File

@@ -1,62 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>edu.wpi.first.wpilibc.simulation</groupId>
<artifactId>WPILibCSim</artifactId>
<version>0.1.0</version>
<packaging>pom</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>zip-cpp-sim-includes</id>
<phase>compile</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<mkdir dir="${project.build.directory}/sim-includes/sim/include"/>
<copy todir="${project.build.directory}/sim-includes/sim/include">
<fileset dir="include"/>
<fileset dir="../wpilibC++/include"/>
<fileset dir="../../networktables/cpp/include"/>
<fileset dir="../../hal/include"/>
</copy>
<zip destfile="${project.build.directory}/${project.build.finalName}.zip"
basedir="${project.build.directory}/sim-includes" />
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.2</version>
<executions>
<execution>
<id>zip-cpp-includes</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/${project.build.finalName}.zip</file>
<type>zip</type>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>