From d7ef00b69cbe5407a9e5e448b5f7ed40f97dfcd9 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sun, 9 Dec 2007 01:52:56 +0000
Subject: [PATCH] simplify build parameters
---
docs/org.eclipse.jst.doc.isv/javadoc.xml | 12 ++++++------
docs/org.eclipse.wst.doc.isv/javadoc.xml | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/docs/org.eclipse.jst.doc.isv/javadoc.xml b/docs/org.eclipse.jst.doc.isv/javadoc.xml
index 11e4a31bd..3e58e675d 100644
--- a/docs/org.eclipse.jst.doc.isv/javadoc.xml
+++ b/docs/org.eclipse.jst.doc.isv/javadoc.xml
@@ -28,10 +28,10 @@
</target>
<target name="javadoc">
- <echo message="classpath: ${env.J2SE15}" />
+ <echo message="classpath: ${J2SE-1.5}" />
<echo message="buildDirectory: ${buildDirectory}" />
- <echo message="JAVADOC_COMMAND: ${env.JAVADOC_COMMAND}" />
- <echo message="JAVADOC_ARGS: ${env.JAVADOC_ARGS}" />
+ <echo message="JAVADOC_COMMAND: ${JAVADOC_COMMAND}" />
+ <echo message="JAVADOC_ARGS: ${JAVADOC_ARGS}" />
<mkdir dir="${outputDir}/reference/api/overview" />
@@ -44,7 +44,7 @@
includes="*/javadoc-images/*.jpg" />
</copy>
<javadoc
- executable="${env.JAVADOC_COMMAND}"
+ executable="${JAVADOC_COMMAND}"
access="public"
author="false"
destdir="${outputDir}/reference/api"
@@ -64,9 +64,9 @@
breakiterator="yes"
verbose="false"
failonerror="false">
- <arg line="${env.JAVADOC_ARGS}"/>
+ <arg line="${JAVADOC_ARGS}"/>
<classpath>
- <pathelement path="${env.J2SE15}" />
+ <pathelement path="${J2SE-1.5}" />
<fileset dir="${buildDirectory}/../eclipse/plugins">
<include name="**/*.jar" />
</fileset>
diff --git a/docs/org.eclipse.wst.doc.isv/javadoc.xml b/docs/org.eclipse.wst.doc.isv/javadoc.xml
index a0188cfaa..0820a18ae 100644
--- a/docs/org.eclipse.wst.doc.isv/javadoc.xml
+++ b/docs/org.eclipse.wst.doc.isv/javadoc.xml
@@ -28,9 +28,9 @@
</target>
<target name="javadoc">
- <echo message="classpath: ${env.J2SE15}" />
+ <echo message="classpath: ${J2SE-1.5}" />
<echo message="buildDirectory: ${buildDirectory}" />
- <echo message="JAVADOC_COMMAND: ${env.JAVADOC_COMMAND}" />
+ <echo message="JAVADOC_COMMAND: ${JAVADOC_COMMAND}" />
<mkdir dir="${outputDir}/reference/api/overview" />
@@ -43,7 +43,7 @@
includes="*/javadoc-images/*.jpg" />
</copy>
<javadoc
- executable="${env.JAVADOC_COMMAND}"
+ executable="${JAVADOC_COMMAND}"
access="public"
author="false"
destdir="${outputDir}/reference/api"
@@ -63,9 +63,9 @@
breakiterator="yes"
verbose="false"
failonerror="false">
- <arg line="${env.JAVADOC_ARGS}"/>
+ <arg line="${JAVADOC_ARGS}"/>
<classpath>
- <pathelement path="${env.J2SE15}" />
+ <pathelement path="${J2SE-1.5}" />
<fileset dir="${buildDirectory}/../eclipse/plugins">
<include name="**/*.jar" />
</fileset>
--
GitLab