maven 2 work
This commit is contained in:
1 parent
f4ab9f48c6
commit
8292f027a9
127 files changed
+4995
-383
No files matched your search
@@ -0,0 +1,65 @@
|
||||
diff --git a/build.xml b/build.xml
|
||||
index 03016cb..852b05b 100755
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -42,11 +42,9 @@
|
||||
<property name="support.root" location="../../Support"/>
|
||||
|
||||
<!-- Java compilation setup -->
|
||||
- <property name="javac.compiler" value="jikes"/>
|
||||
<property name="javac.debug" value="on"/>
|
||||
<property name="javac.optimize" value="off" />
|
||||
<property name="javac.deprecation" value="on" />
|
||||
- <property name="build.compiler" value="${javac.compiler}"/>
|
||||
|
||||
<!-- Third party tools configurations -->
|
||||
<property name="javacc.jar" location="${workarea.lib}/JavaCC.zip"/>
|
||||
@@ -335,18 +333,18 @@
|
||||
</target>
|
||||
|
||||
<target name="parser" unless="parser.build.notRequired">
|
||||
- <java classname="COM.sun.labs.jjtree.Main" classpath="${javacc.jar}" fork="true">
|
||||
+ <java classname="org.javacc.jjtree.Main" classpath="cp" fork="true">
|
||||
<arg value="-OUTPUT_DIRECTORY=${output.classes}/ognl"/>
|
||||
<arg value="${project.src.java}/ognl/ognl.jjt"/>
|
||||
</java>
|
||||
- <java classname="COM.sun.labs.javacc.Main" classpath="${javacc.jar}" fork="true">
|
||||
- <arg value="-OUTPUT_DIRECTORY=${output.classes}/ognl"/>
|
||||
- <arg value="${output.classes}/ognl/ognl.jj"/>
|
||||
+ <java classname="org.javacc.parser.Main" classpath="cp" fork="true">
|
||||
+ <arg value="-OUTPUT_DIRECTORY=${output.classes}/ognl"/>
|
||||
+ <arg value="${output.classes}/ognl/ognl.jj"/>
|
||||
</java>
|
||||
</target>
|
||||
|
||||
<target name="compile" unless="source.build.notRequired">
|
||||
- <javac destdir="${output.classes}" optimize="${javac.optimize}" debug="${javac.debug}" deprecation="${javac.deprecation}" classpath="${output.classes}">
|
||||
+ <javac destdir="${output.classes}" optimize="${javac.optimize}" debug="${javac.debug}" deprecation="${javac.deprecation}" classpath="${output.classes}" source="1.4">
|
||||
<classpath refid="compile.class.path"/>
|
||||
<src path="${project.src.java}/ognl"/>
|
||||
<src path="${output.classes}"/>
|
||||
@@ -354,7 +352,7 @@
|
||||
</target>
|
||||
|
||||
<target name="test" depends="jar">
|
||||
- <javac destdir="${output.classes}" optimize="${javac.optimize}" debug="${javac.debug}" deprecation="${javac.deprecation}" classpath="${output.classes}">
|
||||
+ <javac destdir="${output.classes}" optimize="${javac.optimize}" debug="${javac.debug}" deprecation="${javac.deprecation}" classpath="${output.classes}" source="1.4">
|
||||
<src path="${project.root}/test/java"/>
|
||||
</javac>
|
||||
<java classname="ognl.test.Test" fork="true">
|
||||
@@ -367,7 +365,7 @@
|
||||
</target>
|
||||
|
||||
<target name="test2" depends="jar">
|
||||
- <javac destdir="${output.classes}" optimize="${javac.optimize}" debug="${javac.debug}" deprecation="${javac.deprecation}" classpath="${output.classes}">
|
||||
+ <javac destdir="${output.classes}" optimize="${javac.optimize}" debug="${javac.debug}" deprecation="${javac.deprecation}" classpath="${output.classes}" source="1.4">
|
||||
<src path="${project.root}/test/java"/>
|
||||
</javac>
|
||||
<java classname="ognl.test.Test2" fork="true">
|
||||
@@ -379,4 +377,4 @@
|
||||
</java>
|
||||
</target>
|
||||
|
||||
-</project>
|
||||
\ No newline at end of file
|
||||
+</project>
|
||||
Reference in new issue
Block a user