diff options
| author | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2013-07-15 16:38:36 -0400 |
|---|---|---|
| committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2013-07-15 16:41:57 -0400 |
| commit | eb4a566fe3bbefedab594865c6cfba14ed29c7d7 (patch) | |
| tree | 4ae09fef34c375efe12481c0aecf46b3250b5c08 /bundles/org.eclipse.swt/buildFragment.xml | |
| parent | 22b8405f3e0cc3da801d39c55f8487f33ed54d32 (diff) | |
| download | eclipse.platform.swt-eb4a566fe3bbefedab594865c6cfba14ed29c7d7.tar.gz eclipse.platform.swt-eb4a566fe3bbefedab594865c6cfba14ed29c7d7.tar.xz eclipse.platform.swt-eb4a566fe3bbefedab594865c6cfba14ed29c7d7.zip | |
Bug 411356 - Move requirement for SWT to Java 1.5. Bug 412067 - isLoadable(); returns False due URL parse error
Diffstat (limited to 'bundles/org.eclipse.swt/buildFragment.xml')
| -rw-r--r-- | bundles/org.eclipse.swt/buildFragment.xml | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/bundles/org.eclipse.swt/buildFragment.xml b/bundles/org.eclipse.swt/buildFragment.xml index 5f74594df0..48d4fd3bc6 100644 --- a/bundles/org.eclipse.swt/buildFragment.xml +++ b/bundles/org.eclipse.swt/buildFragment.xml @@ -25,8 +25,8 @@ <property name="destination" value="${fragmentdir}" /> <property name="javacVerbose" value="false" /> <property name="logExtension" value=".xml" /> - <property name="javacSource" value="1.3" /> - <property name="javacTarget" value="1.2" /> + <property name="javacSource" value="1.5" /> + <property name="javacTarget" value="1.5" /> <condition property="bootclasspath" value=""> <equals arg1="${swt.os}" arg2="macosx"/> </condition> @@ -36,12 +36,6 @@ </fileset> </path> <property name="bootclasspath" refid="path_bootclasspath" /> - <condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}"> - <isset property="CDC-1.0/Foundation-1.0" /> - </condition> - <condition property="bundleBootClasspath" value="${J2SE-1.3}"> - <isset property="J2SE-1.3" /> - </condition> <property name="bundleJavacSource" value="${javacSource}" /> <property name="bundleJavacTarget" value="${javacTarget}" /> <property name="bundleBootClasspath" value="${bootclasspath}" /> @@ -72,7 +66,7 @@ <delete dir="${temp.folder}/@dot.bin" /> <mkdir dir="${temp.folder}/@dot.bin" /> <antcall target="copy.${swt.ws}.src"/> - <javac destdir="${temp.folder}/@dot.bin" verbose="${javacVerbose}" debug="${debug}" failonerror="no" classpath="${plugindir}/extra_jars/exceptions.jar" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}"> + <javac destdir="${temp.folder}/@dot.bin" verbose="${javacVerbose}" debug="${debug}" failonerror="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}"> <src path="${temp.folder}/@dot.src/"/> <compilerarg line="-log '${temp.folder}'/@dot.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" /> <compilerarg line="${compilerArg}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" /> |