You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hivemind.apache.org by hl...@apache.org on 2005/07/01 07:01:40 UTC
svn commit: r208713 - in /jakarta/hivemind/trunk: ./ examples/ hivebuild/
Author: hlship
Date: Thu Jun 30 22:01:38 2005
New Revision: 208713
URL: http://svn.apache.org/viewcvs?rev=208713&view=rev
Log:
Rework the hivebuild scripts to build target directories in java.io.tmpdir, rather than in the workspace.
Removed:
jakarta/hivemind/trunk/version.properties
Modified:
jakarta/hivemind/trunk/build.properties
jakarta/hivemind/trunk/build.xml
jakarta/hivemind/trunk/examples/build.xml
jakarta/hivemind/trunk/forrest.properties
jakarta/hivemind/trunk/hivebuild/dependency.xml
jakarta/hivemind/trunk/hivebuild/dist.properties
jakarta/hivemind/trunk/hivebuild/dist.xml
jakarta/hivemind/trunk/hivebuild/hivebuild.properties
jakarta/hivemind/trunk/hivebuild/hivebuild.xml
jakarta/hivemind/trunk/hivebuild/module.properties
jakarta/hivemind/trunk/hivebuild/module.xml
jakarta/hivemind/trunk/hivebuild/project.xml
jakarta/hivemind/trunk/project.properties
Modified: jakarta/hivemind/trunk/build.properties
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/build.properties?rev=208713&r1=208712&r2=208713&view=diff
==============================================================================
--- jakarta/hivemind/trunk/build.properties (original)
+++ jakarta/hivemind/trunk/build.properties Thu Jun 30 22:01:38 2005
@@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-javassist.version=3.0
\ No newline at end of file
+javassist.version=3.0
Modified: jakarta/hivemind/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/build.xml?rev=208713&r1=208712&r2=208713&view=diff
==============================================================================
--- jakarta/hivemind/trunk/build.xml (original)
+++ jakarta/hivemind/trunk/build.xml Thu Jun 30 22:01:38 2005
@@ -36,6 +36,8 @@
<fileset dir="${external.lib.dir}" includes="*.jar"/>
</path>
+ <property name="hivedoc.registry.file" value="${project.target.dir}/registry.xml"/>
+
<import file="${hivebuild.dir}/hivedoc-report.xml"/>
<import file="${hivebuild.dir}/dist.xml"/>
Modified: jakarta/hivemind/trunk/examples/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/examples/build.xml?rev=208713&r1=208712&r2=208713&view=diff
==============================================================================
--- jakarta/hivemind/trunk/examples/build.xml (original)
+++ jakarta/hivemind/trunk/examples/build.xml Thu Jun 30 22:01:38 2005
@@ -17,7 +17,11 @@
<project name="HiveMind Examples" default="jar">
<property name="module.name" value="hivemind-examples"/>
<property name="javadoc.package" value="com.panorama.*"/>
+
+ <!-- Override the default, and leave the examples.jar in the local target directory. -->
+
<property name="module.install.dir" value="target"/>
+
<property name="root.dir" value=".."/>
<property file="${root.dir}/build.properties"/>
<import file="${root.dir}/hivebuild/jar-module.xml"/>
Modified: jakarta/hivemind/trunk/forrest.properties
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/forrest.properties?rev=208713&r1=208712&r2=208713&view=diff
==============================================================================
--- jakarta/hivemind/trunk/forrest.properties (original)
+++ jakarta/hivemind/trunk/forrest.properties Thu Jun 30 22:01:38 2005
@@ -13,6 +13,7 @@
# limitations under the License.
project.name=HiveMind
+project.target.root=${java.io.tmpdir}/jakarta-hivemind/target
forrest.echo=on
project.debuglevel=DEBUG
@@ -20,9 +21,9 @@
project.configfile=${project.home}/src/documentation/conf/cli.xconf
-project.build-dir=${project.home}/target/forrest
-project.site-dir=${project.home}/target/docs
-project.temp-dir=${project.home}/target/forrest-temp
+project.build-dir=${project.target.root}/forrest
+project.site-dir=${project.target.root}/docs
+project.temp-dir=${project.target.root}/forrest-temp
project.content-dir=target/forrest-composite
project.required.plugins=org.apache.forrest.plugin.input.projectInfo
Modified: jakarta/hivemind/trunk/hivebuild/dependency.xml
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/hivebuild/dependency.xml?rev=208713&r1=208712&r2=208713&view=diff
==============================================================================
--- jakarta/hivemind/trunk/hivebuild/dependency.xml (original)
+++ jakarta/hivemind/trunk/hivebuild/dependency.xml Thu Jun 30 22:01:38 2005
@@ -156,7 +156,7 @@
<attribute name="use" default="compile" description="Useage of the dependency: compile, test or run."/>
<sequential>
- <module-lib-copy fromdir="${project.target.dir}"
+ <module-lib-copy fromdir="${external.lib.dir}"
artifact="@{artifact}"
version="@{version}"
use="@{use}"/>
Modified: jakarta/hivemind/trunk/hivebuild/dist.properties
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/hivebuild/dist.properties?rev=208713&r1=208712&r2=208713&view=diff
==============================================================================
--- jakarta/hivemind/trunk/hivebuild/dist.properties (original)
+++ jakarta/hivemind/trunk/hivebuild/dist.properties Thu Jun 30 22:01:38 2005
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-dist.dir=${target.dir}/dist
+dist.dir=${local.target.dir}/dist
dist.base.name=${dist.name}-${project.version}
dist.basefile=${dist.dir}/${dist.base.name}
dist.docs.file=${dist.base.name}-docs.tar.gz
Modified: jakarta/hivemind/trunk/hivebuild/dist.xml
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/hivebuild/dist.xml?rev=208713&r1=208712&r2=208713&view=diff
==============================================================================
--- jakarta/hivemind/trunk/hivebuild/dist.xml (original)
+++ jakarta/hivemind/trunk/hivebuild/dist.xml Thu Jun 30 22:01:38 2005
@@ -17,7 +17,6 @@
<project name="dist">
- <property file="${basedir}/project.properties"/>
<property file="${hivebuild.dir}/dist.properties"/>
<property name="keyfile" value="${user.home}/.ssh/id_dsa"/>
@@ -57,7 +56,7 @@
<!-- Pick up the packaged libraries. -->
- <tarfileset dir="${target.dir}" prefix="${dist.base.name}">
+ <tarfileset dir="${local.target.dir}" prefix="${dist.base.name}">
<include name="*.jar"/>
</tarfileset>
</tar>
@@ -89,13 +88,13 @@
<!-- Pick up the packaged libraries. -->
- <zipfileset dir="${target.dir}" prefix="${dist.base.name}/">
+ <zipfileset dir="${local.target.dir}" prefix="${dist.base.name}/">
<include name="*.jar"/>
</zipfileset>
</zip>
<announce message="Assembling documentation distribution ..."/>
-
+
<tar destfile="${dist.dir}/${dist.docs.file}" compression="gzip">
<tarfileset dir="${project.docs.target.dir}"/>
</tar>
Modified: jakarta/hivemind/trunk/hivebuild/hivebuild.properties
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/hivebuild/hivebuild.properties?rev=208713&r1=208712&r2=208713&view=diff
==============================================================================
--- jakarta/hivemind/trunk/hivebuild/hivebuild.properties (original)
+++ jakarta/hivemind/trunk/hivebuild/hivebuild.properties Thu Jun 30 22:01:38 2005
@@ -12,7 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-root.dir=.
+scratch.dir=${java.io.tmpdir}
+local.target.dir=target
# Directory containing build files and such. This is normally computed
# on the fly, inside hivebuild.xml.
@@ -20,12 +21,14 @@
hivebuild.dir=${root.dir}/hivebuild
# target directory ... where all derived files are placed (usually in subdirs).
+# This should only be referenced by a module, where module.name is defined.
+# project.name defined in the project.properties file.
-target.dir=target
+target.dir=${scratch.dir}/${project.name}/${module.name}/${local.target.dir}
-# Top-level target directory, used when generating a distribution
+# Top-level target directory
-project.target.dir=${root.dir}/${target.dir}
+project.target.dir=${scratch.dir}/${project.name}/${local.target.dir}
# Directory containing various forms of source code, used when packaging
# a source distribution.
@@ -91,7 +94,7 @@
descriptor.src.dir=${src.dir}/descriptor
-# Note: project.version is defined in ${root.dir}/version.properties
+# Note: project.version is defined in ${root.dir}/project.properties
# Project-level directory for documentation. Modules copy into this directory,
# so they need to know about it.
@@ -105,7 +108,7 @@
javadoc.target.dir=${module.docs.target.dir}/apidocs
# Directory to which project and module documentation files are ultimately copied (or generated)
-project.forrest.composite.dir=${project.target.dir}/forrest-composite
+project.forrest.composite.dir=${root.dir}/${local.target.dir}/forrest-composite
# Directory to which Forrest XDoc files should be copied or generated.
project.forrest.xdocs.dir=${project.forrest.composite.dir}/content/xdocs
Modified: jakarta/hivemind/trunk/hivebuild/hivebuild.xml
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/hivebuild/hivebuild.xml?rev=208713&r1=208712&r2=208713&view=diff
==============================================================================
--- jakarta/hivemind/trunk/hivebuild/hivebuild.xml (original)
+++ jakarta/hivemind/trunk/hivebuild/hivebuild.xml Thu Jun 30 22:01:38 2005
@@ -17,16 +17,18 @@
<project name="hivebuild">
- <!-- Ant magically sets ant.file.common to the location of this exact file.
+ <!-- Ant magically sets ant.file.hivebuild to the location of this exact file.
So we can compute hivebuild.dir from that. -->
<dirname property="hivebuild.dir" file="${ant.file.hivebuild}"/>
-
- <property file="${hivebuild.dir}/hivebuild.properties"/>
+
+ <!-- Projects must include a project.properties that defines project.name and project.version -->
- <!-- Note: this should move out of the hivebuild.dir -->
+ <property file="${root.dir}/project.properties"/>
+ <property file="${hivebuild.dir}/hivebuild.properties"/>
+
- <property file="${root.dir}/version.properties"/>
+ <!-- Perhaps we could merge the previous two together? -->
<!-- Get the absolute location of the project directory. -->
@@ -35,6 +37,7 @@
<target name="clean" description="Deletes all derived files.">
<delete dir="${target.dir}" quiet="true"/>
+ <delete dir="${local.target.dir}" quiet="true"/>
</target>
Modified: jakarta/hivemind/trunk/hivebuild/module.properties
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/hivebuild/module.properties?rev=208713&r1=208712&r2=208713&view=diff
==============================================================================
--- jakarta/hivemind/trunk/hivebuild/module.properties (original)
+++ jakarta/hivemind/trunk/hivebuild/module.properties Thu Jun 30 22:01:38 2005
@@ -35,7 +35,7 @@
# Directory into which the module's jar should be installed.
-module.install.dir=${project.target.dir}
+module.install.dir=${root.dir}/target
# Defaults for running unit tests.
Modified: jakarta/hivemind/trunk/hivebuild/module.xml
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/hivebuild/module.xml?rev=208713&r1=208712&r2=208713&view=diff
==============================================================================
--- jakarta/hivemind/trunk/hivebuild/module.xml (original)
+++ jakarta/hivemind/trunk/hivebuild/module.xml Thu Jun 30 22:01:38 2005
@@ -16,7 +16,6 @@
-->
<project name="module">
-
<!--
Imports are computed relative the this file (to the build.xml
that imported this file). -->
@@ -24,8 +23,7 @@
<import file="hivebuild.xml"/>
<import file="dependency.xml"/>
<import file="forrestdoc.xml"/>
- <property file="${hivebuild.dir}/module.properties"/>
-
+ <property file="${hivebuild.dir}/module.properties"/>
<property name="forrest.report-menu.file" value="${project.forrest.xdocs.dir}/${module.name}/report-menu.ent"/>
<!-- The default classpath for compilation is all external package JARs. -->
Modified: jakarta/hivemind/trunk/hivebuild/project.xml
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/hivebuild/project.xml?rev=208713&r1=208712&r2=208713&view=diff
==============================================================================
--- jakarta/hivemind/trunk/hivebuild/project.xml (original)
+++ jakarta/hivemind/trunk/hivebuild/project.xml Thu Jun 30 22:01:38 2005
@@ -17,6 +17,10 @@
<project name="project">
+ <!-- This is the normal default for a project. -->
+
+ <property name="root.dir" value="."/>
+
<!-- Top level module used to combine other types of modules. -->
<import file="hivebuild.xml"/>
Modified: jakarta/hivemind/trunk/project.properties
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/project.properties?rev=208713&r1=208712&r2=208713&view=diff
==============================================================================
--- jakarta/hivemind/trunk/project.properties (original)
+++ jakarta/hivemind/trunk/project.properties Thu Jun 30 22:01:38 2005
@@ -12,6 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+project.name=jakarta-hivemind
+project.version=1.1-beta-3-snapshot
+
dist.name=hivemind
dist.install.host=cvs.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org