AfflictionNetworks/depot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Meh, I was wrong in r841. Because the target version is 1.6, anything that tries to build against

Browse Source 
depot with a 1.5 compiler is going to blow up with a mismatched version. Go back to 1.5 in build.xml
and pom.xml, but leave Eclipse using a 1.6 JVM. This means if anyone regenerates the m2eclipse
configuration, this will break in Eclipse again. Lame.
This commit is contained in:
Charlie Groves
2011-03-23 22:09:29 +00:00
parent 7129295906
commit 8d56a93538
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+8 -4
View File
@@ -28,10 +28,12 @@
<taskdef name="grecord" classname="com.samskivert.depot.tools.GenRecordTask"
classpathref="built.path"/>
<!-- make sure the record class files are all compiled -->
<ooojavac destdir="${classes.dir}" classpathref="pom.xml.path" srcdir="${src.dir}">
<ooojavac destdir="${classes.dir}" classpathref="pom.xml.path" srcdir="${src.dir}"
version="1.5">
<include name="**/*Record.java"/>
</ooojavac>
<ooojavac destdir="${tclasses.dir}" classpathref="pom.xml.path" srcdir="${test.dir}">
<ooojavac destdir="${tclasses.dir}" classpathref="pom.xml.path" srcdir="${test.dir}"
version="1.5">
<include name="**/*Record.java"/>
</ooojavac>
<!-- now update the source files -->
@@ -57,10 +59,12 @@
<copy todir="${classes.dir}">
<fileset dir="src/main/resources" includes="**/*.tmpl"/>
</copy>
<ooojavac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="pom.xml.path"/>
<ooojavac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="pom.xml.path"
version="1.5"/>
<mkdir dir="${tclasses.dir}"/>
<ooojavac srcdir="${test.dir}" destdir="${tclasses.dir}" classpathref="built.path"/>
<ooojavac srcdir="${test.dir}" destdir="${tclasses.dir}" classpathref="built.path"
version="1.5"/>
</target>
<target name="javadoc" depends="-prepare" description="Generates javadoc documentation.">