diff options
author | Tran Le | 2012-09-19 00:14:08 +0000 |
---|---|---|
committer | Tran Le | 2012-09-19 00:14:08 +0000 |
commit | 40909c95814df1cce94dd935e735cc410ce402b4 (patch) | |
tree | c173a81c17f339b69e9aed250472dd5d99edad9c | |
parent | d073d4fd0ca13613bac87c9381d54ecad78e9b1d (diff) | |
download | webtools.dali-40909c95814df1cce94dd935e735cc410ce402b4.tar.gz webtools.dali-40909c95814df1cce94dd935e735cc410ce402b4.tar.xz webtools.dali-40909c95814df1cce94dd935e735cc410ce402b4.zip |
Reworked properties filesv201209190015
5 files changed, 13 insertions, 131 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml b/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml index 71a98fa8f5..4761a267e7 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml +++ b/jpa/plugins/org.eclipse.jpt.doc.isv/buildDoc.xml @@ -13,6 +13,7 @@ <target name="init"> <available file="${basedir}/index" property="index.present"/> + <delete file="jptOptions.tmp.txt"/> </target> <target name="all" depends="init" unless="index.present"> @@ -43,9 +44,7 @@ <condition property="argsListDelimiter" value=";"> <os family="windows" /> </condition> -<!-- - <replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" /> ---> + <replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" /> <antcall target="replaceJptCommonUtility" /> @@ -57,6 +56,7 @@ </antcall> <replaceregexp file="${basedir}/${optionsFile}" flags="g" match=";" replace="${argsListDelimiter}" /> + <!-- <antcall target="replaceJptCommonCore" /> <antcall target="replaceJptCommonUi" /> @@ -84,19 +84,16 @@ <replacefilter token="@${packageName}.sourcepath@" property="${packageName}.sourcepath"/> - <replacefilter + <replacefilter token="@${packageName}.classpath@" property="${packageName}.classpath"/> <replacefilter token="@${packageName}.packages@" property="${packageName}.packages"/> </replace> - - <echo message="propertyfile = ${packageName}.properties" /> - <echo message="packageName = ${packageName}" /> </target> - - <!-- common packages --> + + <!-- common utility package --> <target name="replaceJptCommonUtility" if="optionsFile"> <replace file="${basedir}/${optionsFile}" @@ -109,51 +106,6 @@ token="@commonUtilityPackages@" property="common.utility.packages"/> </replace> - - <echo message="common.utility.sourcepath = ${common.utility.sourcepath}" /> - <echo message="common.utility.packages = ${common.utility.packages}" /> - </target> - - <target name="replaceJptCommonCore" if="optionsFile"> - <replace - file="${basedir}/${optionsFile}" - propertyfile="${basedir}/jptCommonCore.properties"> - - <replacefilter - token="@commonCoreSourcepath@" - property="common.core.sourcepath"/> - <replacefilter - token="@commonCoreClasspath@" - property="common.core.classpath"/> - <replacefilter - token="@commonCorePackages@" - property="common.core.packages"/> - </replace> - - <echo message="common.core.sourcepath = ${common.core.sourcepath}" /> - <echo message="common.core.classpath = ${common.core.classpath}" /> - <echo message="common.core.packages = ${common.core.packages}" /> - </target> - - <target name="replaceJptCommonUi" if="optionsFile"> - <replace - file="${basedir}/${optionsFile}" - propertyfile="${basedir}/jptCommonUi.properties"> - - <replacefilter - token="@commonUiSourcepath@" - property="common.ui.sourcepath"/> - <replacefilter - token="@commonUiClasspath@" - property="common.ui.classpath"/> - <replacefilter - token="@commonUiPackages@" - property="common.ui.packages"/> - </replace> - - <echo message="common.ui.sourcepath = ${common.ui.sourcepath}" /> - <echo message="common.ui.classpath = ${common.ui.classpath}" /> - <echo message="common.ui.packages = ${common.ui.packages}" /> </target> <target name="buildJptDoc" unless="jpt.index.present"> @@ -168,17 +120,3 @@ </target> </project> - - - - - - - - - - - - - - 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 21ee566401..88fddd48de 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,27 +1,6 @@ jpt.common.core.sourcepath = ../org.eclipse.jpt.common.core/src -jpt.common.core.classpath = ../org.eclipse.core.expressions/@dot;\ - ../org.eclipse.core.filebuffers/@dot;\ - ../org.eclipse.core.resources/@dot;\ - ../org.eclipse.core.runtime/@dot;\ - ../org.eclipse.debug.core/@dot;\ - ../org.eclipse.emf.ecore.xmi/@dot;\ - ../org.eclipse.jdt.core/@dot;\ - ../org.eclipse.jdt.launching/@dot;\ - ../org.eclipse.jem.util/@dot;\ - ../org.eclipse.jpt.common.utility/@dot;\ - ../org.eclipse.jst.common.project.facet.core/@dot;\ - ../org.eclipse.jst.j2ee/@dot;\ - ../org.eclipse.jst.j2ee.core/@dot;\ - ../org.eclipse.pde.core/@dot;\ - ../org.eclipse.text/@dot;\ - ../org.eclipse.wst.common.emf/@dot;\ - ../org.eclipse.wst.common.emfworkbench.integration/@dot;\ - ../org.eclipse.wst.common.frameworks/@dot;\ - ../org.eclipse.wst.common.project.facet.core/@dot;\ - ../org.eclipse.wst.sse.core/@dot;\ - ../org.eclipse.wst.validation/@dot;\ - ../org.eclipse.wst.xml.core/@dot +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\ 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 3c76c12a00..72cacd84af 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,20 +1,7 @@ jpt.common.ui.sourcepath = ../org.eclipse.jpt.common.ui/src -jpt.common.ui.classpath = ../org.eclipse.core.resources/@dot;\ - ../org.eclipse.draw2d/@dot;\ - ../org.eclipse.emf.ecore.xmi/@dot;\ - ../org.eclipse.jdt.core/@dot;\ - ../org.eclipse.jdt.ui/@dot;\ - ../org.eclipse.jface/@dot;\ - ../org.eclipse.jface.text/@dot;\ - ../org.eclipse.jpt.common.core/@dot;\ - ../org.eclipse.jpt.common.utility/@dot;\ - ../org.eclipse.jst.common.project.facet.core/@dot;\ - ../org.eclipse.jst.common.project.facet.ui/@dot;\ - ../org.eclipse.ui.ide/@dot;\ - ../org.eclipse.ui.navigator/@dot;\ - ../org.eclipse.ui.views.properties.tabbed/@dot;\ - ../org.eclipse.wst.common.project.facet.ui/@dot +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\ diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jptCommonCore.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/jptCommonCore.properties index 98b46b6612..88fddd48de 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.isv/jptCommonCore.properties +++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jptCommonCore.properties @@ -1,29 +1,8 @@ -common.core.sourcepath = ../org.eclipse.jpt.common.core/src +jpt.common.core.sourcepath = ../org.eclipse.jpt.common.core/src -common.core.classpath = ../org.eclipse.core.expressions/@dot;\ - ../org.eclipse.core.filebuffers/@dot;\ - ../org.eclipse.core.resources/@dot;\ - ../org.eclipse.core.runtime/@dot;\ - ../org.eclipse.debug.core/@dot;\ - ../org.eclipse.emf.ecore.xmi/@dot;\ - ../org.eclipse.jdt.core/@dot;\ - ../org.eclipse.jdt.launching/@dot;\ - ../org.eclipse.jem.util/@dot;\ - ../org.eclipse.jpt.common.utility/@dot;\ - ../org.eclipse.jst.common.project.facet.core/@dot;\ - ../org.eclipse.jst.j2ee/@dot;\ - ../org.eclipse.jst.j2ee.core/@dot;\ - ../org.eclipse.pde.core/@dot;\ - ../org.eclipse.text/@dot;\ - ../org.eclipse.wst.common.emf/@dot;\ - ../org.eclipse.wst.common.emfworkbench.integration/@dot;\ - ../org.eclipse.wst.common.frameworks/@dot;\ - ../org.eclipse.wst.common.project.facet.core/@dot;\ - ../org.eclipse.wst.sse.core/@dot;\ - ../org.eclipse.wst.validation/@dot;\ - ../org.eclipse.wst.xml.core/@dot +jpt.common.core.classpath = ../org.eclipse.jpt.common.utility/@dot -common.core.packages = org.eclipse.jpt.common.core\n\ +jpt.common.core.packages = org.eclipse.jpt.common.core\n\ org.eclipse.jpt.common.core.gen\n\ org.eclipse.jpt.common.core.libprov\n\ org.eclipse.jpt.common.core.libval\n\ diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt b/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt index 04ec0d8e88..c99208c8b2 100644 --- a/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt +++ b/jpa/plugins/org.eclipse.jpt.doc.isv/jptOptions.txt @@ -1,7 +1,6 @@ --quiet -charset "utf-8" -sourcepath "@commonUtilitySourcepath@;@jpt.common.core.sourcepath@;@jpt.common.ui.sourcepath@" --classpath @rt@;@jpt.common.core.classpath@;@jpt.common.ui.classpath@ +-classpath @jpt.common.core.classpath@;@jpt.common.ui.classpath@ -breakiterator -use -splitIndex |