diff options
| author | Andrey Loskutov | 2019-06-22 06:19:34 +0000 |
|---|---|---|
| committer | Andrey Loskutov | 2019-06-27 08:54:50 +0000 |
| commit | df4adc6947c2a7681d060059e1b1d3a511cec264 (patch) | |
| tree | cf2493f82ec47daacbd78993e7f28f5dbbfc3feb | |
| parent | b53a7fbfe78966edc7f566328de88e73d486eff9 (diff) | |
| download | eclipse.jdt.ui-df4adc6947c2a7681d060059e1b1d3a511cec264.tar.gz eclipse.jdt.ui-df4adc6947c2a7681d060059e1b1d3a511cec264.tar.xz eclipse.jdt.ui-df4adc6947c2a7681d060059e1b1d3a511cec264.zip | |
Bug 548309 - fixed jar-in-jar loader ant build after adding annotations
Change-Id: I4b41f228b18f561f300d3dd37e68aa7974147951
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
| -rw-r--r-- | org.eclipse.jdt.ui/customBuildCallbacks.xml | 6 | ||||
| -rw-r--r-- | org.eclipse.jdt.ui/scripts/build_jar-in-jar-loader.xml | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/org.eclipse.jdt.ui/customBuildCallbacks.xml b/org.eclipse.jdt.ui/customBuildCallbacks.xml index 6c19ee7927..aebb131ad1 100644 --- a/org.eclipse.jdt.ui/customBuildCallbacks.xml +++ b/org.eclipse.jdt.ui/customBuildCallbacks.xml @@ -5,7 +5,7 @@ <project name="Build specific targets and properties" default="noDefault"> <available file="${basedir}/jar-in-jar-loader.zip" property="jijl-zip" /> - + <!-- ===================================================================== --> <!-- Default target --> <!-- ===================================================================== --> @@ -64,8 +64,8 @@ <mkdir dir="${basedir}/temp/" /> <javac destdir="${basedir}/temp" srcdir="jar in jar loader/" - source="1.3" - target="1.1" + source="1.6" + target="1.6" debug="true" optimize="true" fork="true" /> diff --git a/org.eclipse.jdt.ui/scripts/build_jar-in-jar-loader.xml b/org.eclipse.jdt.ui/scripts/build_jar-in-jar-loader.xml index 05ed3bbf98..eb0df42053 100644 --- a/org.eclipse.jdt.ui/scripts/build_jar-in-jar-loader.xml +++ b/org.eclipse.jdt.ui/scripts/build_jar-in-jar-loader.xml @@ -1,32 +1,32 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <project name="Jar in Jar Loader" default="build" basedir=".."> - + <target name="build" description="Cleans, builds and refreshes the impacted resources" depends="clean, jar-in-jar-loader_zip" /> - + <!-- Empty target for "After a Clean" task (we don't want to rebuild the Jar here, e.g. on checkout). --> <target name="dummy_clean"/> - + <target name="init" depends="properties"> <property name="temp.folder" value="${basedir}/temp.folder" /> <property name="build.result.folder" value="${basedir}" /> </target> - + <target name="properties" if="eclipse.running"> <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" /> </target> - + <target name="jar-in-jar-loader_zip" depends="init" description="Creates the jar-in-jar-loader.zip"> <property name="destdir" value="${temp.folder}/jar-in-jar-loader.zip.bin" /> <delete dir="${temp.folder}/jar-in-jar-loader.zip.bin" /> <mkdir dir="${temp.folder}/jar-in-jar-loader.zip.bin" /> - <javac target="1.1" source="1.3" destdir="${temp.folder}/jar-in-jar-loader.zip.bin" failonerror="true" verbose="false" debug="on" includeAntRuntime="no" classpath="${basedir}/bin"> + <javac target="1.6" source="1.6" destdir="${temp.folder}/jar-in-jar-loader.zip.bin" failonerror="true" verbose="false" debug="on" includeAntRuntime="no" classpath="${basedir}/bin"> <src path="jar in jar loader/" /> </javac> <mkdir dir="${build.result.folder}" /> <zip destfile="${build.result.folder}/jar-in-jar-loader.zip" basedir="${temp.folder}/jar-in-jar-loader.zip.bin"/> <delete dir="${temp.folder}" /> </target> - + <target name="clean" depends="init"> <delete file="${build.result.folder}/jar-in-jar-loader.zip" /> <delete dir="${temp.folder}" /> |