diff options
6 files changed, 39 insertions, 45 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml b/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml index c91297de2f..0620c1fd4a 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml +++ b/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml @@ -14,6 +14,7 @@ <target name="init"> <available file="${basedir}/index" property="index.present"/> <delete file="jptOptions.tmp.txt"/> + <delete file="jptClasspath.tmp.properties"/> </target> <target name="all" depends="init" unless="index.present"> @@ -32,16 +33,17 @@ <available file="${java.home}/../bin/javadoc" property="javadoc" value="${java.home}/../bin/javadoc" /> </target> - <target name="generateJavadoc" depends="getJavadocPath" if="javadoc"> - <property name="base.install.dir" value="../../../eclipse/plugins" /> <echo message="#### jpt.doc.isv #### - java.home = ${java.home}" /> - <echo message="base.install.dir = ${base.install.dir}" /> - <echo message="install.destination = ${install.destination}" /> + <echo message="${base.install.dir} NOT SET" /> + <echo message="${install.destination} NOT SET" /> + + <property name="base.install.dir" value="../../../eclipse/plugins" /> <property name="optionsFile" value="jptOptions.tmp.txt" /> <copy file="jptOptions.txt" tofile="${optionsFile}" overwrite="true" /> - + <copy file="jptClasspath.template" tofile="jptClasspath.tmp.properties" overwrite="true" /> + <condition property="pathSeparator" value=":"> <os family="unix" /> </condition> @@ -49,20 +51,10 @@ <os family="windows" /> </condition> - <fileset id="jreJars" dir="${java.home}/lib"> - <include name="*.jar" /> - </fileset> - <pathconvert pathsep="${pathSeparator}" property="jreClasspath" refid="jreJars"/> - - <replace file="${basedir}/${optionsFile}" token="@rt@" value="${jreClasspath}" /> - - <fileset id="wtpJars" dir="${base.install.dir}"> - <include name="*.jar" /> - </fileset> - <pathconvert pathsep="${pathSeparator}" property="wtpClasspath" refid="wtpJars"/> - - <replace file="${basedir}/${optionsFile}" token="@wtprt@" value="${wtpClasspath}" /> - + <antcall target="replaceRtTokens" /> + + <antcall target="replaceWtpRtTokens" /> + <antcall target="replacePackageTokens"> <param name="packageName" value="jpt.common.utility" /> </antcall> @@ -73,6 +65,8 @@ <param name="packageName" value="jpt.common.ui" /> </antcall> + <antcall target="replaceJptRtTokens" /> + <replaceregexp file="${basedir}/${optionsFile}" flags="g" match=";" replace="${pathSeparator}" /> <!--scrub isv plugin directories of any preexisting doc content--> @@ -85,6 +79,30 @@ </exec> </target> + <!-- replaceRtTokens --> + <target name="replaceRtTokens" if="optionsFile" > + <fileset id="jreJars" dir="${java.home}/lib"> + <include name="*.jar" /> + </fileset> + <pathconvert pathsep="${pathSeparator}" property="jreClasspath" refid="jreJars"/> + <replace file="${basedir}/${optionsFile}" token="@rt@" value="${jreClasspath}" /> + </target> + + <!-- replaceWtpRtTokens --> + <target name="replaceWtpRtTokens" if="optionsFile" > + <fileset id="wtpJars" dir="${base.install.dir}"> + <include name="*.jar" /> + </fileset> + <pathconvert pathsep="${pathSeparator}" property="wtpClasspath" refid="wtpJars"/> + <replace file="${basedir}/${optionsFile}" token="@wtprt@" value="${wtpClasspath}" /> + </target> + + <!-- replaceJptRtTokens --> + <target name="replaceJptRtTokens" if="optionsFile" > + <property file="jptClasspath.tmp.properties" /> + <replace file="${basedir}/${optionsFile}" token="@jptrt@" value="${jptClasspath}" /> + </target> + <!-- replacePackageTokens --> <target name="replacePackageTokens" if="optionsFile"> <echo message="${packageName}" /> @@ -95,29 +113,11 @@ <replacefilter token="@${packageName}.sourcepath@" property="${packageName}.sourcepath"/> - <replacefilter - token="@${packageName}.classpath@" - property="${packageName}.classpath"/> <replacefilter token="@${packageName}.packages@" property="${packageName}.packages"/> </replace> </target> - - <!-- common utility package --> - <target name="replaceJptCommonUtility" if="optionsFile"> - <replace - file="${basedir}/${optionsFile}" - propertyfile="${basedir}/jptCommonUtility.properties"> - - <replacefilter - token="@commonUtilitySourcepath@" - property="common.utility.sourcepath"/> - <replacefilter - token="@commonUtilityPackages@" - property="common.utility.packages"/> - </replace> - </target> <target name="buildJptDoc" unless="jpt.index.present"> <ant antfile="buildDoc.xml" dir="../org.eclipse.jpt.doc.isv" /> diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.core.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.core.properties index 88fddd48de..0e93c58813 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.core.properties +++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.core.properties @@ -1,7 +1,5 @@ jpt.common.core.sourcepath = ../org.eclipse.jpt.common.core/src -jpt.common.core.classpath = ../org.eclipse.jpt.common.utility/@dot - jpt.common.core.packages = org.eclipse.jpt.common.core\n\ org.eclipse.jpt.common.core.gen\n\ org.eclipse.jpt.common.core.libprov\n\ diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.ui.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.ui.properties index 19c40b9b03..632182ec75 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.ui.properties +++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.ui.properties @@ -1,8 +1,5 @@ jpt.common.ui.sourcepath = ../org.eclipse.jpt.common.ui/src -jpt.common.ui.classpath = ../org.eclipse.jpt.common.core/@dot;\ - ../org.eclipse.jpt.common.utility/@dot - jpt.common.ui.packages = org.eclipse.jpt.common.ui\n\ org.eclipse.jpt.common.ui.gen\n\ org.eclipse.jpt.common.ui.jface diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.utility.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.utility.properties index f8307a1706..a04b1b0952 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.utility.properties +++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jpt.common.utility.properties @@ -1,7 +1,5 @@ jpt.common.utility.sourcepath = ../org.eclipse.jpt.common.utility/src -jpt.common.utility.classpath = - jpt.common.utility.packages = org.eclipse.jpt.common.utility\n\ org.eclipse.jpt.common.utility.command\n\ org.eclipse.jpt.common.utility.model\n\ diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jptClasspath.template b/jpa/plugins/org.eclipse.jpt.doc.isv/jptClasspath.template new file mode 100644 index 0000000000..3cd2f3f441 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jptClasspath.template @@ -0,0 +1 @@ +jptClasspath =
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt b/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt index 605b832f9c..11dcd61044 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt +++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt @@ -1,6 +1,6 @@ -charset "utf-8" -sourcepath "@jpt.common.utility.sourcepath@;@jpt.common.core.sourcepath@;@jpt.common.ui.sourcepath@" --classpath @rt@;@jpt.common.core.classpath@;@jpt.common.ui.classpath@;@wtprt@ +-classpath @rt@;@jptrt@;@wtprt@ -breakiterator -use -splitIndex |