Bug 396761: [CBI] Don't repeat variable assignments in buildDoc.xml

8 files changed, 325 insertions, 372 deletions

diff --git a/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml b/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml
index be779c657..60dc42026 100644
--- a/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml
+++ b/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml
@@ -50,7 +50,11 @@
 
 		<!-- replace "\n;" with platform-dependent list entry delimiter -->
 		<property name="optionsFile" value="jdtOptions.tmp.txt" />
-		<copy file="jdtOptions.txt" tofile="${optionsFile}" overwrite="true" />
+		<copy file="jdtOptions.txt" tofile="${optionsFile}" overwrite="true">
+			<filterchain>
+				<expandproperties/>
+			</filterchain>
+		</copy>
 		
 		<condition property="argsListDelimiter" value=":">
 			<os family="unix" />
@@ -61,25 +65,7 @@
 		
 		<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
 		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" />
-                <replace file="${basedir}/${optionsFile}" token="@dependency.dir@" value="${dependency.dir}" />
-                <replace file="${basedir}/${optionsFile}" token="@dot.classes@" value="${dot.classes}" />
 		<replace file="${basedir}/${optionsFile}" token="@baseLocation@" value="${baseLocation}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.core@" value="${eclipse.jdt.core}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.ui@" value="${eclipse.jdt.ui}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.debug@" value="${eclipse.jdt.debug}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ant@" value="${eclipse.platform.ant}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.debug@" value="${eclipse.platform.debug}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.resources.bundles@" value="${eclipse.platform.resources.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.runtime.bundles@" value="${eclipse.platform.runtime.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.team.bundles@" value="${eclipse.platform.team.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.text@" value="${eclipse.platform.text}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ua@" value="${eclipse.platform.ua}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ui.bundles@" value="${eclipse.platform.ui.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.bundles.bundles@" value="${rt.equinox.bundles.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.framework.bundles@" value="${rt.equinox.framework.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.p2.bundles@" value="${rt.equinox.p2.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.equinox.supplement@" value="${eclipse.equinox.supplement}" />
-		<replace file="${basedir}/${optionsFile}" token="@org.apache.ant.jar@" value="${org.apache.ant.jar}" />
 
 		
 		<!-- expand _* to actual version -->
diff --git a/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt b/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt
index 67f8f0761..050d88cb3 100644
--- a/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt
+++ b/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt
@@ -1,92 +1,92 @@
 -quiet
 -encoding "iso-8859-1"
 -charset "iso-8859-1"
--sourcepath "@eclipse.jdt.core@/org.eclipse.jdt.annotation/src
-;@eclipse.platform.ant@/org.eclipse.ant.launching/src
-;@eclipse.platform.ant@/org.eclipse.ant.ui/Ant Editor
-;@eclipse.platform.ant@/org.eclipse.ant.ui/Ant Tools Support
-;@eclipse.jdt.core@/org.eclipse.jdt.apt.core/src
-;@eclipse.jdt.core@/org.eclipse.jdt.core/antadapter
-;@eclipse.jdt.core@/org.eclipse.jdt.core/batch
-;@eclipse.jdt.core@/org.eclipse.jdt.core/codeassist
-;@eclipse.jdt.core@/org.eclipse.jdt.core/compiler
-;@eclipse.jdt.core@/org.eclipse.jdt.core/dom
-;@eclipse.jdt.core@/org.eclipse.jdt.core/eval
-;@eclipse.jdt.core@/org.eclipse.jdt.core/formatter
-;@eclipse.jdt.core@/org.eclipse.jdt.core/model
-;@eclipse.jdt.core@/org.eclipse.jdt.core/search
-;@eclipse.jdt.ui@/org.eclipse.jdt.core.manipulation/common
-;@eclipse.jdt.ui@/org.eclipse.jdt.core.manipulation/refactoring
-;@eclipse.jdt.debug@/org.eclipse.jdt.debug/eval
-;@eclipse.jdt.debug@/org.eclipse.jdt.debug/jdi
-;@eclipse.jdt.debug@/org.eclipse.jdt.debug/model
-;@eclipse.jdt.debug@/org.eclipse.jdt.debug.ui/ui
-;@eclipse.jdt.ui@/org.eclipse.jdt.junit/src
-;@eclipse.jdt.ui@/org.eclipse.jdt.junit.core/src
-;@eclipse.jdt.ui@/org.eclipse.jdt.junit.runtime/src
-;@eclipse.jdt.debug@/org.eclipse.jdt.launching/launching
-;@eclipse.jdt.ui@/org.eclipse.jdt.ui/core extension
-;@eclipse.jdt.ui@/org.eclipse.jdt.ui/core refactoring
-;@eclipse.jdt.ui@/org.eclipse.jdt.ui/internal compatibility
-;@eclipse.jdt.ui@/org.eclipse.jdt.ui/ui
-;@eclipse.jdt.ui@/org.eclipse.jdt.ui/ui refactoring"
+-sourcepath "${eclipse.jdt.core}/org.eclipse.jdt.annotation/src
+;${eclipse.platform.ant}/org.eclipse.ant.launching/src
+;${eclipse.platform.ant}/org.eclipse.ant.ui/Ant Editor
+;${eclipse.platform.ant}/org.eclipse.ant.ui/Ant Tools Support
+;${eclipse.jdt.core}/org.eclipse.jdt.apt.core/src
+;${eclipse.jdt.core}/org.eclipse.jdt.core/antadapter
+;${eclipse.jdt.core}/org.eclipse.jdt.core/batch
+;${eclipse.jdt.core}/org.eclipse.jdt.core/codeassist
+;${eclipse.jdt.core}/org.eclipse.jdt.core/compiler
+;${eclipse.jdt.core}/org.eclipse.jdt.core/dom
+;${eclipse.jdt.core}/org.eclipse.jdt.core/eval
+;${eclipse.jdt.core}/org.eclipse.jdt.core/formatter
+;${eclipse.jdt.core}/org.eclipse.jdt.core/model
+;${eclipse.jdt.core}/org.eclipse.jdt.core/search
+;${eclipse.jdt.ui}/org.eclipse.jdt.core.manipulation/common
+;${eclipse.jdt.ui}/org.eclipse.jdt.core.manipulation/refactoring
+;${eclipse.jdt.debug}/org.eclipse.jdt.debug/eval
+;${eclipse.jdt.debug}/org.eclipse.jdt.debug/jdi
+;${eclipse.jdt.debug}/org.eclipse.jdt.debug/model
+;${eclipse.jdt.debug}/org.eclipse.jdt.debug.ui/ui
+;${eclipse.jdt.ui}/org.eclipse.jdt.junit/src
+;${eclipse.jdt.ui}/org.eclipse.jdt.junit.core/src
+;${eclipse.jdt.ui}/org.eclipse.jdt.junit.runtime/src
+;${eclipse.jdt.debug}/org.eclipse.jdt.launching/launching
+;${eclipse.jdt.ui}/org.eclipse.jdt.ui/core extension
+;${eclipse.jdt.ui}/org.eclipse.jdt.ui/core refactoring
+;${eclipse.jdt.ui}/org.eclipse.jdt.ui/internal compatibility
+;${eclipse.jdt.ui}/org.eclipse.jdt.ui/ui
+;${eclipse.jdt.ui}/org.eclipse.jdt.ui/ui refactoring"
 -d reference/api
 -classpath @rt@
-;@dependency.dir@/com.ibm.icu_*.jar
-;@dependency.dir@/@org.apache.ant.jar@
-;@eclipse.platform.ant@/org.eclipse.ant.core/@dot.classes@
-;@eclipse.platform.team.bundles@/org.eclipse.compare/@dot.classes@
-;@eclipse.platform.team.bundles@/org.eclipse.compare.core/@dot.classes@
-;@eclipse.platform.ui.bundles@/org.eclipse.core.commands/@dot.classes@
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.contenttype/@dot.classes@
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.expressions/@dot.classes@
-;@eclipse.platform.debug@/org.eclipse.core.externaltools/@dot.classes@
-;@eclipse.platform.text@/org.eclipse.core.filebuffers/@dot.classes@
-;@eclipse.platform.resources.bundles@/org.eclipse.core.filesystem/@dot.classes@
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.jobs/@dot.classes@
-;@eclipse.platform.resources.bundles@/org.eclipse.core.resources/@dot.classes@
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime/@dot.classes@
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.content/@dot.classes@
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.jobs/@dot.classes@
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.preferences/@dot.classes@
-;@eclipse.platform.debug@/org.eclipse.core.variables/@dot.classes@
-;@eclipse.platform.debug@/org.eclipse.debug.core/@dot.classes@
-;@eclipse.platform.debug@/org.eclipse.debug.ui/@dot.classes@
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.app/@dot.classes@
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.common/@dot.classes@
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.preferences/@dot.classes@
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.registry/@dot.classes@
-;@eclipse.equinox.supplement@/@dot.classes@
-;@eclipse.platform.ua@/org.eclipse.help/@dot.classes@
-;@eclipse.platform.ua@/org.eclipse.help.ui/@dot.classes@
-;@eclipse.jdt.core@/org.eclipse.jdt.apt.core/mirrorapi.jar
-;@eclipse.jdt.ui@/org.eclipse.jdt.core.manipulation/@dot.classes@
-;@eclipse.jdt.debug@/org.eclipse.jdt.debug/jdi.jar
-;@eclipse.jdt.ui@/org.eclipse.jdt.junit/@dot.classes@
-;@eclipse.jdt.ui@/org.eclipse.jdt.junit.core/@dot.classes@
-;@eclipse.platform.ui.bundles@/org.eclipse.jface/@dot.classes@
-;@eclipse.platform.text@/org.eclipse.jface.text/@dot.classes@
-;@eclipse.jdt.ui@/org.eclipse.ltk.core.refactoring/@dot.classes@
-;@eclipse.jdt.ui@/org.eclipse.ltk.ui.refactoring/@dot.classes@
-;@rt.equinox.framework.bundles@/org.eclipse.osgi/@dot.classes@
-;@rt.equinox.framework.bundles@/org.eclipse.osgi.services/@dot.classes@
-;@rt.equinox.framework.bundles@/org.eclipse.osgi.util/@dot.classes@
-;@eclipse.platform.text@/org.eclipse.search/@dot.classes@
-;@eclipse.platform.text@/org.eclipse.swt.win32.win32.x86/@dot.classes@
-;@eclipse.platform.team.bundles@/org.eclipse.team.core/@dot.classes@
-;@eclipse.platform.team.bundles@/org.eclipse.team.ui/@dot.classes@
-;@eclipse.platform.text@/org.eclipse.text/@dot.classes@
-;@eclipse.platform.ui.bundles@/org.eclipse.ui/@dot.classes@
-;@eclipse.platform.debug@/org.eclipse.ui.console/@dot.classes@
-;@eclipse.platform.text@/org.eclipse.ui.editors/@dot.classes@
-;@eclipse.platform.debug@/org.eclipse.ui.externaltools/@dot.classes@
-;@eclipse.platform.ui.bundles@/org.eclipse.ui.forms/@dot.classes@
-;@eclipse.platform.ui.bundles@/org.eclipse.ui.ide/@dot.classes@
-;@eclipse.platform.ui.bundles@/org.eclipse.ui.navigator/@dot.classes@
-;@eclipse.platform.ui.bundles@/org.eclipse.ui.views/@dot.classes@
-;@eclipse.platform.ui.bundles@/org.eclipse.ui.workbench/@dot.classes@
-;@eclipse.platform.text@/org.eclipse.ui.workbench.texteditor/@dot.classes@
-;@dependency.dir@/org.junit/junit.jar
+;${dependency.dir}/com.ibm.icu_*.jar
+;${dependency.dir}/${org.apache.ant.jar}
+;${eclipse.platform.ant}/org.eclipse.ant.core/${dot.classes}
+;${eclipse.platform.team.bundles}/org.eclipse.compare/${dot.classes}
+;${eclipse.platform.team.bundles}/org.eclipse.compare.core/${dot.classes}
+;${eclipse.platform.ui.bundles}/org.eclipse.core.commands/${dot.classes}
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.contenttype/${dot.classes}
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.expressions/${dot.classes}
+;${eclipse.platform.debug}/org.eclipse.core.externaltools/${dot.classes}
+;${eclipse.platform.text}/org.eclipse.core.filebuffers/${dot.classes}
+;${eclipse.platform.resources.bundles}/org.eclipse.core.filesystem/${dot.classes}
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.jobs/${dot.classes}
+;${eclipse.platform.resources.bundles}/org.eclipse.core.resources/${dot.classes}
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.runtime/${dot.classes}
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.runtime.content/${dot.classes}
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.runtime.jobs/${dot.classes}
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.runtime.preferences/${dot.classes}
+;${eclipse.platform.debug}/org.eclipse.core.variables/${dot.classes}
+;${eclipse.platform.debug}/org.eclipse.debug.core/${dot.classes}
+;${eclipse.platform.debug}/org.eclipse.debug.ui/${dot.classes}
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.app/${dot.classes}
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.common/${dot.classes}
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.preferences/${dot.classes}
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.registry/${dot.classes}
+;${eclipse.equinox.supplement}/${dot.classes}
+;${eclipse.platform.ua}/org.eclipse.help/${dot.classes}
+;${eclipse.platform.ua}/org.eclipse.help.ui/${dot.classes}
+;${eclipse.jdt.core}/org.eclipse.jdt.apt.core/mirrorapi.jar
+;${eclipse.jdt.ui}/org.eclipse.jdt.core.manipulation/${dot.classes}
+;${eclipse.jdt.debug}/org.eclipse.jdt.debug/jdi.jar
+;${eclipse.jdt.ui}/org.eclipse.jdt.junit/${dot.classes}
+;${eclipse.jdt.ui}/org.eclipse.jdt.junit.core/${dot.classes}
+;${eclipse.platform.ui.bundles}/org.eclipse.jface/${dot.classes}
+;${eclipse.platform.text}/org.eclipse.jface.text/${dot.classes}
+;${eclipse.jdt.ui}/org.eclipse.ltk.core.refactoring/${dot.classes}
+;${eclipse.jdt.ui}/org.eclipse.ltk.ui.refactoring/${dot.classes}
+;${rt.equinox.framework.bundles}/org.eclipse.osgi/${dot.classes}
+;${rt.equinox.framework.bundles}/org.eclipse.osgi.services/${dot.classes}
+;${rt.equinox.framework.bundles}/org.eclipse.osgi.util/${dot.classes}
+;${eclipse.platform.text}/org.eclipse.search/${dot.classes}
+;${eclipse.platform.text}/org.eclipse.swt.win32.win32.x86/${dot.classes}
+;${eclipse.platform.team.bundles}/org.eclipse.team.core/${dot.classes}
+;${eclipse.platform.team.bundles}/org.eclipse.team.ui/${dot.classes}
+;${eclipse.platform.text}/org.eclipse.text/${dot.classes}
+;${eclipse.platform.ui.bundles}/org.eclipse.ui/${dot.classes}
+;${eclipse.platform.debug}/org.eclipse.ui.console/${dot.classes}
+;${eclipse.platform.text}/org.eclipse.ui.editors/${dot.classes}
+;${eclipse.platform.debug}/org.eclipse.ui.externaltools/${dot.classes}
+;${eclipse.platform.ui.bundles}/org.eclipse.ui.forms/${dot.classes}
+;${eclipse.platform.ui.bundles}/org.eclipse.ui.ide/${dot.classes}
+;${eclipse.platform.ui.bundles}/org.eclipse.ui.navigator/${dot.classes}
+;${eclipse.platform.ui.bundles}/org.eclipse.ui.views/${dot.classes}
+;${eclipse.platform.ui.bundles}/org.eclipse.ui.workbench/${dot.classes}
+;${eclipse.platform.text}/org.eclipse.ui.workbench.texteditor/${dot.classes}
+;${dependency.dir}/org.junit/junit.jar
 -breakiterator
 -use
 -splitIndex
diff --git a/bundles/org.eclipse.pde.doc.user/buildDoc.xml b/bundles/org.eclipse.pde.doc.user/buildDoc.xml
index 183f61269..a602ecc89 100644
--- a/bundles/org.eclipse.pde.doc.user/buildDoc.xml
+++ b/bundles/org.eclipse.pde.doc.user/buildDoc.xml
@@ -51,7 +51,11 @@
 
 		<!-- replace "\n;" with platform-dependent list entry delimiter -->
 		<property name="optionsFile" value="pdeOptions.tmp.txt" />
-		<copy file="pdeOptions.txt" tofile="${optionsFile}" overwrite="true" />
+		<copy file="pdeOptions.txt" tofile="${optionsFile}" overwrite="true">
+			<filterchain>
+				<expandproperties/>
+			</filterchain>
+		</copy>
 		
 		<condition property="argsListDelimiter" value=":">
 			<os family="unix" />
@@ -62,26 +66,6 @@
 		
 		<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
 		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" />
-                <replace file="${basedir}/${optionsFile}" token="@dependency.dir@" value="${dependency.dir}" />
-                <replace file="${basedir}/${optionsFile}" token="@dot.classes@" value="${dot.classes}" />
-                <replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.core@" value="${eclipse.jdt.core}" />
-                <replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.debug@" value="${eclipse.jdt.debug}" />
-                <replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.ui@" value="${eclipse.jdt.ui}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.pde.ui.ui@" value="${eclipse.pde.ui.ui}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.pde.build@" value="${eclipse.pde.build}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.debug@" value="${eclipse.platform.debug}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.resources.bundles@" value="${eclipse.platform.resources.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.runtime.bundles@" value="${eclipse.platform.runtime.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.swt.binaries.bundles@" value="${eclipse.platform.swt.binaries.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.team.bundles@" value="${eclipse.platform.team.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.text@" value="${eclipse.platform.text}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ua@" value="${eclipse.platform.ua}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ui.bundles@" value="${eclipse.platform.ui.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.update@" value="${eclipse.platform.update}" />
-		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.bundles.bundles@" value="${rt.equinox.bundles.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.framework.bundles@" value="${rt.equinox.framework.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.p2.bundles@" value="${rt.equinox.p2.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.equinox.supplement@" value="${eclipse.equinox.supplement}" />
 
 
 		<!-- expand _* to actual version -->
diff --git a/bundles/org.eclipse.pde.doc.user/pdeOptions.txt b/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
index 95b480c49..544aac2d4 100644
--- a/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
+++ b/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
@@ -1,60 +1,60 @@
 -quiet
 -charset "iso-8859-1"
--sourcepath "@eclipse.pde.ui.ui@/org.eclipse.pde.core/src
-;@eclipse.pde.ui.ui@/org.eclipse.pde.ui/src
-;@eclipse.pde.build@/org.eclipse.pde.build/src
-;@eclipse.pde.ui.ui@/org.eclipse.pde.launching/src"
+-sourcepath "${eclipse.pde.ui.ui}/org.eclipse.pde.core/src
+;${eclipse.pde.ui.ui}/org.eclipse.pde.ui/src
+;${eclipse.pde.build}/org.eclipse.pde.build/src
+;${eclipse.pde.ui.ui}/org.eclipse.pde.launching/src"
 -d reference/api
 -classpath @rt@
-;@eclipse.platform.team.bundles@/org.eclipse.compare/@dot.classes@
-;@eclipse.platform.team.bundles@/org.eclipse.compare.core/@dot.classes@
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.boot/@dot.classes@
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.contenttype/@dot.classes@
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.jobs/@dot.classes@
-;@eclipse.platform.resources.bundles@/org.eclipse.core.resources/@dot.classes@
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime/@dot.classes@
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.content/@dot.classes@
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.jobs/@dot.classes@
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.preferences/@dot.classes@
-;@eclipse.platform.debug@/org.eclipse.core.variables/@dot.classes@
-;@eclipse.platform.debug@/org.eclipse.debug.core/@dot.classes@
-;@eclipse.platform.debug@/org.eclipse.debug.ui/@dot.classes@
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.common/@dot.classes@
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.frameworkadmin/@dot.classes@
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.metadata/@dot.classes@
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.publisher.eclipse/@dot.classes@
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.preferences/@dot.classes@
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.registry/@dot.classes@
-;@eclipse.equinox.supplement@/@dot.classes@
-;@eclipse.platform.ua@/org.eclipse.help/@dot.classes@
-;@eclipse.platform.ua@/org.eclipse.help.ui/@dot.classes@
-;@eclipse.jdt.core@/org.eclipse.jdt.core/@dot.classes@
-;@eclipse.jdt.debug@/org.eclipse.jdt.debug/jdi.jar
-;@eclipse.jdt.debug@/org.eclipse.jdt.debug.ui/@dot.classes@
-;@eclipse.jdt.ui@/org.eclipse.jdt.junit/@dot.classes@
-;@eclipse.jdt.ui@/org.eclipse.jdt.junit/junitsupport.jar
-;@eclipse.jdt.ui@/org.eclipse.jdt.junit.core/@dot.classes@
-;@eclipse.jdt.debug@/org.eclipse.jdt.launching/@dot.classes@
-;@eclipse.jdt.ui@/org.eclipse.jdt.ui/@dot.classes@
-;@eclipse.platform.ui.bundles@/org.eclipse.jface/@dot.classes@
-;@eclipse.platform.text@/org.eclipse.jface.text/@dot.classes@
-;@rt.equinox.framework.bundles@/org.eclipse.osgi/@dot.classes@
-;@rt.equinox.framework.bundles@/org.eclipse.osgi.services/@dot.classes@
-;@rt.equinox.framework.bundles@/org.eclipse.osgi.util/@dot.classes@
-;@eclipse.pde.ui.ui@/org.eclipse.pde.core/@dot.classes@
-;@eclipse.pde.ui.ui@/org.eclipse.pde.ui/@dot.classes@
-;@eclipse.pde.build@/org.eclipse.pde.build/@dot.classes@
-;@eclipse.pde.ui.ui@/org.eclipse.pde.launching/@dot.classes@
-;@eclipse.platform.text@/org.eclipse.search/@dot.classes@
-;@eclipse.platform.swt.binaries.bundles@/org.eclipse.swt.win32.win32.x86/@dot.classes@
-;@eclipse.platform.text@/org.eclipse.text/@dot.classes@
-;@eclipse.platform.ui.bundles@/org.eclipse.ui/@dot.classes@
-;@eclipse.platform.text@/org.eclipse.ui.editors/@dot.classes@
-;@eclipse.platform.ui.bundles@/org.eclipse.ui.ide/@dot.classes@
-;@eclipse.platform.ui.bundles@/org.eclipse.ui.views/@dot.classes@
-;@eclipse.platform.ui.bundles@/org.eclipse.ui.workbench/@dot.classes@
-;@eclipse.platform.text@/org.eclipse.ui.workbench.texteditor/@dot.classes@
-;@eclipse.platform.update@/org.eclipse.update.configurator/@dot.classes@
+;${eclipse.platform.team.bundles}/org.eclipse.compare/${dot.classes}
+;${eclipse.platform.team.bundles}/org.eclipse.compare.core/${dot.classes}
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.boot/${dot.classes}
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.contenttype/${dot.classes}
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.jobs/${dot.classes}
+;${eclipse.platform.resources.bundles}/org.eclipse.core.resources/${dot.classes}
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.runtime/${dot.classes}
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.runtime.content/${dot.classes}
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.runtime.jobs/${dot.classes}
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.runtime.preferences/${dot.classes}
+;${eclipse.platform.debug}/org.eclipse.core.variables/${dot.classes}
+;${eclipse.platform.debug}/org.eclipse.debug.core/${dot.classes}
+;${eclipse.platform.debug}/org.eclipse.debug.ui/${dot.classes}
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.common/${dot.classes}
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.frameworkadmin/${dot.classes}
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.metadata/${dot.classes}
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.publisher.eclipse/${dot.classes}
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.preferences/${dot.classes}
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.registry/${dot.classes}
+;${eclipse.equinox.supplement}/${dot.classes}
+;${eclipse.platform.ua}/org.eclipse.help/${dot.classes}
+;${eclipse.platform.ua}/org.eclipse.help.ui/${dot.classes}
+;${eclipse.jdt.core}/org.eclipse.jdt.core/${dot.classes}
+;${eclipse.jdt.debug}/org.eclipse.jdt.debug/jdi.jar
+;${eclipse.jdt.debug}/org.eclipse.jdt.debug.ui/${dot.classes}
+;${eclipse.jdt.ui}/org.eclipse.jdt.junit/${dot.classes}
+;${eclipse.jdt.ui}/org.eclipse.jdt.junit/junitsupport.jar
+;${eclipse.jdt.ui}/org.eclipse.jdt.junit.core/${dot.classes}
+;${eclipse.jdt.debug}/org.eclipse.jdt.launching/${dot.classes}
+;${eclipse.jdt.ui}/org.eclipse.jdt.ui/${dot.classes}
+;${eclipse.platform.ui.bundles}/org.eclipse.jface/${dot.classes}
+;${eclipse.platform.text}/org.eclipse.jface.text/${dot.classes}
+;${rt.equinox.framework.bundles}/org.eclipse.osgi/${dot.classes}
+;${rt.equinox.framework.bundles}/org.eclipse.osgi.services/${dot.classes}
+;${rt.equinox.framework.bundles}/org.eclipse.osgi.util/${dot.classes}
+;${eclipse.pde.ui.ui}/org.eclipse.pde.core/${dot.classes}
+;${eclipse.pde.ui.ui}/org.eclipse.pde.ui/${dot.classes}
+;${eclipse.pde.build}/org.eclipse.pde.build/${dot.classes}
+;${eclipse.pde.ui.ui}/org.eclipse.pde.launching/${dot.classes}
+;${eclipse.platform.text}/org.eclipse.search/${dot.classes}
+;${eclipse.platform.swt.binaries.bundles}/org.eclipse.swt.win32.win32.x86/${dot.classes}
+;${eclipse.platform.text}/org.eclipse.text/${dot.classes}
+;${eclipse.platform.ui.bundles}/org.eclipse.ui/${dot.classes}
+;${eclipse.platform.text}/org.eclipse.ui.editors/${dot.classes}
+;${eclipse.platform.ui.bundles}/org.eclipse.ui.ide/${dot.classes}
+;${eclipse.platform.ui.bundles}/org.eclipse.ui.views/${dot.classes}
+;${eclipse.platform.ui.bundles}/org.eclipse.ui.workbench/${dot.classes}
+;${eclipse.platform.text}/org.eclipse.ui.workbench.texteditor/${dot.classes}
+;${eclipse.platform.update}/org.eclipse.update.configurator/${dot.classes}
 -breakiterator
 -use
 -splitIndex
diff --git a/bundles/org.eclipse.platform.doc.isv/buildDoc.xml b/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
index 3a1a86c69..7cb6c3210 100644
--- a/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
+++ b/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
@@ -108,7 +108,11 @@
 
 		<!-- replace "\n;" with platform-dependent list entry delimiter -->
 		<property name="optionsFile" value="platformOptions.tmp.txt" />
-		<copy file="platformOptions.txt" tofile="${optionsFile}" overwrite="true" />
+		<copy file="platformOptions.txt" tofile="${optionsFile}" overwrite="true">
+			<filterchain>
+				<expandproperties/>
+			</filterchain>
+		</copy>
 		
 		<condition property="argsListDelimiter" value=":">
 			<os family="unix" />
@@ -119,29 +123,6 @@
 		
 		<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
 		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" />
-		<replace file="${basedir}/${optionsFile}" token="@dependency.dir@" value="${dependency.dir}" />
-		<replace file="${basedir}/${optionsFile}" token="@dot.classes@" value="${dot.classes}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.ui@" value="${eclipse.jdt.ui}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.pde@" value="${eclipse.pde}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ant@" value="${eclipse.platform.ant}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.debug@" value="${eclipse.platform.debug}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.platform@" value="${eclipse.platform.platform}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.resources.bundles@" value="${eclipse.platform.resources.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.runtime.bundles@" value="${eclipse.platform.runtime.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.swt.bundles@" value="${eclipse.platform.swt.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.team.bundles@" value="${eclipse.platform.team.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.text@" value="${eclipse.platform.text}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ua@" value="${eclipse.platform.ua}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ui.bundles@" value="${eclipse.platform.ui.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.update@" value="${eclipse.platform.update}" />
-		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.bundles.bundles@" value="${rt.equinox.bundles.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.framework.bundles@" value="${rt.equinox.framework.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.p2.bundles@" value="${rt.equinox.p2.bundles}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.team.examples@" value="${eclipse.platform.team.examples}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.swt.examples@" value="${eclipse.platform.swt.examples}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ui.examples@" value="${eclipse.platform.ui.examples}" />
-		<replace file="${basedir}/${optionsFile}" token="@eclipse.equinox.supplement@" value="${eclipse.equinox.supplement}" />
-                <replace file="${basedir}/${optionsFile}" token="@eclipse.equinox.http.jetty@" value="${eclipse.equinox.http.jetty}" />
 		
 		<!-- expand _* to actual version -->
 			<!-- prepare ${replaceFile} with all files and folders from workspace -->
diff --git a/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties b/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
index ad5b54b58..8c8848e4e 100644
--- a/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
+++ b/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
@@ -23,3 +23,4 @@ eclipse.platform.ui.examples=../../../eclipse.platform.ui/examples
 
 eclipse.equinox.supplement=../../../rt.equinox.framework/bundles/org.eclipse.osgi/supplement
 eclipse.equinox.http.jetty=org.eclipse.equinox.http.jetty8
+org.apache.ant.jar=org.apache.ant_*-lib/ant.jar.jar
diff --git a/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties b/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties
index f2acfb34e..242e93637 100644
--- a/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties
+++ b/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties
@@ -23,3 +23,4 @@ eclipse.platform.ui.examples=..
 
 eclipse.equinox.supplement=../org.eclipse.equinox.supplement
 eclipse.equinox.http.jetty=org.eclipse.equinox.http.jetty_*
+org.apache.ant.jar=org.apache.ant_*/lib/ant.jar
diff --git a/bundles/org.eclipse.platform.doc.isv/platformOptions.txt b/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
index b9a3d66c9..92c85142f 100644
--- a/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
+++ b/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
@@ -2,178 +2,178 @@
 -encoding "iso-8859-1"
 -charset "iso-8859-1"
 -sourcepath "
-;@eclipse.platform.ant@/org.eclipse.ant.core/src
-;@eclipse.platform.team.bundles@/org.eclipse.compare.core/src
-;@eclipse.platform.team.bundles@/org.eclipse.compare/compare
-;@eclipse.platform.ui.bundles@/org.eclipse.core.commands/src
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.contenttype/src
-;@eclipse.platform.ui.bundles@/org.eclipse.core.databinding.beans/src
-;@eclipse.platform.ui.bundles@/org.eclipse.core.databinding.observable/src
-;@eclipse.platform.ui.bundles@/org.eclipse.core.databinding.property/src
-;@eclipse.platform.ui.bundles@/org.eclipse.core.databinding/src
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.expressions/src
-;@eclipse.platform.text@/org.eclipse.core.filebuffers/src
-;@eclipse.platform.resources.bundles@/org.eclipse.core.filesystem/src
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.jobs/src
-;@eclipse.platform.team.bundles@/org.eclipse.core.net/src
-;@eclipse.platform.resources.bundles@/org.eclipse.core.resources/src
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.compatibility/src-model
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.compatibility/src-runtime
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime/src
-;@eclipse.platform.debug@/org.eclipse.core.variables/src
-;@eclipse.platform.debug@/org.eclipse.debug.core/core
-;@eclipse.platform.debug@/org.eclipse.debug.ui/ui
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.app/src
-;@eclipse.platform.ui.bundles@/org.eclipse.e4.core.commands/src
-;@eclipse.platform.runtime.bundles@/org.eclipse.e4.core.contexts/src
-;@eclipse.platform.runtime.bundles@/org.eclipse.e4.core.di/src
-;@eclipse.platform.runtime.bundles@/org.eclipse.e4.core.services/src
-;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.bindings/src
-;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.css.core/src
-;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.css.swt/src
-;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.css.swt.theme/src
-;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.di/src
-;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.model.workbench/src
-;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.services/src
-;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.widgets/src
-;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.workbench.renderers.swt/src
-;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.workbench.swt/src
-;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.workbench/src
-;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.workbench3/src
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.bidi/src
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.ds/src
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.common/src
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.frameworkadmin/src
-;@rt.equinox.bundles.bundles@/@eclipse.equinox.http.jetty@/src
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.http.registry/src
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.http.servlet/src
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.jsp.jasper.registry/src
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.jsp.jasper/src
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.preferences/src
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.core/src
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.director/src
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.engine/src
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.metadata/src
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.metadata.repository/src
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.operations/src
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.ql/src
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.repository/src
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.touchpoint.eclipse/src
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.ui/src
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.registry/src
-;@rt.equinox.bundles.bundles@/org.eclipse.equinox.security/src
-;@eclipse.platform.ua@/org.eclipse.help.base/src
-;@eclipse.platform.ua@/org.eclipse.help.base/src_demo
-;@eclipse.platform.ua@/org.eclipse.help.ui/src
-;@eclipse.platform.ua@/org.eclipse.help.webapp/src
-;@eclipse.platform.ua@/org.eclipse.help/src
-;@eclipse.platform.ui.bundles@/org.eclipse.jface.databinding/src
-;@eclipse.platform.text@/org.eclipse.jface.text/projection
-;@eclipse.platform.text@/org.eclipse.jface.text/src
-;@eclipse.platform.ui.bundles@/org.eclipse.jface/src
-;@eclipse.platform.team.bundles@/org.eclipse.jsch.core/src
-;@eclipse.platform.team.bundles@/org.eclipse.jsch.ui/src
-;@eclipse.jdt.ui@/org.eclipse.ltk.core.refactoring/src
-;@eclipse.jdt.ui@/org.eclipse.ltk.ui.refactoring/src
-;@rt.equinox.framework.bundles@/org.eclipse.osgi/core/adaptor
-;@rt.equinox.framework.bundles@/org.eclipse.osgi/core/framework
-;@rt.equinox.framework.bundles@/org.eclipse.osgi/eclipseAdaptor/src
-;@rt.equinox.framework.bundles@/org.eclipse.osgi/security/src
-;@rt.equinox.framework.bundles@/org.eclipse.osgi/supplement/src
-;@eclipse.pde@/org.eclipse.pde/src
-;@eclipse.platform.platform@/org.eclipse.platform/src
-;@eclipse.platform.text@/org.eclipse.search/new search
-;@eclipse.platform.text@/org.eclipse.search/search
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Accessibility/common/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Accessibility/win32/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT AWT/common/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT AWT/win32/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Browser/common/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Browser/win32/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Custom Widgets/common/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Drag and Drop/common/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT OLE Win32/win32/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT OpenGL/common
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT OpenGL/emulated
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT OpenGL/glx
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT OpenGL/win32
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT PI/common/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT PI/common_j2se/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT PI/win32/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Printing/common/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Printing/win32/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Program/common/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Program/win32/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT/common/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT/common_j2se/
-;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT/win32/
-;@eclipse.platform.team.bundles@/org.eclipse.team.core/src
-;@eclipse.platform.team.bundles@/org.eclipse.team.ui/src
-;@eclipse.platform.text@/org.eclipse.text/projection
-;@eclipse.platform.text@/org.eclipse.text/src
-;@eclipse.platform.ua@/org.eclipse.ui.cheatsheets/src
-;@eclipse.platform.debug@/org.eclipse.ui.console/src
-;@eclipse.platform.text@/org.eclipse.ui.editors/src
-;@eclipse.platform.ui.bundles@/org.eclipse.ui.forms/src
-;@eclipse.platform.ui.bundles@/org.eclipse.ui.ide/extensions
-;@eclipse.platform.ui.bundles@/org.eclipse.ui.ide/src
-;@eclipse.platform.ua@/org.eclipse.ui.intro.universal/src
-;@eclipse.platform.ua@/org.eclipse.ui.intro/src
-;@eclipse.platform.ui.bundles@/org.eclipse.ui.navigator.resources/src
-;@eclipse.platform.ui.bundles@/org.eclipse.ui.navigator/src
-;@eclipse.platform.ui.bundles@/org.eclipse.ui.views.properties.tabbed/src
-;@eclipse.platform.ui.bundles@/org.eclipse.ui.views/src
-;@eclipse.platform.text@/org.eclipse.ui.workbench.texteditor/src
-;@eclipse.platform.ui.bundles@/org.eclipse.ui.workbench/Eclipse UI
-;@eclipse.platform.ui.bundles@/org.eclipse.ui.workbench/Eclipse UI Editor Support
-;@eclipse.platform.ui.bundles@/org.eclipse.ui/src
-;@eclipse.platform.update@/org.eclipse.update.configurator/src
+;${eclipse.platform.ant}/org.eclipse.ant.core/src
+;${eclipse.platform.team.bundles}/org.eclipse.compare.core/src
+;${eclipse.platform.team.bundles}/org.eclipse.compare/compare
+;${eclipse.platform.ui.bundles}/org.eclipse.core.commands/src
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.contenttype/src
+;${eclipse.platform.ui.bundles}/org.eclipse.core.databinding.beans/src
+;${eclipse.platform.ui.bundles}/org.eclipse.core.databinding.observable/src
+;${eclipse.platform.ui.bundles}/org.eclipse.core.databinding.property/src
+;${eclipse.platform.ui.bundles}/org.eclipse.core.databinding/src
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.expressions/src
+;${eclipse.platform.text}/org.eclipse.core.filebuffers/src
+;${eclipse.platform.resources.bundles}/org.eclipse.core.filesystem/src
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.jobs/src
+;${eclipse.platform.team.bundles}/org.eclipse.core.net/src
+;${eclipse.platform.resources.bundles}/org.eclipse.core.resources/src
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.runtime.compatibility/src-model
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.runtime.compatibility/src-runtime
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.runtime/src
+;${eclipse.platform.debug}/org.eclipse.core.variables/src
+;${eclipse.platform.debug}/org.eclipse.debug.core/core
+;${eclipse.platform.debug}/org.eclipse.debug.ui/ui
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.app/src
+;${eclipse.platform.ui.bundles}/org.eclipse.e4.core.commands/src
+;${eclipse.platform.runtime.bundles}/org.eclipse.e4.core.contexts/src
+;${eclipse.platform.runtime.bundles}/org.eclipse.e4.core.di/src
+;${eclipse.platform.runtime.bundles}/org.eclipse.e4.core.services/src
+;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.bindings/src
+;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.css.core/src
+;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.css.swt/src
+;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.css.swt.theme/src
+;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.di/src
+;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.model.workbench/src
+;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.services/src
+;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.widgets/src
+;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.workbench.renderers.swt/src
+;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.workbench.swt/src
+;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.workbench/src
+;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.workbench3/src
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.bidi/src
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.ds/src
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.common/src
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.frameworkadmin/src
+;${rt.equinox.bundles.bundles}/${eclipse.equinox.http.jetty}/src
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.http.registry/src
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.http.servlet/src
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.jsp.jasper.registry/src
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.jsp.jasper/src
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.preferences/src
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.core/src
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.director/src
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.engine/src
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.metadata/src
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.metadata.repository/src
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.operations/src
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.ql/src
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.repository/src
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.touchpoint.eclipse/src
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.ui/src
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.registry/src
+;${rt.equinox.bundles.bundles}/org.eclipse.equinox.security/src
+;${eclipse.platform.ua}/org.eclipse.help.base/src
+;${eclipse.platform.ua}/org.eclipse.help.base/src_demo
+;${eclipse.platform.ua}/org.eclipse.help.ui/src
+;${eclipse.platform.ua}/org.eclipse.help.webapp/src
+;${eclipse.platform.ua}/org.eclipse.help/src
+;${eclipse.platform.ui.bundles}/org.eclipse.jface.databinding/src
+;${eclipse.platform.text}/org.eclipse.jface.text/projection
+;${eclipse.platform.text}/org.eclipse.jface.text/src
+;${eclipse.platform.ui.bundles}/org.eclipse.jface/src
+;${eclipse.platform.team.bundles}/org.eclipse.jsch.core/src
+;${eclipse.platform.team.bundles}/org.eclipse.jsch.ui/src
+;${eclipse.jdt.ui}/org.eclipse.ltk.core.refactoring/src
+;${eclipse.jdt.ui}/org.eclipse.ltk.ui.refactoring/src
+;${rt.equinox.framework.bundles}/org.eclipse.osgi/core/adaptor
+;${rt.equinox.framework.bundles}/org.eclipse.osgi/core/framework
+;${rt.equinox.framework.bundles}/org.eclipse.osgi/eclipseAdaptor/src
+;${rt.equinox.framework.bundles}/org.eclipse.osgi/security/src
+;${rt.equinox.framework.bundles}/org.eclipse.osgi/supplement/src
+;${eclipse.pde}/org.eclipse.pde/src
+;${eclipse.platform.platform}/org.eclipse.platform/src
+;${eclipse.platform.text}/org.eclipse.search/new search
+;${eclipse.platform.text}/org.eclipse.search/search
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Accessibility/common/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Accessibility/win32/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT AWT/common/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT AWT/win32/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Browser/common/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Browser/win32/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Custom Widgets/common/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Drag and Drop/common/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT OLE Win32/win32/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT OpenGL/common
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT OpenGL/emulated
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT OpenGL/glx
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT OpenGL/win32
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT PI/common/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT PI/common_j2se/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT PI/win32/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Printing/common/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Printing/win32/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Program/common/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Program/win32/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT/common/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT/common_j2se/
+;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT/win32/
+;${eclipse.platform.team.bundles}/org.eclipse.team.core/src
+;${eclipse.platform.team.bundles}/org.eclipse.team.ui/src
+;${eclipse.platform.text}/org.eclipse.text/projection
+;${eclipse.platform.text}/org.eclipse.text/src
+;${eclipse.platform.ua}/org.eclipse.ui.cheatsheets/src
+;${eclipse.platform.debug}/org.eclipse.ui.console/src
+;${eclipse.platform.text}/org.eclipse.ui.editors/src
+;${eclipse.platform.ui.bundles}/org.eclipse.ui.forms/src
+;${eclipse.platform.ui.bundles}/org.eclipse.ui.ide/extensions
+;${eclipse.platform.ui.bundles}/org.eclipse.ui.ide/src
+;${eclipse.platform.ua}/org.eclipse.ui.intro.universal/src
+;${eclipse.platform.ua}/org.eclipse.ui.intro/src
+;${eclipse.platform.ui.bundles}/org.eclipse.ui.navigator.resources/src
+;${eclipse.platform.ui.bundles}/org.eclipse.ui.navigator/src
+;${eclipse.platform.ui.bundles}/org.eclipse.ui.views.properties.tabbed/src
+;${eclipse.platform.ui.bundles}/org.eclipse.ui.views/src
+;${eclipse.platform.text}/org.eclipse.ui.workbench.texteditor/src
+;${eclipse.platform.ui.bundles}/org.eclipse.ui.workbench/Eclipse UI
+;${eclipse.platform.ui.bundles}/org.eclipse.ui.workbench/Eclipse UI Editor Support
+;${eclipse.platform.ui.bundles}/org.eclipse.ui/src
+;${eclipse.platform.update}/org.eclipse.update.configurator/src
 -d reference/api
 -classpath @rt@
-;@dependency.dir@/com.ibm.icu_*.jar
-;@dependency.dir@/com.jcraft.jsch_*.jar
-;@dependency.dir@/javax.annotation_*.jar
-;@dependency.dir@/javax.el_*.jar
-;@dependency.dir@/javax.inject_*.jar
-;@dependency.dir@/javax.servlet_*.jar
-;@dependency.dir@/javax.servlet.jsp_*.jar
-;@dependency.dir@/org.apache.ant_*/lib/ant.jar
-;@dependency.dir@/org.apache.batik.css_*.jar
-;@dependency.dir@/org.apache.jasper.glassfish_*.jar
-;@dependency.dir@/org.apache.lucene.analysis_*.jar
-;@dependency.dir@/org.apache.lucene.core_*.jar
-;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.compatibility.auth/@dot.classes@
-;@dependency.dir@/org.eclipse.ecf.provider.filetransfer_*.jar
-;@dependency.dir@/org.eclipse.ecf.filetransfer_*.jar
-;@dependency.dir@/org.eclipse.ecf_*.jar
-;@dependency.dir@/org.eclipse.ecf.ssl_*.jar
-;@dependency.dir@/org.eclipse.ecf.identity_*.jar
-;@dependency.dir@/org.eclipse.ecf.provider.filetransfer.ssl_*.jar
-;@dependency.dir@/org.eclipse.ecf.provider.filetransfer.httpclient_*.jar
-;@dependency.dir@/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_*.jar
-;@dependency.dir@/org.eclipse.emf.common_*.jar
-;@dependency.dir@/org.eclipse.emf.ecore_*.jar
-;@dependency.dir@/org.eclipse.emf.ecore.xmi_*.jar
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.director/@dot.classes@
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.garbagecollector/@dot.classes@
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.metadata.repository/@dot.classes@
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.publisher/@dot.classes@
-;@rt.equinox.p2.bundles@/org.eclipse.equinox.simpleconfigurator/@dot.classes@
-;@eclipse.platform.supplement@/@dot.classes@
-;@eclipse.platform.ua@/org.eclipse.help.appserver/@dot.classes@
-;@rt.equinox.framework.bundles@/org.eclipse.osgi.services/@dot.classes@
-;@rt.equinox.framework.bundles@/org.eclipse.osgi/@dot.classes@
-;@dependency.dir@/org.eclipse.jetty.continuation_*.jar
-;@dependency.dir@/org.eclipse.jetty.http_*.jar
-;@dependency.dir@/org.eclipse.jetty.io_*.jar
-;@dependency.dir@/org.eclipse.jetty.security_*.jar
-;@dependency.dir@/org.eclipse.jetty.server_*.jar
-;@dependency.dir@/org.eclipse.jetty.servlet_*.jar
-;@dependency.dir@/org.eclipse.jetty.util_*.jar
-;@dependency.dir@/org.sat4j.core_*.jar
-;@dependency.dir@/org.sat4j.pb_*.jar
-;@dependency.dir@/org.w3c.css.sac_*.jar
+;${dependency.dir}/com.ibm.icu_*.jar
+;${dependency.dir}/com.jcraft.jsch_*.jar
+;${dependency.dir}/javax.annotation_*.jar
+;${dependency.dir}/javax.el_*.jar
+;${dependency.dir}/javax.inject_*.jar
+;${dependency.dir}/javax.servlet_*.jar
+;${dependency.dir}/javax.servlet.jsp_*.jar
+;${dependency.dir}/org.apache.ant_*/lib/ant.jar
+;${dependency.dir}/org.apache.batik.css_*.jar
+;${dependency.dir}/org.apache.jasper.glassfish_*.jar
+;${dependency.dir}/org.apache.lucene.analysis_*.jar
+;${dependency.dir}/org.apache.lucene.core_*.jar
+;${eclipse.platform.runtime.bundles}/org.eclipse.core.runtime.compatibility.auth/${dot.classes}
+;${dependency.dir}/org.eclipse.ecf.provider.filetransfer_*.jar
+;${dependency.dir}/org.eclipse.ecf.filetransfer_*.jar
+;${dependency.dir}/org.eclipse.ecf_*.jar
+;${dependency.dir}/org.eclipse.ecf.ssl_*.jar
+;${dependency.dir}/org.eclipse.ecf.identity_*.jar
+;${dependency.dir}/org.eclipse.ecf.provider.filetransfer.ssl_*.jar
+;${dependency.dir}/org.eclipse.ecf.provider.filetransfer.httpclient_*.jar
+;${dependency.dir}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_*.jar
+;${dependency.dir}/org.eclipse.emf.common_*.jar
+;${dependency.dir}/org.eclipse.emf.ecore_*.jar
+;${dependency.dir}/org.eclipse.emf.ecore.xmi_*.jar
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.director/${dot.classes}
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.garbagecollector/${dot.classes}
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.metadata.repository/${dot.classes}
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.publisher/${dot.classes}
+;${rt.equinox.p2.bundles}/org.eclipse.equinox.simpleconfigurator/${dot.classes}
+;${eclipse.equinox.supplement}/${dot.classes}
+;${eclipse.platform.ua}/org.eclipse.help.appserver/${dot.classes}
+;${rt.equinox.framework.bundles}/org.eclipse.osgi.services/${dot.classes}
+;${rt.equinox.framework.bundles}/org.eclipse.osgi/${dot.classes}
+;${dependency.dir}/org.eclipse.jetty.continuation_*.jar
+;${dependency.dir}/org.eclipse.jetty.http_*.jar
+;${dependency.dir}/org.eclipse.jetty.io_*.jar
+;${dependency.dir}/org.eclipse.jetty.security_*.jar
+;${dependency.dir}/org.eclipse.jetty.server_*.jar
+;${dependency.dir}/org.eclipse.jetty.servlet_*.jar
+;${dependency.dir}/org.eclipse.jetty.util_*.jar
+;${dependency.dir}/org.sat4j.core_*.jar
+;${dependency.dir}/org.sat4j.pb_*.jar
+;${dependency.dir}/org.w3c.css.sac_*.jar
 -breakiterator
 -use
 -splitIndex
@@ -192,7 +192,7 @@
 -link http://www.osgi.org/javadoc/r5/core
 -link http://www.osgi.org/javadoc/r4v42
 
-@rt.equinox.framework.bundles@/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
+${rt.equinox.framework.bundles}/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
 
 org.eclipse.ant.core
 org.eclipse.compare