diff options
| author | Reinier Zwitserloot <reinier@tipit.to> | 2009-11-27 12:10:10 +0100 |
|---|---|---|
| committer | Reinier Zwitserloot <reinier@tipit.to> | 2009-11-27 12:10:10 +0100 |
| commit | 44d6a6b6627c23ac66920ae6dc1d709f26de7e3f (patch) | |
| tree | 323796cc7d70aa4f65f26e5b8e512330636ba6e5 /buildScripts | |
| parent | 5ab3615b3d1bf14480c0626883c90145f6a72c63 (diff) | |
| download | lombok-44d6a6b6627c23ac66920ae6dc1d709f26de7e3f.tar.gz lombok-44d6a6b6627c23ac66920ae6dc1d709f26de7e3f.tar.bz2 lombok-44d6a6b6627c23ac66920ae6dc1d709f26de7e3f.zip | |
Solved the problem in the two-phase compile (some of lombok is JVM1.5, other bits are JVM1.6) being interdependent and causing implicit compilation warnings.
Also added source="1.x" to all ant file javac targets, as apparently this needs to be there when compiling with JDK7.
Diffstat (limited to 'buildScripts')
| -rw-r--r-- | buildScripts/compile.ant.xml | 10 | ||||
| -rw-r--r-- | buildScripts/website.ant.xml | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/buildScripts/compile.ant.xml b/buildScripts/compile.ant.xml index 043b67c0..7b48f759 100644 --- a/buildScripts/compile.ant.xml +++ b/buildScripts/compile.ant.xml @@ -108,21 +108,21 @@ lombok code including the various agents. javac 1.5, partly because they completely rewrote large swaths of javac, and partly because our injection mechanism (annotations) doesn't work very well on javac 1.5, hence, when using javac, we do demand you're on 1.6. --> - <javac debug="on" destdir="build/lombok" target="1.5"> + <echo>s1</echo> + <javac debug="on" destdir="build/lombok" target="1.5" source="1.5"> <src path="src/core" /> <src path="src/installer" /> <src path="src/eclipseAgent" /> - <src path="src/delombok" /> <exclude name="lombok/javac/**" /> <classpath refid="deps.path" /> <classpath refid="libs.path" /> </javac> - <javac debug="on" destdir="build/lombok" target="1.6"> + <echo>s2</echo> + <javac debug="on" destdir="build/lombok" target="1.6" source="1.6"> <src path="src/core" /> - <src path="src/installer" /> - <src path="src/eclipseAgent" /> <src path="src/delombok" /> <include name="lombok/javac/**" /> + <classpath location="build/lombok" /> <classpath refid="deps.path" /> <classpath refid="libs.path" /> </javac> diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml index 30d0b29b..50781988 100644 --- a/buildScripts/website.ant.xml +++ b/buildScripts/website.ant.xml @@ -68,7 +68,7 @@ such as converting the changelog into HTML, and creating javadoc. <src path="buildScripts/src" /> <include name="lombok/website/WebUpToDate.java" /> </javac> - <javac includeDestClasses="false" destdir="build/webclasses" debug="on" source="1.5"> + <javac includeDestClasses="false" destdir="build/webclasses" debug="on" source="1.5" target="1.5"> <classpath refid="buildScripts.deps.path" /> <src path="buildScripts/src" /> <include name="lombok/website/CompileChangelog.java" /> |