Menu
▾
▴
[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3637] trunk/LWJGL
|
From: <ma...@us...> - 2011-09-08 21:36:01
|
Revision: 3637
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3637&view=rev
Author: matzon
Date: 2011-09-08 21:35:54 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
applied maven patch by ruben01
Modified Paths:
--------------
trunk/LWJGL/maven/build.xml
trunk/LWJGL/maven/lwjgl.pom
trunk/LWJGL/platform_build/build-maven.xml
Removed Paths:
-------------
trunk/LWJGL/maven/jinput-platform.pom
trunk/LWJGL/maven/jinput.pom
Modified: trunk/LWJGL/maven/build.xml
===================================================================
--- trunk/LWJGL/maven/build.xml 2011-09-07 21:28:01 UTC (rev 3636)
+++ trunk/LWJGL/maven/build.xml 2011-09-08 21:35:54 UTC (rev 3637)
@@ -4,198 +4,240 @@
<property name="mavenrepoId" value="tmprepoid" />
<target name="install">
- <antcall target="execute">
+ <antcall target="execute-install">
<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"/>
+ <param name="mvncommand" value="org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy-file"/>
</antcall>
</target>
+ <target name="deploy-gpg">
+ <antcall target="execute">
+ <param name="mvncommand" value="org.apache.maven.plugins:maven-gpg-plugin:1.4:sign-and-deploy-file"/>
+ </antcall>
+ </target>
+
+
+
<target name="execute">
+
+ <!-- parent.pom -->
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=lwjgl-parent.pom" />
+ <arg value="-Dfile=lwjgl-parent.pom" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+ <!-- lwjgl.jar -->
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=lwjgl.pom" />
+ <arg value="-Dfile=lwjgl.jar" />
+ <arg value="-Dtypes=jar,jar" />
+ <arg value="-Dclassifiers=sources,javadoc" />
+ <arg value="-Dfiles=lwjgl-sources.jar,lwjgl-javadoc.jar" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+
+ <!-- lwjgl natives -->
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=lwjgl-platform.pom" />
+ <arg value="-Dfile=lwjgl-platform-natives-windows.jar" />
+ <arg value="-Dclassifier=natives-windows" />
+ <arg value="-Dtypes=jar,jar" />
+ <arg value="-Dclassifiers=natives-linux,natives-osx" />
+ <arg value="-Dfiles=lwjgl-platform-natives-linux.jar,lwjgl-platform-natives-osx.jar" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+
+ <!-- lwjgl_util.jar -->
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=lwjgl_util.pom" />
+ <arg value="-Dfile=lwjgl_util.jar" />
+ <arg value="-Dtypes=jar,jar" />
+ <arg value="-Dclassifiers=sources,javadoc" />
+ <arg value="-Dfiles=lwjgl_util-sources.jar,lwjgl_util-javadoc.jar" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+ <!-- lwjgl_util_applet.jar -->
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=lwjgl_util_applet.pom" />
+ <arg value="-Dfile=lwjgl_util_applet.jar" />
+ <arg value="-Dtypes=jar,jar" />
+ <arg value="-Dclassifiers=sources,javadoc" />
+ <arg value="-Dfiles=lwjgl_util_applet-sources.jar,lwjgl_util_applet-javadoc.jar" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+ </target>
+
+
+ <target name="execute-install">
+
+ <!-- parent.pom -->
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=lwjgl-parent.pom" />
+ <arg value="-Dfile=lwjgl-parent.pom" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+ <!-- lwjgl.jar -->
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=lwjgl.pom" />
+ <arg value="-Dfile=lwjgl.jar" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=lwjgl.pom" />
+ <arg value="-Dfile=lwjgl-sources.jar" />
+ <arg value="-Dclassifier=sources" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=lwjgl.pom" />
+ <arg value="-Dfile=lwjgl-javadoc.jar" />
+ <arg value="-Dclassifier=javadoc" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+ <!-- lwjgl natives -->
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=lwjgl-platform.pom" />
+ <arg value="-Dfile=lwjgl-platform-natives-windows.jar" />
+ <arg value="-Dclassifier=natives-windows" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=lwjgl-platform.pom" />
+ <arg value="-Dfile=lwjgl-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=lwjgl-platform.pom" />
+ <arg value="-Dfile=lwjgl-platform-natives-osx.jar" />
+ <arg value="-Dclassifier=natives-osx" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+ <!-- lwjgl_util.jar -->
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=lwjgl_util.pom" />
+ <arg value="-Dfile=lwjgl_util.jar" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=lwjgl_util.pom" />
+ <arg value="-Dfile=lwjgl_util-sources.jar" />
+ <arg value="-Dclassifier=sources" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=lwjgl_util.pom" />
+ <arg value="-Dfile=lwjgl_util-javadoc.jar" />
+ <arg value="-Dclassifier=javadoc" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+ <!-- lwjgl_util_applet.jar -->
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=lwjgl_util_applet.pom" />
+ <arg value="-Dfile=lwjgl_util_applet.jar" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=lwjgl_util_applet.pom" />
+ <arg value="-Dfile=lwjgl_util_applet-sources.jar" />
+ <arg value="-Dclassifier=sources" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+
+ <artifact:mvn>
+ <arg value="${mvncommand}" />
+ <arg value="-Durl=${mavenrepo}" />
+ <arg value="-DrepositoryId=${mavenrepoId}" />
+ <arg value="-DpomFile=lwjgl_util_applet.pom" />
+ <arg value="-Dfile=lwjgl_util_applet-javadoc.jar" />
+ <arg value="-Dclassifier=javadoc" />
+ <arg value="-Plwjglgpg" />
+ </artifact:mvn>
+ </target>
- <!-- parent.pom -->
-
- <artifact:mvn>
- <arg value="${mvncommand}" />
- <arg value="-Durl=${mavenrepo}" />
- <arg value="-DrepositoryId=${mavenrepoId}" />
- <arg value="-DpomFile=lwjgl-parent.pom" />
- <arg value="-Dfile=lwjgl-parent.pom" />
- <arg value="-Plwjglgpg" />
- </artifact:mvn>
-
- <!-- lwjgl.jar -->
-
- <artifact:mvn>
- <arg value="${mvncommand}" />
- <arg value="-Durl=${mavenrepo}" />
- <arg value="-DrepositoryId=${mavenrepoId}" />
- <arg value="-DpomFile=lwjgl.pom" />
- <arg value="-Dfile=lwjgl.jar" />
- <arg value="-Plwjglgpg" />
- </artifact:mvn>
-
- <artifact:mvn>
- <arg value="${mvncommand}" />
- <arg value="-Durl=${mavenrepo}" />
- <arg value="-DrepositoryId=${mavenrepoId}" />
- <arg value="-DpomFile=lwjgl.pom" />
- <arg value="-Dfile=lwjgl-sources.jar" />
- <arg value="-Dclassifier=sources" />
- <arg value="-Plwjglgpg" />
- </artifact:mvn>
-
- <artifact:mvn>
- <arg value="${mvncommand}" />
- <arg value="-Durl=${mavenrepo}" />
- <arg value="-DrepositoryId=${mavenrepoId}" />
- <arg value="-DpomFile=lwjgl.pom" />
- <arg value="-Dfile=lwjgl-javadoc.jar" />
- <arg value="-Dclassifier=javadoc" />
- <arg value="-Plwjglgpg" />
- </artifact:mvn>
-
- <!-- lwjgl natives -->
-
- <artifact:mvn>
- <arg value="${mvncommand}" />
- <arg value="-Durl=${mavenrepo}" />
- <arg value="-DrepositoryId=${mavenrepoId}" />
- <arg value="-DpomFile=lwjgl-platform.pom" />
- <arg value="-Dfile=lwjgl-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=lwjgl-platform.pom" />
- <arg value="-Dfile=lwjgl-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=lwjgl-platform.pom" />
- <arg value="-Dfile=lwjgl-platform-natives-mac.jar" />
- <arg value="-Dclassifier=natives-mac" />
- <arg value="-Plwjglgpg" />
- </artifact:mvn>
-
- <!-- lwjgl_util.jar -->
-
- <artifact:mvn>
- <arg value="${mvncommand}" />
- <arg value="-Durl=${mavenrepo}" />
- <arg value="-DrepositoryId=${mavenrepoId}" />
- <arg value="-DpomFile=lwjgl_util.pom" />
- <arg value="-Dfile=lwjgl_util.jar" />
- <arg value="-Plwjglgpg" />
- </artifact:mvn>
-
- <artifact:mvn>
- <arg value="${mvncommand}" />
- <arg value="-Durl=${mavenrepo}" />
- <arg value="-DrepositoryId=${mavenrepoId}" />
- <arg value="-DpomFile=lwjgl_util.pom" />
- <arg value="-Dfile=lwjgl_util-sources.jar" />
- <arg value="-Dclassifier=sources" />
- <arg value="-Plwjglgpg" />
- </artifact:mvn>
-
- <artifact:mvn>
- <arg value="${mvncommand}" />
- <arg value="-Durl=${mavenrepo}" />
- <arg value="-DrepositoryId=${mavenrepoId}" />
- <arg value="-DpomFile=lwjgl_util.pom" />
- <arg value="-Dfile=lwjgl_util-javadoc.jar" />
- <arg value="-Dclassifier=javadoc" />
- <arg value="-Plwjglgpg" />
- </artifact:mvn>
-
- <!-- lwjgl_util_applet.jar -->
-
- <artifact:mvn>
- <arg value="${mvncommand}" />
- <arg value="-Durl=${mavenrepo}" />
- <arg value="-DrepositoryId=${mavenrepoId}" />
- <arg value="-DpomFile=lwjgl_util_applet.pom" />
- <arg value="-Dfile=lwjgl_util_applet.jar" />
- <arg value="-Plwjglgpg" />
- </artifact:mvn>
-
- <artifact:mvn>
- <arg value="${mvncommand}" />
- <arg value="-Durl=${mavenrepo}" />
- <arg value="-DrepositoryId=${mavenrepoId}" />
- <arg value="-DpomFile=lwjgl_util.pom" />
- <arg value="-Dfile=lwjgl_util_applet-sources.jar" />
- <arg value="-Dclassifier=sources" />
- <arg value="-Plwjglgpg" />
- </artifact:mvn>
-
- <artifact:mvn>
- <arg value="${mvncommand}" />
- <arg value="-Durl=${mavenrepo}" />
- <arg value="-DrepositoryId=${mavenrepoId}" />
- <arg value="-DpomFile=lwjgl_util.pom" />
- <arg value="-Dfile=lwjgl_util_applet-javadoc.jar" />
- <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
+
+</project>
Deleted: trunk/LWJGL/maven/jinput-platform.pom
===================================================================
--- trunk/LWJGL/maven/jinput-platform.pom 2011-09-07 21:28:01 UTC (rev 3636)
+++ trunk/LWJGL/maven/jinput-platform.pom 2011-09-08 21:35:54 UTC (rev 3637)
@@ -1,32 +0,0 @@
-<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>
Deleted: trunk/LWJGL/maven/jinput.pom
===================================================================
--- trunk/LWJGL/maven/jinput.pom 2011-09-07 21:28:01 UTC (rev 3636)
+++ trunk/LWJGL/maven/jinput.pom 2011-09-08 21:35:54 UTC (rev 3637)
@@ -1,52 +0,0 @@
-<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.pom
===================================================================
--- trunk/LWJGL/maven/lwjgl.pom 2011-09-07 21:28:01 UTC (rev 3636)
+++ trunk/LWJGL/maven/lwjgl.pom 2011-09-08 21:35:54 UTC (rev 3637)
@@ -22,7 +22,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>lwjgl-platform</artifactId>
<version>${project.version}</version>
- <classifier>natives-win</classifier>
+ <classifier>natives-windows</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -34,12 +34,12 @@
<groupId>${project.groupId}</groupId>
<artifactId>lwjgl-platform</artifactId>
<version>${project.version}</version>
- <classifier>natives-mac</classifier>
+ <classifier>natives-osx</classifier>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>net.java.jinput</groupId>
<artifactId>jinput</artifactId>
- <version>${project.version}</version>
+ <version>@JINPUTVERSION@</version>
</dependency>
</dependencies>
</project>
Modified: trunk/LWJGL/platform_build/build-maven.xml
===================================================================
--- trunk/LWJGL/platform_build/build-maven.xml 2011-09-07 21:28:01 UTC (rev 3636)
+++ trunk/LWJGL/platform_build/build-maven.xml 2011-09-08 21:35:54 UTC (rev 3637)
@@ -4,6 +4,7 @@
<property name="lwjgl.maven" location="maven" />
<property name="lwjgl.dstMaven" location="${lwjgl.temp}/maven" />
<property name="lwjgl.src.java" location="${lwjgl.src}/java" />
+ <property name="jinput.version" value="2.0.5" />
<fileset id="lwjgl-sources.manual.fileset" dir="${lwjgl.src.java}">
<patternset refid="lwjgl.package.pattern" />
@@ -36,6 +37,32 @@
]]>
</script>
</target>
+
+ <target name="-checkjinputversion">
+ <script language="javascript" classpath="${lwjgl.lib}/jinput.jar">
+ <![CDATA[
+ importPackage(java.lang);
+ var version = net.java.games.input.Version.getVersion()
+ project.setNewProperty("jinputversion",version);
+ var declaredJinputVersion = project.getProperty("jinput.version");
+ System.out.println("JINPUT Version: " + version + " - DeclaredVersion: " + declaredJinputVersion);
+
+ if(declaredJinputVersion.equals(version)){
+ System.out.println("JINPUT Version Matches");
+ project.setNewProperty("jinputversionmatches", true);
+ } else {
+ System.out.println("JINPUT Version don't match");
+ }
+ ]]>
+ </script>
+ <condition property="failjinputcheck">
+ <and>
+ <not><isset property="jinputversionmatches" /></not>
+ <not><isset property="overridejinput" /></not>
+ </and>
+ </condition>
+ <fail if="failjinputcheck" message="Jinput version in project is different from the declared jinput version for maven add -Doverridejinput=true as a command line option to avoid this check" />
+ </target>
<target name="maven-full">
<antcall target="clean-java" />
@@ -47,7 +74,7 @@
<antcall target="maven"/>
</target>
- <target name="maven" depends="-fixmavenversion"> <!-- Added as dependency because using antcall creates a new project scope -->
+ <target name="maven" depends="-fixmavenversion, -checkjinputversion"> <!-- Added as dependency because using antcall creates a new project scope -->
<delete dir="${lwjgl.dstMaven}" quiet="true" failonerror="false" taskname="cleaning maven dist" />
<mkdir dir="${lwjgl.dstMaven}" taskname="initialiazing temp maven folder" />
<antcall target="-copylwjgljars" />
@@ -56,9 +83,14 @@
<antcall target="-createmavennativejars" />
<antcall target="-copymavenpoms"/>
<antcall target="-copymavendeploybuild"/>
- <antcall target="-addjinput"/>
<antcall target="-copymaventdist"/>
</target>
+
+
+
+
+
+
<target name="-copylwjgljars">
@@ -127,7 +159,7 @@
</target>
<target name="-createmavennativejars">
- <jar destfile="${lwjgl.dstMaven}/lwjgl-platform-natives-win.jar" taskname="lwjgl-platform-natives-win.jar">
+ <jar destfile="${lwjgl.dstMaven}/lwjgl-platform-natives-windows.jar" taskname="lwjgl-platform-natives-windows.jar">
<fileset dir="${lwjgl.lib}/windows">
<patternset refid="lwjgl-windows-lwjgl.fileset"/>
</fileset>
@@ -137,7 +169,7 @@
<patternset refid="lwjgl-linux-lwjgl.fileset"/>
</fileset>
</jar>
- <jar destfile="${lwjgl.dstMaven}/lwjgl-platform-natives-mac.jar" taskname="lwjgl-platform-natives-mac.jar">
+ <jar destfile="${lwjgl.dstMaven}/lwjgl-platform-natives-osx.jar" taskname="lwjgl-platform-natives-osx.jar">
<fileset dir="${lwjgl.lib}/macosx">
<patternset refid="lwjgl-macosx-lwjgl.fileset"/>
</fileset>
@@ -151,6 +183,7 @@
</fileset>
<filterset>
<filter token="VERSION" value="${lwjgl-maven-version}"/>
+ <filter token="JINPUTVERSION" value="${jinput.version}"/>
</filterset>
</copy>
</target>
@@ -163,43 +196,6 @@
</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/**" />
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
