diff options
Diffstat (limited to 'buildScripts')
| -rw-r--r-- | buildScripts/compile.ant.xml | 18 | ||||
| -rw-r--r-- | buildScripts/create-eclipse-project.ant.xml | 2 | ||||
| -rw-r--r-- | buildScripts/setup.ant.xml | 10 | ||||
| -rw-r--r-- | buildScripts/tests.ant.xml | 6 |
4 files changed, 19 insertions, 17 deletions
diff --git a/buildScripts/compile.ant.xml b/buildScripts/compile.ant.xml index 0bcc55bb..f0c0ef7e 100644 --- a/buildScripts/compile.ant.xml +++ b/buildScripts/compile.ant.xml @@ -30,7 +30,7 @@ This buildfile is part of projectlombok.org. It takes care of compiling and buil <target name="version" depends="ipp.setup, deps.jdk-runtime" description="Shows the version number" unless="lombok.version"> <mkdir dir="build/lombok" /> <ivy:compile destdir="build/lombok" source="1.5" target="1.5" ecj="true" nowarn="true"> - <bootclasspath path="${jdk-rt.loc}" /> + <bootclasspath path="${jdk6-rt.loc}" /> <src path="src/core" /> <include name="lombok/core/Version.java" /> </ivy:compile> @@ -73,11 +73,11 @@ This buildfile is part of projectlombok.org. It takes care of compiling and buil However, the stubs themselves also have a ton of dependencies; to avoid _that_, we have stubs for stubs, too! --> <ivy:compile destdir="build/stubsstubs" source="1.5" target="1.5" ecj="true"> - <bootclasspath path="${jdk-rt.loc}" /> + <bootclasspath path="${jdk6-rt.loc}" /> <src path="src/stubsstubs" /> </ivy:compile> <ivy:compile destdir="build/stubs" source="1.5" target="1.5" ecj="true"> - <bootclasspath path="${jdk-rt.loc}" /> + <bootclasspath path="${jdk6-rt.loc}" /> <src path="src/stubs" /> <src path="src/javac-only-stubs" /> <classpath location="build/stubsstubs" /> @@ -108,19 +108,19 @@ This buildfile is part of projectlombok.org. It takes care of compiling and buil <ivy:compile destdir="build/lombok" source="1.4" target="1.4" ecj="true"> <bootclasspath location="build/stubs" /> - <bootclasspath path="${jdk-rt.loc}" /> + <bootclasspath path="${jdk6-rt.loc}" /> <src path="build/transformedSources" /> </ivy:compile> <ivy:compile destdir="build/lombok/Class50" source="1.4" target="1.6" ecj="true"> <bootclasspath location="build/stubs" /> - <bootclasspath path="${jdk-rt.loc}" /> + <bootclasspath path="${jdk6-rt.loc}" /> <src path="build/transformedSources" /> </ivy:compile> <ivy:compile destdir="build/lombok" source="1.5" target="1.5" ecj="true"> <bootclasspath location="build/stubs" /> - <bootclasspath path="${jdk-rt.loc}" /> + <bootclasspath path="${jdk6-rt.loc}" /> <src path="src/utils" /> <exclude name="lombok/javac/**" /> <classpath path="build/lombok" /> @@ -129,7 +129,7 @@ This buildfile is part of projectlombok.org. It takes care of compiling and buil </ivy:compile> <ivy:compile destdir="build/lombok" source="1.6" target="1.6" ecj="true"> <bootclasspath location="build/stubs" /> - <bootclasspath path="${jdk-rt.loc}" /> + <bootclasspath path="${jdk6-rt.loc}" /> <src path="src/utils" /> <include name="lombok/javac/**" /> <classpath location="build/lombok" /> @@ -141,7 +141,7 @@ This buildfile is part of projectlombok.org. It takes care of compiling and buil use API that didn't exist in those versions yet. --> <ivy:compile destdir="build/lombok" source="1.6" target="1.6" ecj="true" nowarn="true"> <bootclasspath location="build/stubs" /> - <bootclasspath path="${jdk-rt.loc}" /> + <bootclasspath path="${jdk6-rt.loc}" /> <src path="src/launch" /> <src path="src/core" /> <src path="src/installer" /> @@ -157,7 +157,7 @@ This buildfile is part of projectlombok.org. It takes care of compiling and buil <!-- This is really part of the eclipse agent, but references lombok, so that had to be compiled first --> <ivy:compile destdir="build/lombok/Class50" source="1.5" target="1.6" ecj="true"> <bootclasspath location="build/stubs" /> - <bootclasspath path="${jdk-rt.loc}" /> + <bootclasspath path="${jdk6-rt.loc}" /> <src path="src/eclipseAgent" /> <include name="lombok/launch/PatchFixesHider.java" /> <classpath location="build/lombok" /> diff --git a/buildScripts/create-eclipse-project.ant.xml b/buildScripts/create-eclipse-project.ant.xml index 386ed3de..89e2f91f 100644 --- a/buildScripts/create-eclipse-project.ant.xml +++ b/buildScripts/create-eclipse-project.ant.xml @@ -69,6 +69,7 @@ This buildfile is part of projectlombok.org. It creates the infrastructure neede <arg value="name=Lombok-test Base" /> <arg value="testType=lombok.TestBase" /> <arg value="jvmTarget=1.8" /> + <arg value="bootpath=${jdk8-rt.loc}" /> <arg value="conf.test=${cp.test}" /> <arg value="conf.stripe=${cp.stripe}" /> <arg value="favorite" /> @@ -82,6 +83,7 @@ This buildfile is part of projectlombok.org. It creates the infrastructure neede <arg value="name=Lombok-test Eclipse-202006" /> <arg value="testType=lombok.TestEclipse" /> <arg value="jvmTarget=1.8" /> + <arg value="bootpath=${jdk8-rt.loc}" /> <arg value="conf.test=${cp.test}" /> <arg value="conf.stripe=${cp.stripe}" /> <arg value="conf.eclipse-oxygen=${cp.eclipse-202006}" /> diff --git a/buildScripts/setup.ant.xml b/buildScripts/setup.ant.xml index d6713222..6ab23897 100644 --- a/buildScripts/setup.ant.xml +++ b/buildScripts/setup.ant.xml @@ -29,9 +29,9 @@ This buildfile is part of projectlombok.org. It sets up the build itself. <property environment="env" /> <available file="lib/ivyplusplus.jar" property="ivyplusplus.available" /> - <property name="jdk-rt.loc" location="lib/openjdk6_rt.jar" /> + <property name="jdk6-rt.loc" location="lib/openjdk6_rt.jar" /> <property name="jdk8-rt.loc" location="lib/openjdk8_rt.jar" /> - <available file="${jdk-rt.loc}" property="jdk-rt.available" /> + <available file="${jdk6-rt.loc}" property="jdk6-rt.available" /> <available file="${jdk8-rt.loc}" property="jdk8-rt.available" /> <property name="ssh.configuration.file" location="ssh.configuration" /> @@ -121,10 +121,10 @@ This buildfile is part of projectlombok.org. It sets up the build itself. <property name="ivy.config" value="true" /> </target> - <target name="deps.jdk6-runtime" unless="jdk-rt.available"> + <target name="deps.jdk6-runtime" unless="jdk6-rt.available"> <echo>To ensure stable builds and avoid accessing API that was not available in JDK6, most of lombok is set up to build against OpenJDK6's runtime, which will now be downloaded...</echo> <mkdir dir="lib" /> - <get src="https://projectlombok.org/ivyrepo/langtools/rt-openjdk6.jar" dest="${jdk-rt.loc}" verbose="true" usetimestamp="true" /> + <get src="https://projectlombok.org/ivyrepo/langtools/rt-openjdk6.jar" dest="${jdk6-rt.loc}" verbose="true" usetimestamp="true" /> </target> <target name="deps.jdk8-runtime" unless="jdk8-rt.available"> @@ -133,7 +133,7 @@ This buildfile is part of projectlombok.org. It sets up the build itself. <get src="https://projectlombok.org/ivyrepo/langtools/rt-openjdk8.jar" dest="${jdk8-rt.loc}" verbose="true" usetimestamp="true" /> </target> - <target name="deps.jdk-runtime" depends="deps.jdk6-runtime" /> + <target name="deps.jdk-runtime" depends="deps.jdk6-runtime, deps.jdk8-runtime" /> <target name="deps.custom" depends="ivy.config" description="Download the dependencies that comprise a configuration (from ivy.xml)"> <fail unless="deps.conf">Supply ant with -Ddeps.conf=confname to pick the configuration you want to fetch</fail> diff --git a/buildScripts/tests.ant.xml b/buildScripts/tests.ant.xml index 67edf28a..d8559c5c 100644 --- a/buildScripts/tests.ant.xml +++ b/buildScripts/tests.ant.xml @@ -30,7 +30,7 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn <src path="test/stubs" /> </ivy:compile> <ivy:compile destdir="build/tests" source="1.5" target="1.5" ecj="true" nowarn="true"> - <bootclasspath path="${jdk-rt.loc}" /> + <bootclasspath path="${jdk6-rt.loc}" /> <classpath refid="cp.test" /> <classpath refid="cp.eclipse-oxygen" /> <classpath location="build/lombok" /> @@ -77,9 +77,9 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn <target name="test.javac6" depends="test.compile" description="runs the tests on your default VM, using javac6 as underlying compiler"> <echo>Running TestJavac on JVM${ant.java.version}, with lowest supported javac: 1.6.</echo> <junit haltonfailure="yes" fork="true" forkmode="once"> - <jvmarg value="-Xbootclasspath/a:${jdk-rt.loc}" /> + <jvmarg value="-Xbootclasspath/a:${jdk6-rt.loc}" /> <jvmarg line="${test.limitmodules}" /> - <jvmarg value="-Ddelombok.bootclasspath=${jdk-rt.loc}" /> + <jvmarg value="-Ddelombok.bootclasspath=${jdk6-rt.loc}" /> <formatter type="plain" usefile="false" unless="tests.quiet" /> <classpath refid="cp.test" /> <classpath refid="cp.stripe" /> |