Sepearate the natives out.

git-svn-id: file:///home/sven/projects/JOGL/git-svn/svn-server-sync/jinput/trunk@241 e343933a-64c8-49c5-92b1-88f2ce3e89e8

3 files changed, 96 insertions, 40 deletions

diff --git a/build.xml b/build.xml
index ef4eb61..7b7ce3f 100644
--- a/build.xml
+++ b/build.xml
@@ -2,7 +2,7 @@
 
 <project name="Sun Games Initiative Client Technologies" basedir="." default="all" xmlns:artifact="urn:maven-artifact-ant">
 	
-	<property name="mvn.version" value="2.0.3"/>
+	<property name="mvn.version" value="2.0.4-SNAPSHOT"/>
 	<property name="maven-repository-url" value="https://oss.sonatype.org/service/local/staging/deploy/maven2/" />
 	<property name="maven-repository-id" value="sonatype-nexus-staging" />
 	
@@ -250,39 +250,43 @@
 
 		<filter token="VERSION" value="${mvn.version}"/>		
 		<copy tofile="dist/jinput-${mvn.version}.pom" filtering="true">
-			<fileset file="pom.xml"/>
+			<fileset file="jinput.pom"/>
+		</copy>
+		<copy tofile="dist/jinput-${mvn.version}-platform.pom" filtering="true">
+			<fileset file="jinput-platform.pom"/>
 		</copy>
 		
 		<artifact:pom id="jinputpomfile" file="dist/jinput-${mvn.version}.pom" />
+		<artifact:pom id="jinputplatformpomfile" file="dist/jinput-${mvn.version}-platform.pom" />
 
-		<delete file="dist/jinput-${mvn.version}-natives-windows.zip" />
-		<zip destfile="dist/jinput-${mvn.version}-natives-windows.zip">
+		<delete file="dist/jinput-natives-windows.zip" />
+		<zip destfile="dist/jinput-natives-windows.zip">
 			<fileset dir="dist/">
 				<include name="**/*.dll"/>
 			</fileset>
 		</zip>
 
-		<delete file="dist/jinput-${mvn.version}-natives-linux.zip"/>
-		<zip destfile="dist/jinput-${mvn.version}-natives-linux.zip">
+		<delete file="dist/jinput-natives-linux.zip"/>
+		<zip destfile="dist/jinput-natives-linux.zip">
 			<fileset dir="dist/">
 				<include name="**/*.so"/>
 			</fileset>
 		</zip>
 
-		<delete file="dist/jinput-${mvn.version}-natives-osx.zip"/>
-		<zip destfile="dist/jinput-${mvn.version}-natives-osx.zip" >
+		<delete file="dist/jinput-natives-osx.zip"/>
+		<zip destfile="dist/jinput-natives-osx.zip" >
 			<fileset dir="dist/">
 				<include name="**/*.jnilib"/>
 			</fileset>
 		</zip>
 
-		<delete file="dist/jinput-${mvn.version}-javadoc.zip"/>
-		<zip destfile="dist/jinput-${mvn.version}-javadoc.zip">
+		<delete file="dist/jinput-javadoc.zip"/>
+		<zip destfile="dist/jinput-javadoc.zip">
 			<fileset dir="coreAPI/apidocs/"/>
 		</zip>
 
-		<delete file="dist/jinput-${mvn.version}-sources.zip"/>
-		<zip destfile="dist/jinput-${mvn.version}-sources.zip">
+		<delete file="dist/jinput-sources.zip"/>
+		<zip destfile="dist/jinput-sources.zip">
 			<fileset dir=".">
 				<include name="**/*.java"/>
 				<include name="**/*.h"/>
@@ -298,11 +302,15 @@
 
 		<artifact:install file="dist/jinput-${mvn.version}.jar">
 			<pom refid="jinputpomfile" />
-			<attach file="dist/jinput-${mvn.version}-natives-windows.zip" classifier="natives-windows" type="zip"/>
-			<attach file="dist/jinput-${mvn.version}-natives-linux.zip" classifier="natives-linux" type="zip"/>
-			<attach file="dist/jinput-${mvn.version}-natives-osx.zip" classifier="natives-osx" type="zip"/>
-			<attach file="dist/jinput-${mvn.version}-javadoc.zip" classifier="javadoc" type="zip"/>
-			<attach file="dist/jinput-${mvn.version}-sources.zip" classifier="sources" type="zip"/>
+			<attach file="dist/jinput-javadoc.zip" classifier="javadoc" type="jar"/>
+			<attach file="dist/jinput-sources.zip" classifier="sources" type="jar"/>
+		</artifact:install>
+		
+		<artifact:install file="dist/jinput=${mvn.version}-platform.pom">
+			<pom refid="jinputplatformpomfile" />
+			<attach file="dist/jinput-natives-windows.zip" classifier="natives-windows" type="jar"/>
+			<attach file="dist/jinput-natives-linux.zip" classifier="natives-linux" type="jar"/>
+			<attach file="dist/jinput-natives-osx.zip" classifier="natives-osx" type="jar"/>
 		</artifact:install>		
 	</target>
 
@@ -320,8 +328,8 @@
 			<arg value="-Durl=${maven-repository-url}" />
 			<arg value="-DrepositoryId=${maven-repository-id}" />
 			<arg value="-DpomFile=dist/jinput-${mvn.version}.pom" />
-			<arg value="-Dfile=dist/jinput-${mvn.version}-natives-windows.zip" />
-			<arg value="-Dclassifier=natives-windows" />
+			<arg value="-Dfile=dist/jinput-javadoc.zip" />
+			<arg value="-Dclassifier=javadoc" />
 			<arg value="-Pgpg" />
 		</artifact:mvn>
 		<artifact:mvn>
@@ -329,35 +337,35 @@
 			<arg value="-Durl=${maven-repository-url}" />
 			<arg value="-DrepositoryId=${maven-repository-id}" />
 			<arg value="-DpomFile=dist/jinput-${mvn.version}.pom" />
-			<arg value="-Dfile=dist/jinput-${mvn.version}-natives-linux.zip" />
-			<arg value="-Dclassifier=natives-linux" />
+			<arg value="-Dfile=dist/jinput-sources.zip" />
+			<arg value="-Dclassifier=sources" />
 			<arg value="-Pgpg" />
 		</artifact:mvn>
 		<artifact:mvn>
 			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
 			<arg value="-Durl=${maven-repository-url}" />
 			<arg value="-DrepositoryId=${maven-repository-id}" />
-			<arg value="-DpomFile=dist/jinput-${mvn.version}.pom" />
-			<arg value="-Dfile=dist/jinput-${mvn.version}-natives-osx.zip" />
-			<arg value="-Dclassifier=natives-osx" />
+			<arg value="-DpomFile=dist/jinput-${mvn.version}-natives.pom" />
+			<arg value="-Dfile=dist/jinput-natives-windows.zip" />
+			<arg value="-Dclassifier=natives-windows" />
 			<arg value="-Pgpg" />
 		</artifact:mvn>
 		<artifact:mvn>
 			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
 			<arg value="-Durl=${maven-repository-url}" />
 			<arg value="-DrepositoryId=${maven-repository-id}" />
-			<arg value="-DpomFile=dist/jinput-${mvn.version}.pom" />
-			<arg value="-Dfile=dist/jinput-${mvn.version}-javadoc.zip" />
-			<arg value="-Dclassifier=javadoc" />
+			<arg value="-DpomFile=dist/jinput-${mvn.version}-natives.pom" />
+			<arg value="-Dfile=dist/jinput-natives-linux.zip" />
+			<arg value="-Dclassifier=natives-linux" />
 			<arg value="-Pgpg" />
 		</artifact:mvn>
 		<artifact:mvn>
 			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
 			<arg value="-Durl=${maven-repository-url}" />
 			<arg value="-DrepositoryId=${maven-repository-id}" />
-			<arg value="-DpomFile=dist/jinput-${mvn.version}.pom" />
-			<arg value="-Dfile=dist/jinput-${mvn.version}-sources.zip" />
-			<arg value="-Dclassifier=sources" />
+			<arg value="-DpomFile=dist/jinput-${mvn.version}-natives.pom" />
+			<arg value="-Dfile=dist/jinput-natives-osx.zip" />
+			<arg value="-Dclassifier=natives-osx" />
 			<arg value="-Pgpg" />
 		</artifact:mvn>
 	</target>
diff --git a/pom.xml b/jinput-platform.pom
index be2fa86..e7e3401 100644
--- a/pom.xml
+++ b/jinput-platform.pom
@@ -1,9 +1,9 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 	<modelVersion>4.0.0</modelVersion>

 	<groupId>net.java.jinput</groupId>

-	<artifactId>jinput</artifactId>

-	<packaging>jar</packaging>

-	<name>JInput</name>

+	<artifactId>jinput-platform</artifactId>

+	<packaging>pom</packaging>

+	<name>JInput natives</name>

 	<version>@VERSION@</version>

 	<description>Library for access to input devices.</description>

 	<url>http://java.net/projects/jinput</url>

@@ -24,11 +24,4 @@
 		<url>http://java.net/projects/jinput/sources/svn/show</url>

 		<connection>https://svn.java.net/svn/jinput~svn </connection>

 	</scm>

-	<dependencies>

-		<dependency>

-			<groupId>net.java.jutils</groupId>

-			<artifactId>jutils</artifactId>

-			<version>1.0.0</version>

-		</dependency>

-	</dependencies>

 </project>
\ No newline at end of file
diff --git a/jinput.pom b/jinput.pom
new file mode 100644
index 0000000..b503730
--- /dev/null
+++ b/jinput.pom
@@ -0,0 +1,55 @@
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

+	<modelVersion>4.0.0</modelVersion>

+	<groupId>net.java.jinput</groupId>

+	<artifactId>jinput</artifactId>

+	<packaging>jar</packaging>

+	<name>JInput</name>

+	<version>@VERSION@</version>

+	<description>Library for access to input devices.</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>net.java.jutils</groupId>

+			<artifactId>jutils</artifactId>

+			<version>1.0.0</version>

+		</dependency>

+		<dependency>

+			<groupId>net.java.jinput</groupId>

+			<artifactId>jinput-platform</artifactId>

+			<version>@VERSION@</version>

+			<classifier>natives-linux</classifier>

+			<scope>runtime</scope>

+		</dependency>

+		<dependency>

+			<groupId>net.java.jinput</groupId>

+			<artifactId>jinput-platform</artifactId>

+			<version>@VERSION@</version>

+			<classifier>natives-windows</classifier>

+			<scope>runtime</scope>

+		</dependency>

+		<dependency>

+			<groupId>net.java.jinput</groupId>

+			<artifactId>jinput-platform</artifactId>

+			<version>@VERSION@</version>

+			<classifier>natives-osx</classifier>

+			<scope>runtime</scope>

+		</dependency>

+	</dependencies>

+</project>
\ No newline at end of file