|
 |
07c3123 |
--- plugins/org.eclipse.osgi/build.xml.orig 2008-09-25 15:28:47.000000000 +1000
|
|
|
07c3123 |
+++ plugins/org.eclipse.osgi/build.xml 2008-09-25 15:54:08.000000000 +1000
|
|
|
07c3123 |
@@ -16,18 +16,36 @@
|
|
|
07c3123 |
<property name="compilerArg" value=""/>
|
|
|
07c3123 |
<property name="javacSource" value="1.3"/>
|
|
|
07c3123 |
<property name="javacTarget" value="1.2"/>
|
|
|
07c3123 |
- <property name="bundleBootClasspath" value="osgi/exceptions.jar;osgi/xmlParserAPIs.jar;${CDC-1.0/Foundation-1.0}"/>
|
|
|
07c3123 |
+ <condition property="dir_bootclasspath" value="${java.home}/../Classes">
|
|
|
07c3123 |
+ <os family="mac"/>
|
|
|
07c3123 |
+ </condition>
|
|
|
07c3123 |
+ <property name="dir_bootclasspath" value="${java.home}/lib"/>
|
|
|
07c3123 |
+ <path id="path_bootclasspath">
|
|
|
07c3123 |
+ <fileset dir="${dir_bootclasspath}">
|
|
|
07c3123 |
+ <include name="*.jar"/>
|
|
|
07c3123 |
+ </fileset>
|
|
|
07c3123 |
+ </path>
|
|
|
07c3123 |
+ <property name="bootclasspath" refid="path_bootclasspath"/>
|
|
|
07c3123 |
+<condition property="bundleBootClasspath" value="${J2SE-1.4}" >
|
|
|
07c3123 |
+ <isset property="J2SE-1.4"/>
|
|
|
07c3123 |
+ </condition>
|
|
|
07c3123 |
<condition property="bundleJavacSource" value="1.3" >
|
|
|
07c3123 |
- <isset property="CDC-1.0/Foundation-1.0"/>
|
|
|
07c3123 |
+ <isset property="J2SE-1.4"/>
|
|
|
07c3123 |
+ </condition>
|
|
|
07c3123 |
+<condition property="bundleJavacTarget" value="1.2" >
|
|
|
07c3123 |
+ <isset property="J2SE-1.4"/>
|
|
|
07c3123 |
</condition>
|
|
|
07c3123 |
-<condition property="bundleJavacTarget" value="1.1" >
|
|
|
07c3123 |
- <isset property="CDC-1.0/Foundation-1.0"/>
|
|
|
07c3123 |
+<condition property="bundleBootClasspath" value="${J2SE-1.4}" >
|
|
|
07c3123 |
+ <isset property="J2SE-1.4"/>
|
|
|
07c3123 |
</condition>
|
|
|
07c3123 |
-<condition property="bundleJavacSource" value="1.5" >
|
|
|
07c3123 |
- <isset property="J2SE-1.5"/>
|
|
|
07c3123 |
+<condition property="bundleJavacSource" value="1.3" >
|
|
|
07c3123 |
+ <isset property="J2SE-1.4"/>
|
|
|
07c3123 |
+ </condition>
|
|
|
07c3123 |
+<condition property="bundleJavacTarget" value="1.2" >
|
|
|
07c3123 |
+ <isset property="J2SE-1.4"/>
|
|
|
07c3123 |
</condition>
|
|
|
07c3123 |
-<condition property="bundleJavacTarget" value="1.5" >
|
|
|
07c3123 |
- <isset property="J2SE-1.5"/>
|
|
|
07c3123 |
+<condition property="bundleBootClasspath" value="${OSGi/Minimum-1.1}" >
|
|
|
07c3123 |
+ <isset property="OSGi/Minimum-1.1"/>
|
|
|
07c3123 |
</condition>
|
|
|
07c3123 |
<condition property="bundleJavacSource" value="1.3" >
|
|
|
07c3123 |
<isset property="OSGi/Minimum-1.1"/>
|
|
|
07c3123 |
@@ -37,6 +55,7 @@
|
|
|
07c3123 |
</condition>
|
|
|
07c3123 |
<property name="bundleJavacSource" value="${javacSource}"/>
|
|
|
07c3123 |
<property name="bundleJavacTarget" value="${javacTarget}"/>
|
|
|
07c3123 |
+ <property name="bundleBootClasspath" value="${bootclasspath}"/>
|
|
|
07c3123 |
|
|
|
07c3123 |
<target name="init" depends="properties">
|
|
|
07c3123 |
<condition property="pluginTemp" value="${buildTempFolder}/plugins" >
|