[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3647] trunk/LWJGL/platform_build/build-maven.xml

[<ma...@us...>]

Revision: 3647
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3647&view=rev
Author:   matzon
Date:     2011-10-03 20:17:30 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
applying ruben01s latest maven patch

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-maven.xml

Modified: trunk/LWJGL/platform_build/build-maven.xml
===================================================================
--- trunk/LWJGL/platform_build/build-maven.xml	2011-10-03 20:04:49 UTC (rev 3646)
+++ trunk/LWJGL/platform_build/build-maven.xml	2011-10-03 20:17:30 UTC (rev 3647)
@@ -32,6 +32,14 @@
 					System.out.println("Fixing LWJGL Maven version (Maven version should be x.y.z)");
 					mavenVersion = originalVersion + ".0";
 				}
+				if(!mavenVersion.match(/^.*-SNAPSHOT$/)){
+					var forceSnapshot = project.getProperty("snapshot")
+					if(forceSnapshot!="false"){
+						System.out.println("Forcing Maven Version to Snapshot");
+						mavenVersion = mavenVersion + "-SNAPSHOT";
+					}
+			    }
+			
 				project.setNewProperty("lwjgl-maven-version",mavenVersion);
 				System.out.println("LWJGL Maven Version: " + project.getProperty("lwjgl-maven-version"));
 			]]>
@@ -60,9 +68,9 @@
 					<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>
+			</condition>		
+			<fail  if="failjinputcheck" message="Jinput version in project (${jinputversion}) is different from the declared jinput version for maven (${jinput.version}) add -Doverridejinput=true as a command line option to avoid this check" />	
+	</target>
 
 	<target name="maven-full">
 		<antcall target="clean-java" />

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.