Velocity: use VelocityEngine rather than Velocity singleton (issue #244) + Maven cleanup + fixed compilation of JavaCL Generator

ochafik · ochafik · commit 86a9b36e1900 · 2012-01-20T11:39:21.000Z
diff --git a/Demos/pom.xml b/Demos/pom.xml
@@ -39,7 +39,6 @@
 			<artifactId>javacl-generator-jna</artifactId>
 			<executions>
 			  <execution>
-				<phase>generate-sources</phase>
 				<goals>
 				  <goal>compile</goal>
 				  <!--goal>test-compile</goal-->
diff --git a/Generator/src/main/java/com/nativelibs4java/opencl/generator/JavaCLGeneratorMojo.java b/Generator/src/main/java/com/nativelibs4java/opencl/generator/JavaCLGeneratorMojo.java
@@ -24,6 +24,7 @@
 /**
  * Launch JNAerator to wrap native libraries in Java for use with JNA.
  * @goal compile
+ * @phase generate-sources
  * @execute phase=generate-sources
  * @description Launches JNAerator with the command-line arguments contained in src/main/jnaerator/config.jnaerator. To launch from command line, use "mvn com.jnaerator:maven-jnaerator:jnaerate"
  */
diff --git a/JavaCL/pom.xml b/JavaCL/pom.xml
@@ -51,7 +51,6 @@ For more info, please visit http://code.google.com/p/nativelibs4java/wiki/OpenCL
 			<artifactId>javacl-generator-jna</artifactId>
 			<executions>
 			  <execution>
-				<phase>generate-sources</phase>
 				<goals>
 				  <goal>compile</goal>
 				  <!--goal>test-compile</goal-->
diff --git a/JavaCLTutorial/pom.xml b/JavaCLTutorial/pom.xml
@@ -38,7 +38,6 @@
 				<artifactId>javacl-generator-jna</artifactId>
 				<executions>
 					<execution>
-						<phase>generate-sources</phase>
 						<goals>
 							<goal>compile</goal>
 						</goals>
diff --git a/NumericalBenchmark/pom.xml b/NumericalBenchmark/pom.xml
@@ -40,7 +40,6 @@
 				<version>1.0-SNAPSHOT</version>
 				<executions>
 					<execution>
-						<phase>generate-sources</phase>
 						<goals>
 							<goal>compile</goal>
 						</goals>
diff --git a/OpenGLDemos/pom.xml b/OpenGLDemos/pom.xml
@@ -38,7 +38,6 @@
 			<artifactId>javacl-generator-jna</artifactId>
 			<executions>
 			  <execution>
-				<phase>generate-sources</phase>
 				<goals>
 				  <goal>compile</goal>
 				  <!--goal>test-compile</goal-->
diff --git a/pom.xml b/pom.xml
@@ -104,10 +104,9 @@
 					<version>${project.version}</version>
 					<executions>
 						<execution>
-							<phase>generate-sources</phase>
 							<goals>
 								<goal>compile</goal>
-						  <!--goal>test-compile</goal-->
+								<!--goal>test-compile</goal-->
 							</goals>
 						</execution>
 					</executions>
