JavaCL: split JavaCL Generator in two projects : javacl-generator (command-line + lib) & maven-javacl-plugin

ochafik · ochafik · commit 72ec09568262 · 2011-11-10T15:14:24.000Z
diff --git a/Blas/pom.xml b/Blas/pom.xml
@@ -40,7 +40,7 @@
 	
 		<plugin>
 			<groupId>com.nativelibs4java</groupId>
-			<artifactId>javacl-generator</artifactId>
+			<artifactId>maven-javacl-plugin</artifactId>
 			<version>${opencl4java.version}</version>
 			
 			<!--configuration>
diff --git a/Demos/pom.xml b/Demos/pom.xml
@@ -45,7 +45,7 @@
 
 		<plugin>
 			<groupId>com.nativelibs4java</groupId>
-			<artifactId>javacl-generator</artifactId>
+			<artifactId>maven-javacl-plugin</artifactId>
 			<version>${opencl4java.version}</version>
 			
 			<!--configuration>
diff --git a/Generator/javacl-generator-bridj.iml b/Generator/javacl-generator-bridj.iml
diff --git a/Generator/javacl-generator.iml b/Generator/javacl-generator.iml
diff --git a/Generator/pom.xml b/Generator/pom.xml
@@ -7,8 +7,7 @@
   <name>JavaCL OpenCL Wrapper Code Generator / BridJ</name>
   <url>http://code.google.com/p/javacl/</url>
   <version>1.0-SNAPSHOT</version>
-  <packaging>maven-plugin</packaging>
-  <!--packaging>jar</packaging-->
+  <packaging>jar</packaging>
   
   <parent>
 	  <groupId>com.nativelibs4java</groupId>
@@ -33,19 +32,6 @@
 	  <version>${opencl4java.version}</version>
 	  <scope>compile</scope>
 	</dependency>
-	
-	<dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>3.0.3</version>
-    </dependency>
-	
-	<dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>3.0-alpha-2</version>
-    </dependency>
-    
   </dependencies>
   
 </project>
diff --git a/JavaCL/pom.xml b/JavaCL/pom.xml
@@ -50,7 +50,7 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
 
 		<plugin>
 			<groupId>com.nativelibs4java</groupId>
-			<artifactId>javacl-generator</artifactId>
+			<artifactId>maven-javacl-plugin</artifactId>
 			<version>${opencl4java.version}</version>
 			
 			<!--configuration>
diff --git a/MavenPlugin/.gitignore b/MavenPlugin/.gitignore
@@ -0,0 +1,4 @@
+target
+project/boot
+project/target
+*~
diff --git a/MavenPlugin/pom.xml b/MavenPlugin/pom.xml
@@ -0,0 +1,45 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+  <groupId>com.nativelibs4java</groupId>
+  <artifactId>maven-javacl-plugin</artifactId>
+  <name>Maven JavaCL Plugin (OpenCL Wrapper Code Generator)</name>
+  <url>http://code.google.com/p/javacl/</url>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>maven-plugin</packaging>
+  <!--packaging>jar</packaging-->
+  
+  <parent>
+	  <groupId>com.nativelibs4java</groupId>
+	  <artifactId>opencl4java-parent</artifactId>
+	  <version>1.0-SNAPSHOT</version>
+	  <relativePath>../Parent</relativePath>
+  </parent>
+
+  <dependencies>
+  
+	<dependency>
+	  <groupId>com.nativelibs4java</groupId>
+	  <artifactId>javacl-generator</artifactId>
+	  <version>${opencl4java.version}</version>
+	  <scope>compile</scope>
+	</dependency>
+	
+	<dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>3.0.3</version>
+    </dependency>
+	
+	<dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <version>3.0-alpha-2</version>
+    </dependency>
+    
+  </dependencies>
+  
+</project>
+
+
diff --git a/MavenPlugin/src/main/java/com/nativelibs4java/opencl/generator/JavaCLGeneratorMojo.java b/MavenPlugin/src/main/java/com/nativelibs4java/opencl/generator/JavaCLGeneratorMojo.java
diff --git a/NumericalBenchmark/pom.xml b/NumericalBenchmark/pom.xml
@@ -44,7 +44,7 @@
   	<plugins>
 		<plugin>
 			<groupId>com.nativelibs4java</groupId>
-			<artifactId>javacl-generator</artifactId>
+			<artifactId>maven-javacl-plugin</artifactId>
 			<version>1.0-SNAPSHOT</version>
 			<!--configuration>
 				<javaOutputDirectory>${project.build.directory}/../src/main/java</javaOutputDirectory>
diff --git a/OpenGLDemos/pom.xml b/OpenGLDemos/pom.xml
@@ -37,7 +37,7 @@
 
 		<plugin>
 			<groupId>com.nativelibs4java</groupId>
-			<artifactId>javacl-generator</artifactId>
+			<artifactId>maven-javacl-plugin</artifactId>
 			<version>${opencl4java.version}</version>
 			
 			<!--configuration>
diff --git a/Tutorials/DFT/pom.xml b/Tutorials/DFT/pom.xml
@@ -50,7 +50,7 @@
   	<plugins>
 		<plugin>
 			<groupId>com.nativelibs4java</groupId>
-			<artifactId>javacl-generator</artifactId>
+			<artifactId>maven-javacl-plugin</artifactId>
 			<version>1.0-SNAPSHOT</version>
 			<!--configuration>
 				<javaOutputDirectory>${project.build.directory}/../src/main/java</javaOutputDirectory>
diff --git a/Tutorials/Simple/src/main/resources/archetype-resources/pom.xml b/Tutorials/Simple/src/main/resources/archetype-resources/pom.xml
@@ -41,7 +41,7 @@
         - parse them and generate corresponding JavaCL program wrappers, with one typed method per kernel, in target/generated-sources (in a package that matches the initial .cl file's path)
         -->
         <groupId>com.nativelibs4java</groupId>
-        <artifactId>javacl-generator</artifactId>
+        <artifactId>maven-javacl-plugin</artifactId>
         <version>1.0-SNAPSHOT</version>
         <executions>
         <execution>
diff --git a/pom.xml b/pom.xml
@@ -19,6 +19,7 @@
     <module>LibCL</module>
     <module>InteractiveImageDemo</module>
     <module>Generator</module>
+    <module>MavenPlugin</module>
     <module>OpenCL4Java</module>
     <module>Demos</module>
     <module>JavaCL</module>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +target
 +project/boot
 +project/target
 +*~