Menu
▾
▴
[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3490] trunk/LWJGL
|
From: <ma...@us...> - 2011-02-14 20:42:22
|
Revision: 3490
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3490&view=rev
Author: matzon
Date: 2011-02-14 20:42:15 +0000 (Mon, 14 Feb 2011)
Log Message:
-----------
arielsans maven jinput patch
Modified Paths:
--------------
trunk/LWJGL/maven/build.xml
trunk/LWJGL/maven/lwjgl-parent.pom
trunk/LWJGL/maven/lwjgl.pom
trunk/LWJGL/platform_build/build-maven.xml
Added Paths:
-----------
trunk/LWJGL/maven/jinput-platform.pom
trunk/LWJGL/maven/jinput.pom
Modified: trunk/LWJGL/maven/build.xml
===================================================================
--- trunk/LWJGL/maven/build.xml 2011-02-09 21:12:01 UTC (rev 3489)
+++ trunk/LWJGL/maven/build.xml 2011-02-14 20:42:15 UTC (rev 3490)
@@ -1,15 +1,26 @@
<project name="maven" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
- <property name="mavenrepo" value="mvnrepo" />
- <property name="mavenrepoId" value="tmprepo" />
+ <property name="mavenrepo" value="file://m2repo" />
+ <property name="mavenrepoId" value="tmprepoid" />
+ <target name="install">
+ <antcall target="execute">
+ <param name="mvncommand" value="org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file"/>
+ </antcall>
+ </target>
<target name="deploy">
+ <antcall target="execute">
+ <param name="mvncommand" value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file"/>
+ </antcall>
+ </target>
+
+ <target name="execute">
- <!-- deploying parent.pom -->
+ <!-- parent.pom -->
<artifact:mvn>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+ <arg value="${mvncommand}" />
<arg value="-Durl=${mavenrepo}" />
<arg value="-DrepositoryId=${mavenrepoId}" />
<arg value="-DpomFile=lwjgl-parent.pom" />
@@ -17,10 +28,10 @@
<arg value="-Plwjglgpg" />
</artifact:mvn>
- <!-- deploying lwjgl.jar -->
+ <!-- lwjgl.jar -->
<artifact:mvn>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+ <arg value="${mvncommand}" />
<arg value="-Durl=${mavenrepo}" />
<arg value="-DrepositoryId=${mavenrepoId}" />
<arg value="-DpomFile=lwjgl.pom" />
@@ -29,7 +40,7 @@
</artifact:mvn>
<artifact:mvn>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+ <arg value="${mvncommand}" />
<arg value="-Durl=${mavenrepo}" />
<arg value="-DrepositoryId=${mavenrepoId}" />
<arg value="-DpomFile=lwjgl.pom" />
@@ -39,7 +50,7 @@
</artifact:mvn>
<artifact:mvn>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+ <arg value="${mvncommand}" />
<arg value="-Durl=${mavenrepo}" />
<arg value="-DrepositoryId=${mavenrepoId}" />
<arg value="-DpomFile=lwjgl.pom" />
@@ -48,10 +59,10 @@
<arg value="-Plwjglgpg" />
</artifact:mvn>
- <!-- deploying natives -->
+ <!-- lwjgl natives -->
<artifact:mvn>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+ <arg value="${mvncommand}" />
<arg value="-Durl=${mavenrepo}" />
<arg value="-DrepositoryId=${mavenrepoId}" />
<arg value="-DpomFile=lwjgl-platform.pom" />
@@ -61,7 +72,7 @@
</artifact:mvn>
<artifact:mvn>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+ <arg value="${mvncommand}" />
<arg value="-Durl=${mavenrepo}" />
<arg value="-DrepositoryId=${mavenrepoId}" />
<arg value="-DpomFile=lwjgl-platform.pom" />
@@ -71,7 +82,7 @@
</artifact:mvn>
<artifact:mvn>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+ <arg value="${mvncommand}" />
<arg value="-Durl=${mavenrepo}" />
<arg value="-DrepositoryId=${mavenrepoId}" />
<arg value="-DpomFile=lwjgl-platform.pom" />
@@ -80,10 +91,10 @@
<arg value="-Plwjglgpg" />
</artifact:mvn>
- <!-- deploying lwjgl_util.jar -->
+ <!-- lwjgl_util.jar -->
<artifact:mvn>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+ <arg value="${mvncommand}" />
<arg value="-Durl=${mavenrepo}" />
<arg value="-DrepositoryId=${mavenrepoId}" />
<arg value="-DpomFile=lwjgl_util.pom" />
@@ -92,7 +103,7 @@
</artifact:mvn>
<artifact:mvn>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+ <arg value="${mvncommand}" />
<arg value="-Durl=${mavenrepo}" />
<arg value="-DrepositoryId=${mavenrepoId}" />
<arg value="-DpomFile=lwjgl_util.pom" />
@@ -102,7 +113,7 @@
</artifact:mvn>
<artifact:mvn>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+ <arg value="${mvncommand}" />
<arg value="-Durl=${mavenrepo}" />
<arg value="-DrepositoryId=${mavenrepoId}" />
<arg value="-DpomFile=lwjgl_util.pom" />
@@ -111,10 +122,10 @@
<arg value="-Plwjglgpg" />
</artifact:mvn>
- <!-- deploying lwjgl_util_applet.jar -->
+ <!-- lwjgl_util_applet.jar -->
<artifact:mvn>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+ <arg value="${mvncommand}" />
<arg value="-Durl=${mavenrepo}" />
<arg value="-DrepositoryId=${mavenrepoId}" />
<arg value="-DpomFile=lwjgl_util_applet.pom" />
@@ -123,7 +134,7 @@
</artifact:mvn>
<artifact:mvn>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+ <arg value="${mvncommand}" />
<arg value="-Durl=${mavenrepo}" />
<arg value="-DrepositoryId=${mavenrepoId}" />
<arg value="-DpomFile=lwjgl_util.pom" />
@@ -133,7 +144,7 @@
</artifact:mvn>
<artifact:mvn>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+ <arg value="${mvncommand}" />
<arg value="-Durl=${mavenrepo}" />
<arg value="-DrepositoryId=${mavenrepoId}" />
<arg value="-DpomFile=lwjgl_util.pom" />
@@ -141,7 +152,50 @@
<arg value="-Dclassifier=javadoc" />
<arg value="-Plwjglgpg" />
</artifact:mvn>
+
+ <!-- jinput.jar -->
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=jinput.pom" />
+ <arg value="-Dfile=jinput.jar" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+ <!-- jinput natives -->
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=jinput-platform.pom" />
+ <arg value="-Dfile=jinput-platform-natives-win.jar" />
+ <arg value="-Dclassifier=natives-win" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=jinput-platform.pom" />
+ <arg value="-Dfile=jinput-platform-natives-linux.jar" />
+ <arg value="-Dclassifier=natives-linux" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=jinput-platform.pom" />
+ <arg value="-Dfile=jinput-platform-natives-mac.jar" />
+ <arg value="-Dclassifier=natives-mac" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
</target>
-
-
+
</project>
\ No newline at end of file
Added: trunk/LWJGL/maven/jinput-platform.pom
===================================================================
--- trunk/LWJGL/maven/jinput-platform.pom (rev 0)
+++ trunk/LWJGL/maven/jinput-platform.pom 2011-02-14 20:42:15 UTC (rev 3490)
@@ -0,0 +1,32 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.lwjgl.lwjgl</groupId>
+ <artifactId>parent</artifactId>
+ <version>@VERSION@</version>
+ </parent>
+ <groupId>org.lwjgl.lwjgl</groupId>
+ <artifactId>jinput-platform</artifactId>
+ <packaging>jar</packaging>
+ <name>JInput - Java Game Controller API</name>
+ <version>@VERSION@</version>
+ <description>JInput - Java Game Controller API</description>
+ <url>http://java.net/projects/jinput</url>
+ <licenses>
+ <license>
+ <name>BSD</name>
+ <url>http://www.opensource.org/licenses/bsd-license.php</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>Members</id>
+ <url>http://java.net/projects/jinput/members</url>
+ </developer>
+ </developers>
+ <scm>
+ <url>http://java.net/projects/jinput/sources/svn/show</url>
+ <connection>https://svn.java.net/svn/jinput~svn </connection>
+ </scm>
+</project>
Added: trunk/LWJGL/maven/jinput.pom
===================================================================
--- trunk/LWJGL/maven/jinput.pom (rev 0)
+++ trunk/LWJGL/maven/jinput.pom 2011-02-14 20:42:15 UTC (rev 3490)
@@ -0,0 +1,52 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.lwjgl.lwjgl</groupId>
+ <artifactId>parent</artifactId>
+ <version>@VERSION@</version>
+ </parent>
+ <groupId>org.lwjgl.lwjgl</groupId>
+ <artifactId>jinput</artifactId>
+ <packaging>jar</packaging>
+ <name>JInput - Java Game Controller API</name>
+ <version>@VERSION@</version>
+ <description>JInput - Java Game Controller API</description>
+ <url>http://java.net/projects/jinput</url>
+ <licenses>
+ <license>
+ <name>BSD</name>
+ <url>http://www.opensource.org/licenses/bsd-license.php</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>Members</id>
+ <url>http://java.net/projects/jinput/members</url>
+ </developer>
+ </developers>
+ <scm>
+ <url>http://java.net/projects/jinput/sources/svn/show</url>
+ <connection>https://svn.java.net/svn/jinput~svn </connection>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jinput-platform</artifactId>
+ <version>${project.version}</version>
+ <classifier>natives-win</classifier>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jinput-platform</artifactId>
+ <version>${project.version}</version>
+ <classifier>natives-linux</classifier>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jinput-platform</artifactId>
+ <version>${project.version}</version>
+ <classifier>natives-mac</classifier>
+ </dependency>
+ </dependencies>
+</project>
Modified: trunk/LWJGL/maven/lwjgl-parent.pom
===================================================================
--- trunk/LWJGL/maven/lwjgl-parent.pom 2011-02-09 21:12:01 UTC (rev 3489)
+++ trunk/LWJGL/maven/lwjgl-parent.pom 2011-02-14 20:42:15 UTC (rev 3490)
@@ -20,8 +20,8 @@
</scm>
<developers>
<developer>
- <id>Matzon</id>
- <name>Brian Matzon</name>
+ <id>Developers</id>
+ <url>http://lwjgl.org/credits.php</url>
</developer>
</developers>
</project>
Modified: trunk/LWJGL/maven/lwjgl.pom
===================================================================
--- trunk/LWJGL/maven/lwjgl.pom 2011-02-09 21:12:01 UTC (rev 3489)
+++ trunk/LWJGL/maven/lwjgl.pom 2011-02-14 20:42:15 UTC (rev 3490)
@@ -36,5 +36,10 @@
<version>${project.version}</version>
<classifier>natives-mac</classifier>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jinput</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
Modified: trunk/LWJGL/platform_build/build-maven.xml
===================================================================
--- trunk/LWJGL/platform_build/build-maven.xml 2011-02-09 21:12:01 UTC (rev 3489)
+++ trunk/LWJGL/platform_build/build-maven.xml 2011-02-14 20:42:15 UTC (rev 3490)
@@ -43,6 +43,7 @@
<antcall target="-createmavennativejars" />
<antcall target="-copymavenpoms"/>
<antcall target="-copymavendeploybuild"/>
+ <antcall target="-addjinput"/>
<antcall target="-copymaventdist"/>
</target>
@@ -148,6 +149,43 @@
</fileset>
</copy>
</target>
+
+ <!-- JINPUT -->
+ <target name="-addjinput">
+ <antcall target="-copyjinputjar" />
+ <antcall target="-createmavennativejinputjars" />
+ </target>
+
+ <target name="-copyjinputjar">
+ <copy todir="${lwjgl.dstMaven}">
+ <fileset dir="${lwjgl.lib}">
+ <patternset>
+ <include name="jinput.jar" />
+ </patternset>
+ </fileset>
+ </copy>
+ </target>
+
+
+ <target name="-createmavennativejinputjars">
+ <jar destfile="${lwjgl.dstMaven}/jinput-platform-natives-win.jar" taskname="jinput-platform-natives-win.jar">
+ <fileset dir="${lwjgl.lib}/windows">
+ <patternset refid="lwjgl-windows-jinput.fileset"/>
+ </fileset>
+ </jar>
+ <jar destfile="${lwjgl.dstMaven}/jinput-platform-natives-linux.jar" taskname="jinput-platform-natives-linux.jar">
+ <fileset dir="${lwjgl.lib}/linux">
+ <patternset refid="lwjgl-linux-jinput.fileset"/>
+ </fileset>
+ </jar>
+ <jar destfile="${lwjgl.dstMaven}/jinput-platform-natives-mac.jar" taskname="jinput-platform-natives-mac.jar">
+ <fileset dir="${lwjgl.lib}/macosx">
+ <patternset refid="lwjgl-macosx-jinput.fileset"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <!-- END JINPUT -->
<target name="-copymaventdist">
<zip destfile="${lwjgl.dist}/lwjgl-maven-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="maven/**" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
