You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/05/09 16:38:57 UTC
svn commit: r169319 -
/incubator/beehive/trunk/samples/controls-blank/build.properties
/incubator/beehive/trunk/samples/controls-blank/build.xml
Author: ekoneil
Date: Mon May 9 07:38:55 2005
New Revision: 169319
URL: http://svn.apache.org/viewcvs?rev=169319&view=rev
Log:
Fixup the controls-blank project template to use a build.properties file and to remove references to ${os.BEEHIVE_HOME}
BB: self
DRT: none
Test: copied controls-blank to foo/ and built the control project successfully
Added:
incubator/beehive/trunk/samples/controls-blank/build.properties (with props)
Modified:
incubator/beehive/trunk/samples/controls-blank/build.xml
Added: incubator/beehive/trunk/samples/controls-blank/build.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-blank/build.properties?rev=169319&view=auto
==============================================================================
--- incubator/beehive/trunk/samples/controls-blank/build.properties (added)
+++ incubator/beehive/trunk/samples/controls-blank/build.properties Mon May 9 07:38:55 2005
@@ -0,0 +1,5 @@
+#
+#
+#
+
+beehive.home=../..
\ No newline at end of file
Propchange: incubator/beehive/trunk/samples/controls-blank/build.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/samples/controls-blank/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-blank/build.xml?rev=169319&r1=169318&r2=169319&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/controls-blank/build.xml (original)
+++ incubator/beehive/trunk/samples/controls-blank/build.xml Mon May 9 07:38:55 2005
@@ -1,81 +1,75 @@
<?xml version="1.0" ?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+ -->
<project name="controls-blank" default="usage">
<property environment="os"/>
-
- <property name="beehive.home" value="${os.BEEHIVE_HOME}"/>
+ <property file="build.properties"/>
+ <import file="${beehive.home}/beehive-imports.xml"/>
+ <import file="${beehive.home}/ant/beehive-tools.xml"/>
<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="beehive-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}"/>
- </path>
-
- <path id="velocity.dependency.path">
- <pathelement location="${beehive.home}/lib/common/velocity-1.4.jar"/>
- <pathelement location="${beehive.home}/lib/common/velocity-dep-1.4.jar"/>
- </path>
<path id="build.classpath">
- <path refid="tools.dependency.path"/>
- <path refid="velocity.dependency.path"/>
- <path refid="controls.dependency.path"/>
<pathelement path="${build.classes}"/>
+ <path refid="controls.dependency.path"/>
</path>
- <taskdef name="apt" classname="org.apache.beehive.controls.runtime.generator.AptTask"
- onerror="report">
- <classpath><path refid="controls.dependency.path"/></classpath>
- </taskdef>
<taskdef name="control-jar"
classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
onerror="report">
<classpath><path refid="controls.dependency.path"/></classpath>
</taskdef>
- <target name="usage">
+ <target name="clean" description="Delete all generated files">
+ <delete dir="${build.dir}"/>
+ <delete file="velocity.log"/>
+ </target>
+
+ <target name="build" depends="dirs" description="Build control sources">
+ <mkdir dir="${build.classes}"/>
+ <mkdir dir="${build.beansrc}"/>
+
+ <build-controls srcdir="${source.dir}"
+ destdir="${build.classes}"
+ tempdir="${build.beansrc}"
+ classpathref="build.classpath"/>
+
+ <control-jar destfile="${build.dir}/${build.jar}" basedir="${build.classes}" />
+ </target>
+
+ <target name="usage" description="Print the usage for this build.xml">
+ <echo message=""/>
+ <echo message=""/>
+ <echo message="Controls Project Template Build file"/>
<echo message=""/>
<echo message=""/>
- <echo message="Controls Template Build file"/>
- <echo message="================================================================"/>
- <echo message="| Usage |"/>
- <echo message="================================================================"/>
<echo message="----------------------------------------------------------------"/>
<echo message="| Standard Targets |"/>
<echo message="----------------------------------------------------------------"/>
<echo message="clean - Delete all generated files"/>
- <echo message="build - build controls"/>
+ <echo message="build - Build control sources"/>
<echo message="----------------------------------------------------------------"/>
- </target>
-
- <target name="clean" description="Deletes all generated files">
- <delete dir="${build.dir}"/>
- <delete file="velocity.log"/>
- </target>
-
- <target name="dirs">
- <mkdir dir="${build.classes}" />
- <mkdir dir="${build.beansrc}" />
- </target>
-
- <target name="build" depends="dirs" description="Builds controls sources">
- <apt srcdir="${source.dir}" destdir="${build.classes}" gendir="${build.beansrc}"
- classpathref="build.classpath"
- debug="on"
- compileByExtension="true"
- srcExtensions="*.java,*.jcx,*.jcs">
- </apt>
- <control-jar destfile="${build.dir}/${build.jar}" basedir="${build.classes}" />
</target>
</project>