Author: kentam
Date: Thu Mar 3 17:06:01 2005
New Revision: 156113
URL: http://svn.apache.org/viewcvs?view=rev&rev=156113
Log:
Fix controls samples build.
Make svn revision label creation optional.
Modified:
incubator/beehive/trunk/build.xml
incubator/beehive/trunk/samples/controls-blank/build.xml
incubator/beehive/trunk/samples/controls-db/build.xml
Modified: incubator/beehive/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/build.xml?view=diff&r1=156112&r2=156113
==============================================================================
--- incubator/beehive/trunk/build.xml (original)
+++ incubator/beehive/trunk/build.xml Thu Mar 3 17:06:01 2005
@@ -36,7 +36,7 @@
<target name="revision.label" description="Creates svn revision label
file">
<mkdir dir="${beehive.home}/build"/>
- <exec executable="svnversion" outputproperty="svn.revision">
+ <exec executable="svnversion" outputproperty="svn.revision"
failifexecutionfails="false">
<arg value="."/>
</exec>
<echo message="Apache Beehive svn revision #${svn.revision}"
file="${beehive.home}/build/svn.rev"/>
Modified: incubator/beehive/trunk/samples/controls-blank/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-blank/build.xml?view=diff&r1=156112&r2=156113
==============================================================================
--- incubator/beehive/trunk/samples/controls-blank/build.xml (original)
+++ incubator/beehive/trunk/samples/controls-blank/build.xml Thu Mar 3
17:06:01 2005
@@ -4,18 +4,21 @@
<property environment="os"/>
+ <property name="beehive.home" value="${os.BEEHIVE_HOME}"/>
+
<property name="source.dir" value="${basedir}/src"/>
<property name="build.dir" value="${basedir}/build"/>
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.beansrc" value="${build.dir}/beansrc"/>
<property name="build.jar" value="mycontrols.jar"/>
+ <property name="controls.jar" value="controls.jar"/>
<path id="tools.dependency.path">
<pathelement location="${os.JAVA_HOME}/lib/tools.jar"/>
</path>
<path id="controls.dependency.path">
- <pathelement location="${beehive.home}/lib/controls/controls.jar"/>
+ <pathelement location="${beehive.home}/lib/controls/${controls.jar}"/>
</path>
<path id="velocity.dependency.path">
@@ -31,10 +34,14 @@
</path>
<taskdef name="apt"
classname="org.apache.beehive.controls.runtime.generator.AptTask"
- classpath="${controls.jar}" onerror="report" />
+ onerror="report">
+ <classpath><path refid="controls.dependency.path"/></classpath>
+ </taskdef>
<taskdef name="control-jar"
classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
- classpath="${controls.jar}" onerror="report" />
+ onerror="report">
+ <classpath><path refid="controls.dependency.path"/></classpath>
+ </taskdef>
<target name="usage">
<echo message=""/>
Modified: incubator/beehive/trunk/samples/controls-db/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-db/build.xml?view=diff&r1=156112&r2=156113
==============================================================================
--- incubator/beehive/trunk/samples/controls-db/build.xml (original)
+++ incubator/beehive/trunk/samples/controls-db/build.xml Thu Mar 3 17:06:01
2005
@@ -4,6 +4,8 @@
<property environment="os"/>
+ <property name="beehive.home" value="${os.BEEHIVE_HOME}"/>
+
<property name="source.dir" value="${basedir}/src"/>
<property name="build.dir" value="${basedir}/build"/>
<property name="build.classes" value="${build.dir}/classes"/>
@@ -11,13 +13,12 @@
<property name="build.jar" value="dbControl.jar"/>
<path id="controls.classpath">
- <pathelement location="../../lib/controls/controls.jar"/>
+ <pathelement location="${beehive.home}/lib/controls/controls.jar"/>
</path>
<path id="build.classpath">
<path refid="controls.classpath"/>
- <pathelement location="../../lib/common/velocity-1.4.jar"/>
- <pathelement location="../../lib/common/velocity-dep-1.4.jar"/>
- <pathelement location="../../lib/controls/controls.jar"/>
+ <pathelement location="${beehive.home}/lib/common/velocity-1.4.jar"/>
+ <pathelement
location="${beehive.home}/lib/common/velocity-dep-1.4.jar"/>
<pathelement location="${os.JAVA_HOME}/lib/tools.jar"/>
<pathelement path="${build.classes}"/>
</path>
