From 0d4d0e8bd53faedf01502a4f9865507648a02117 Mon Sep 17 00:00:00 2001
From: Ian Wolfcat Atha <ian@atha.io>
Date: Wed, 12 Jan 2011 12:57:25 -0800
Subject: [PATCH 1/2] Support for Maven, equivalence of building tools.

pom.xml is a Maven module for kilim (named kilim:kilim:0.7.2-SNAPSHOT).
It currently compiles identically to the "build.sh" script, as reported
by the "build-equiv.sh" script. No gurantees about the execution of the
unit tests are made.

build-equiv.sh compares the binary results of the three build tools
supported in kilim, right now: Maven, Ant, Shell Script.

In terms of the results of the binary comparison, right now:
Maven == ShellScript != Ant
---
 build-equiv.sh |  20 +++++++
 pom.xml        | 160 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 180 insertions(+)
 create mode 100755 build-equiv.sh
 create mode 100644 pom.xml

diff --git a/build-equiv.sh b/build-equiv.sh
new file mode 100755
index 0000000..019ab21
--- /dev/null
+++ b/build-equiv.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+echo Cleaning
+rm -rf testclasses-* classes-* testclasses classes
+echo Build via Ant
+ant clean compile
+mv classes classes-ant
+mv testclasses testclasses-ant
+echo Build via shell script
+./build.sh
+mv classes classes-sh
+mv testclasses testclasses-sh
+echo Build via Maven
+mvn install
+mv classes classes-mvn
+mv testclasses testclasses-mvn
+echo Comparing
+diff -aqr classes-mvn/ classes-sh/ && echo success
+diff -aqr testclasses-mvn/ testclasses-sh/ && echo success
+diff -aqr classes-ant/ classes-sh/ && echo success
+diff -aqr testclasses-ant/ testclasses-sh/ && echo success
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..fe752ba
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>kilim</groupId>
+	<artifactId>kilim</artifactId>
+	<version>0.7.2</version>
+	<packaging>jar</packaging>
+
+	<properties>
+		<jdk.version>1.6</jdk.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>asm</groupId>
+			<artifactId>asm-all</artifactId>
+			<version>2.2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.2</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<sourceDirectory>src/</sourceDirectory>
+		<testSourceDirectory>test/</testSourceDirectory>
+		<outputDirectory>classes/</outputDirectory>
+		<testOutputDirectory>classes/</testOutputDirectory>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>add-source</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>add-source</goal>
+						</goals>
+						<configuration>
+							<sources>
+								<source>${basedir}/bench</source>
+								<source>${basedir}/examples</source>
+								<source>${basedir}/bench</source>
+							</sources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<version>2.4.1</version>
+				<executions>
+					<execution>
+						<id>auto-clean</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>clean</goal>
+						</goals>
+					</execution>
+				</executions>
+				<!--<configuration> <filesets> <fileset> <directory>.</directory> <includes> 
+					<include>${project.build.outputDirectory}</include> <include>${project.build.testOutputDirectory}</include> 
+					</includes> </fileset> </filesets> </configuration> -->
+			</plugin><!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> 
+				<executions> <execution> <id>attach-javadocs</id> <goals> <goal>jar</goal> 
+				</goals> </execution> </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> 
+				<artifactId>maven-source-plugin</artifactId> <executions> <execution> <id>attach-sources</id> 
+				<goals> <goal>jar</goal> </goals> </execution> </executions> </plugin> -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<debug>true</debug>
+					<source>${jdk.version}</source>
+					<target>${jdk.version}</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<!-- java -ea kilim.tools.Asm -d ./classes `find . -name "*.j"` -->
+						<id>kilim-asm</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+							<executable>java</executable>
+							<arguments>
+								<argument>-classpath</argument>
+								<classpath />
+								<argument>-ea</argument>
+								<argument>kilim.tools.Asm</argument>
+								<argument>-d</argument>
+								<argument>${project.build.outputDirectory}</argument>
+								<argument>${project.build.testSourceDirectory}/kilim/test/ex/ExJSR.j</argument>
+								<argument>${project.build.testSourceDirectory}/kilim/test/ex/ExYieldSub.j</argument>
+							</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<!-- java -ea kilim.tools.Weaver -d ./classes -x "ExInvalid|test" ./classes -->
+						<id>kilim-weave-main</id>
+						<phase>process-test-classes</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+							<executable>java</executable>
+							<classpathScope>test</classpathScope>
+							<arguments>
+								<argument>-classpath</argument>
+								<classpath />
+								<argument>-ea</argument>
+								<argument>kilim.tools.Weaver</argument>
+								<argument>-d</argument>
+								<argument>${project.build.outputDirectory}</argument>
+								<argument>-x</argument>
+								<argument>ExInvalid|test</argument>
+								<argument>${project.build.outputDirectory}</argument>
+							</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<!-- java -ea kilim.tools.Weaver -d ./testclasses -x "ExInvalid" ./classes -->
+						<id>kilim-weave-test</id>
+						<phase>process-test-classes</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+							<executable>java</executable>
+							<classpathScope>test</classpathScope>
+							<arguments>
+								<argument>-classpath</argument>
+								<classpath />
+								<argument>-ea</argument>
+								<argument>kilim.tools.Weaver</argument>
+								<argument>-d</argument>
+								<argument>${basedir}/testclasses</argument>
+								<argument>-x</argument>
+								<argument>ExInvalid</argument>
+								<argument>${project.build.OutputDirectory}</argument>
+							</arguments>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

From f1450df47a3eab43d4b40ac0c0c00de1152f0297 Mon Sep 17 00:00:00 2001
From: Ian Wolfcat Atha <ian@atha.io>
Date: Wed, 12 Jan 2011 13:51:51 -0800
Subject: [PATCH 2/2] The maven "test" goal now runs the two TestSuites test.sh
 runs.

---
 .gitignore |  3 +++
 pom.xml    | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/.gitignore b/.gitignore
index 59ba545..21b6e63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+target/**
+classes-*/**
+testclasses-*/**
 classes/**/*
 testclasses/**/*
 .DS_Store
diff --git a/pom.xml b/pom.xml
index fe752ba..e0a96c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,6 +155,48 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.7.1</version>
+				<executions>
+					<execution>
+						<id>default-test</id>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</execution>
+					<execution>
+						<id>test-weaver</id>
+						<phase>test</phase>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<includes>
+								<include>kilim/test/AllNotWoven.java</include>
+							</includes>
+						</configuration>
+					</execution>
+					<execution>
+						<id>test-api</id>
+						<phase>test</phase>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<testClassesDirectory>${basedir}/testclasses</testClassesDirectory>
+							<classpathDependencyScopeExclude>runtime</classpathDependencyScopeExclude>
+							<systemPropertyVariables>
+								<kilim.Scheduler.numThreads>10</kilim.Scheduler.numThreads>
+							</systemPropertyVariables>
+							<includes>
+								<include>kilim/test/AllWoven.java</include>
+							</includes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>