Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing packaging

Browse Source
This commit is contained in:
Patrick Plenefisch
2014-04-05 21:53:58 -04:00
parent 87e9b6ce51
commit b7ad001b4d
4 changed files with 58 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cmake/pom.xml
View File

@@ -4,7 +4,7 @@
<groupId>edu.wpi.first.wpilib.cmake</groupId>
<artifactId>cpp-root</artifactId>
<version>1.0.0</version>
<packaging>jar</packaging>
<packaging>pom</packaging>
<properties>
<cmakeGenerator>Unix Makefiles</cmakeGenerator>
</properties>
@@ -82,12 +82,38 @@
<configuration>
<target>
<echo file="${project.build.directory}/cmake/target-root/so.properties">cpp-sos=${version-info}</echo>
<zip destfile="${project.build.directory}/cpp-root-1.0.0.jar" basedir="${project.build.directory}/cmake/target-root" />
<zip destfile="${project.build.directory}/${project.build.finalName}.zip" basedir="${project.build.directory}/cmake/target-root" />
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<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>
<artifact>
<file>${project.build.directory}/cmake/target-root/lib/libHALAthena.so</file>
<type>so</type>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

4
eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/pom.xml
View File

@@ -63,7 +63,7 @@
<groupId>edu.wpi.first.wpilib.cmake</groupId>
<artifactId>cpp-root</artifactId>
<version>1.0.0</version>
<type>jar</type>
<type>zip</type>
<destFileName>cpp-root.jar</destFileName>
</artifactItem>
</artifactItems>
@@ -139,7 +139,7 @@
<groupId>edu.wpi.first.wpilib.cmake</groupId>
<artifactId>cpp-root</artifactId>
<version>1.0.0</version>
<type>jar</type>
<type>zip</type>
</dependency>
</dependencies>
</project>

4
wpilibj/wpilibJavaFinal/pom.xml
View File

@@ -37,7 +37,7 @@
<groupId>edu.wpi.first.wpilibj</groupId>
<artifactId>wpilibJavaJNI</artifactId>
<version>0.1.0-SNAPSHOT</version>
<type>jar</type>
<type>so</type>
</dependency>
</dependencies>
@@ -78,7 +78,7 @@
<groupId>edu.wpi.first.wpilibj</groupId>
<artifactId>wpilibJavaJNI</artifactId>
<version>0.1.0-SNAPSHOT</version>
<type>jar</type>
<type>so</type>
<destFileName>libwpilibJavaJNI.so</destFileName>
<outputDirectory>${project.build.directory}/classes/linux-arm</outputDirectory>
</artifactItem>

40
wpilibj/wpilibJavaJNI/pom.xml
View File

@@ -4,12 +4,13 @@
<artifactId>wpilibJavaJNI</artifactId>
<groupId>edu.wpi.first.wpilibj</groupId>
<version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<dependencies>
<dependency>
<groupId>edu.wpi.first.wpilib.cmake</groupId>
<artifactId>cpp-root</artifactId>
<version>1.0.0</version>
<type>jar</type>
<type>zip</type>
</dependency>
<dependency>
<groupId>edu.wpi.first.wpilibj</groupId>
@@ -201,28 +202,37 @@ this default location, specify a value for the 'embeddedJDKHome' property at the
<unzip dest="${project.build.directory}">
<fileset dir="${project.build.directory}">
<include name="cpp-root*.jar"/>
<include name="cpp-root*.zip"/>
</fileset>
</unzip>
</target>
<exportAntProperties>true</exportAntProperties>
</configuration>
</execution>
<!-- Unzip the include files for cpp.zip. -->
<execution>
<id>unzip-cpp-includes</id>
<phase>compile</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<zip includes="libwpilibJavaJNI.so" basedir="${project.build.directory}/" destfile="${project.build.directory}/wpilibJavaJNI-0.1.0.SNAPSHOT.jar" />
</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}/libwpilibJavaJNI.so</file>
<type>so</type>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>