Author: jbeard
Date: Sat Aug 28 19:15:24 2010
New Revision: 990417
URL: http://svn.apache.org/viewvc?rev=990417&view=rev
Log:
Started breaking out ant target dependencies, and placing them in their proper
maven lifecycles.
Modified:
commons/sandbox/gsoc/2010/scxml-js/trunk/mvn-ant-build.xml
commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml
Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/mvn-ant-build.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/mvn-ant-build.xml?rev=990417&r1=990416&r2=990417&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/mvn-ant-build.xml (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/mvn-ant-build.xml Sat Aug 28
19:15:24 2010
@@ -856,7 +856,9 @@
</java>
</target>
- <target name="compile-single-class" depends="compile-single-js">
+ <!-- normally dependency would be set here, but to better integrate
with maven, it has been removed -->
+ <!-- TODO: break this out into a macro to allow better code reuse for
non-mave ant frontend -->
+ <target name="compile-single-class">
<mkdir dir="${build-class}"/>
<!-- TODO: set -opt -->
@@ -864,6 +866,8 @@
<classpath>
<path refid="rhino-classpath"/>
</classpath>
+ <arg value="-opt"/>
+ <arg value="9"/>
<arg value="-o"/>
<arg value="${build-class-main-name}.class"/>
<arg value="${build-js-main}"/>
@@ -871,7 +875,9 @@
<move file="${build-js}/${build-class-main-name}.class"
todir="${build-class}"/>
</target>
- <target name="jar-single-class" depends="compile-single-class">
+ <!-- normally dependency would be set here, but to better integrate
with maven, it has been removed -->
+ <!-- TODO: break this out into a macro to allow better code reuse for
non-mave ant frontend -->
+ <target name="jar-single-class">
<mkdir dir="${build-jar}"/>
<jar destfile="${build-jar-main}"
Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml?rev=990417&r1=990416&r2=990417&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml Sat Aug 28 19:15:24 2010
@@ -163,7 +163,44 @@
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
<executions>
+ <!-- TODO -->
+ <!--
<execution>
+ <phase>initialize</phase>
+ <configuration>
+ <tasks>
+ <property name="compile_classpath"
refid="maven.compile.classpath"/>
+ <property name="runtime_classpath"
refid="maven.runtime.classpath"/>
+ <property name="test_classpath" refid="maven.test.classpath"/>
+ <property name="plugin_classpath"
refid="maven.plugin.classpath"/>
+
+ <ant target="download-dependencies" inheritRefs="true"
antfile="mvn-ant-build.xml"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ -->
+ <execution>
+ <id>process-sources</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <tasks>
+ <property name="compile_classpath"
refid="maven.compile.classpath"/>
+ <property name="runtime_classpath"
refid="maven.runtime.classpath"/>
+ <property name="test_classpath" refid="maven.test.classpath"/>
+ <property name="plugin_classpath"
refid="maven.plugin.classpath"/>
+
+ <ant target="compile-single-js" inheritRefs="true"
antfile="mvn-ant-build.xml"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>compile</id>
<phase>compile</phase>
<configuration>
<tasks>
