Update of /cvsroot/jicarilla/jicarilla-sandbox/buildsystem
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11201/buildsystem
Modified Files:
build-basic.xml build-project.xml build-reactor.xml
Added Files:
build-basic-reactor.xml
Log Message:
many more small tweaks and bugfixes
--- NEW FILE: build-basic-reactor.xml ---
<?xml version="1.0"?>
<project default="jar:install-snapshot" name="JBS-based build" basedir=".">
<property file="project.properties"/>
<target name="need-for-jbs" unless="jbs.available">
<fail>
===================================================================
BUILD SYSTEM FAILURE!
===================================================================
The Jicarilla BuildSystem cannot be found. Try setting the jbs.home
property in the file project.properties to the correct location
(jbs.home is currently set to ${jbs.home}).
</fail>
</target>
<target name="init">
<property name="jbs.home" value="${user.home}/.jbs"/>
<available file="${jbs.home}/build-reactor.xml"
property="jbs.available"/>
<antcall target="need-for-jbs"/>
</target>
<target name="delegate" depends="init">
<ant inheritRefs="true"
inheritAll="true"
target="jbs:${target}"
antfile="${jbs.home}/build-reactor.xml"/>
</target>
<target name="compile">
<antcall target="delegate">
<param name="target" value="compile"/>
</antcall>
</target>
<target name="test">
<antcall target="delegate">
<param name="target" value="test"/>
</antcall>
</target>
<target name="jar">
<antcall target="delegate">
<param name="target" value="jar"/>
</antcall>
</target>
<target name="jar:install">
<antcall target="delegate">
<param name="target" value="jar:install"/>
</antcall>
</target>
<target name="jar:install-snapshot">
<antcall target="delegate">
<param name="target" value="jar:install-snapshot"/>
</antcall>
</target>
<target name="dist">
<antcall target="delegate">
<param name="target" value="dist"/>
</antcall>
</target>
<target name="reports">
<antcall target="delegate">
<param name="target" value="reports"/>
</antcall>
</target>
<target name="upgrade-build">
<property name="jbs.build-basic.url"
value="http://cvs.sourceforge.net/viewcvs.py/*checkout*/jicarilla/jicarilla-sandbox/buildsystem/build-basic-reactor.xml"/>
<get src="${jbs.build-basic.url}"
dest="build.xml"/>
</target>
</project>
Index: build-basic.xml
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/buildsystem/build-basic.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- build-basic.xml 12 Feb 2004 16:16:39 -0000 1.2
+++ build-basic.xml 12 Feb 2004 23:46:26 -0000 1.3
@@ -72,5 +72,4 @@
<get src="${jbs.build-basic.url}"
dest="build.xml"/>
</target>
- <!-- upgrade! -->
</project>
Index: build-project.xml
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/buildsystem/build-project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- build-project.xml 12 Feb 2004 16:16:39 -0000 1.9
+++ build-project.xml 12 Feb 2004 23:46:26 -0000 1.10
@@ -36,8 +36,8 @@
</target>
<target name="jbs:debug" unless="do.not.debug">
- <echo>
-=======================================================================
+ <echo>=======================================================================
+ _______________________________________________________
The / /__/ __ \/ __ | / ___ |/__/ / / / / __ |
/ /__/ / \__/ /_| |/ /__/ /__/ / / / / /_| |
___ / / / / ___/ ____ / ____ / / / / / / ____ |
@@ -64,13 +64,11 @@
jarfile = ${jbs.build.dir}/${project.name}-${project.version}.jar
javadocs = ${jbs.build.dir}/docs/apidocs
junitreports = ${jbs.build.dir}/docs/junitreports
-=======================================================================
- </echo>
+=======================================================================</echo>
</target>
<target name="jbs:warn-project.name" unless="project.name.set">
- <echo>
-=======================================================================
+ <echo>=======================================================================
WARNING!
The property 'project.name' has not been set. This will result in a
@@ -80,14 +78,12 @@
To fix this, add a property to the gump build definition or the
properties file for the current component.
-=======================================================================
- </echo>
+=======================================================================</echo>
</target>
<target name="jbs:warn-avail-java-src" unless="java.src.present">
- <echo>
-=======================================================================
- WARNING!
+ <echo>=======================================================================
+ WARNING for ${project.name}!
The directory
@@ -95,28 +91,24 @@
does not exist. This means the jar that will be created will be
empty.
-=======================================================================
- </echo>
+=======================================================================</echo>
</target>
<target name="jbs:warn-avail-test-src" unless="test.src.present">
- <echo>
-=======================================================================
- WARNING!
+ <echo>=======================================================================
+ WARNING for ${project.name}!
The directory
${jbs.src.dir}/test
does not exist. This means no unit tests will be run.
-=======================================================================
- </echo>
+=======================================================================</echo>
</target>
<target name="jbs:warn-avail-no-sources" if="no.sources.available">
- <echo>
-=======================================================================
- ERROR!
+ <echo>=======================================================================
+ ERROR for ${project.name}!
This project does not contain any java source files in
@@ -125,14 +117,13 @@
that means it is not possible to generate any classes, jars or
javadocs.
-=======================================================================
- </echo>
+=======================================================================</echo>
</target>
<target name="jbs:warn-avail-no-source-dir" if="no.source.dir">
<fail>
=======================================================================
- ERROR!
+ ERROR for ${project.name}!
This project does not contain a source directory
@@ -158,9 +149,8 @@
<target name="jbs:jar" unless="no.source.dir"
depends="jbs:java-compile, jbs:java-test, jbs:bin-jar">
<echo>
-=======================================================================
Jar Generated!
-=======================================================================
+
The generated jarfile is at
${jbs.build.dir}/${project.name}-${project.version}.jar
@@ -170,9 +160,8 @@
<target name="jbs:dist" unless="no.source.dir"
depends="jbs:src-dist, jbs:bin-dist">
<echo>
- =======================================================================
Distributions generated!
- =======================================================================
+
The generated distributions are at
${jbs.build.dir}/dist/${project.name}-${project.version}-bin.zip
@@ -240,11 +229,9 @@
<target name="jbs:java-compile" if="java.src.present"
depends="jbs:init,jbs:get-dependencies">
- <echo>
-=======================================================================
- Compiling Sources
-=======================================================================
- </echo>
+ <echo>=======================================================================
+ Compiling Sources for ${project.name}
+=======================================================================</echo>
<mkdir dir="${jbs.build.dir}"/>
<mkdir dir="${jbs.build.dir}/classes"/>
<javac
@@ -265,11 +252,9 @@
<target name="jbs:java-test-compile" if="test.src.present"
depends="jbs:init, jbs:java-compile">
- <echo>
-=======================================================================
- Compiling Tests
-======================================================================
- </echo>
+ <echo>=======================================================================
+ Compiling Tests for ${project.name}
+======================================================================</echo>
<mkdir dir="${jbs.build.dir}/test-classes"/>
<mkdir dir="${jbs.build.dir}/classes"/>
<javac
@@ -291,11 +276,9 @@
<target name="jbs:java-test" if="test.src.present"
depends="jbs:init, jbs:java-test-compile">
- <echo>
-=======================================================================
- Running tests
-=======================================================================
- </echo>
+ <echo>=======================================================================
+ Running tests for ${project.name}
+======================================================================</echo>
<taskdef
name="junit"
classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
@@ -326,11 +309,9 @@
<target name="jbs:java-test-reports" if="test.src.present"
depends="jbs:init, jbs:java-test">
- <echo>
-=======================================================================
- Generating test reports
-=======================================================================
- </echo>
+ <echo>=======================================================================
+ Generating test reports for ${project.name}
+=======================================================================</echo>
<mkdir dir="${jbs.build.dir}/docs/junitreports"/>
@@ -344,22 +325,20 @@
<target name="jbs:bin-jar" if="java.src.present"
depends="jbs:init, jbs:compile, jbs:test">
- <echo>
-=======================================================================
- Building jar
-=======================================================================
- </echo>
+ <echo>=======================================================================
+ Generating test reports for ${project.name}
+=======================================================================</echo>
+
<mkdir dir="${jbs.build.dir}/classes"/>
<jar destfile="${jbs.build.dir}/${project.name}-${project.version}.jar" basedir="${jbs.build.dir}/classes"/>
</target>
<target name="jbs:javadocs" if="java.src.present"
depends="jbs:init,jbs:jar">
- <echo>
-=======================================================================
- Generating javadocs
-=======================================================================
- </echo>
+ <echo>=======================================================================
+ Generating javadocs for ${project.name}
+=======================================================================</echo>
+
<mkdir dir="${jbs.build.dir}/docs"/>
<mkdir dir="${jbs.build.dir}/docs/apidocs"/>
<mkdir dir="${jbs.build.dir}/classes"/>
@@ -393,11 +372,9 @@
<target name="jbs:bin-dist" unless="no.source.dir"
depends="jbs:init,jbs:distclean,jbs:jar,jbs:javadocs">
- <echo>
-=======================================================================
- Building Binary Distribution
-=======================================================================
- </echo>
+ <echo>=======================================================================
+ Building Binary Distribution for ${project.name}
+=======================================================================</echo>
<mkdir dir="${jbs.build.dir}"/>
<mkdir dir="${jbs.build.dir}/${project.name}-${project.version}"/>
@@ -413,7 +390,9 @@
</fileset>
</copy>
- <antcall target="jbs:copy-dependencies" inheritAll="true"/>
+ <antcall target="jbs:copy-dependencies" inheritAll="true">
+ <param name="do.not.debug" value="true"/>
+ </antcall>
<zip destfile="${jbs.build.dir}/dist/${project.name}-${project.version}-bin.zip">
<zipfileset dir="${jbs.build.dir}/${project.name}-${project.version}/bin"
@@ -423,11 +402,9 @@
<target name="jbs:src-dist" unless="no.source.dir"
depends="jbs:init,jbs:distclean,jbs:jar,jbs:javadocs">
- <echo>
-=======================================================================
- Building Source Distribution
-=======================================================================
- </echo>
+ <echo>=======================================================================
+ Building Source Distribution for ${project.name}
+=======================================================================</echo>
<mkdir dir="${jbs.build.dir}"/>
<mkdir dir="${jbs.build.dir}/${project.name}-${project.version}"/>
@@ -459,17 +436,15 @@
depends="jbs:init, jbs:no-dependency-warning, jbs:actually-get-dependencies"/>
<target name="jbs:no-dependency-warning" if="skip.dependencies" depends="jbs:init">
- <echo>
-=======================================================================
- NOTE!
+ <echo>=======================================================================
+ NOTE for ${project.name}!
We're not actually setting the dependency.classpath property to a
meaningful value, because the skip.dependencies property has been
set. Likely, we're being called from gump,
http://jakarta.apache.org/gump/
-=======================================================================
- </echo>
+=======================================================================</echo>
</target>
<target name="jbs:actually-get-dependencies" unless="skip.dependencies" depends="jbs:init">
<available property="dependencies.file.available" file="dependencies.list"/>
@@ -485,15 +460,31 @@
# empty lines are also ignored
-->
- <loadfile property="jbs.dependencies.file" srcFile="dependencies.list"/>
<!-- todo: create a <classpath/> instead of a string...or something -->
<script language="javascript">
<![CDATA[
if( project.getProperty("dependencies.file.available") != null )
{
+ msg = "=======================================================================\n";
+ msg += " Downloading dependencies for " + project.getProperty("project.name") + "\n";
+ msg += "=======================================================================\n";
+ echo = project.createTask("echo");
+ echo.setMessage( msg );
+ echo.execute();
+
importClass(java.lang.System);
importClass(java.lang.Character);
+ basedir = project.getProperty("basedir");
+ sep = System.getProperty("file.separator");
+ dependencyFilename = basedir + sep + "dependencies.list";
+ System.out.println( "Getting: " + dependencyFilename );
+
+ loadfile = project.createTask("loadfile");
+ loadfile.setProperty("jbs.dependencies.file");
+ loadfile.setSrcFile( new java.io.File( dependencyFilename ) );
+ loadfile.execute();
+
dependencyFile = project.getProperty("jbs.dependencies.file");
defaultRepository = project.getProperty("jbs.repository.default");
localRepository = project.getProperty("jbs.repository.local");
@@ -508,7 +499,7 @@
for( i=0; i < dependencies.length; i++ )
{
- if( dependencies[i].length == 0 ||
+ if( dependencies[i].length() == 0 ||
hash.equals( new Character( dependencies[i].charAt(0) ) ) ||
dependencies[i].charAt(0) == space ||
(dependencies[i].length() > 1 && dependencies[i].charAt(0) == slash && dependencies[i].charAt(1) == slash) )
@@ -534,8 +525,6 @@
}
}
- sep = System.getProperty("file.separator");
-
localDir = localRepository + sep + group + sep + "jars" + sep;
localFile = localDir + artifact + "-" + version + ".jar";
remoteFile = repository + sep +
@@ -560,6 +549,7 @@
get = project.createTask("get");
get.setSrc( new java.net.URL( remoteFile ) );
get.setDest( file );
+ get.setIgnoreErrors( true );
get.execute();
}
@@ -597,12 +587,21 @@
<property name="jbs.build.dist.lib.dir"
value="${jbs.build.dir}/${project.name}-${project.version}/bin/lib"/>
<mkdir dir="${jbs.build.dist.lib.dir}"/>
- <loadfile property="jbs.dependencies.file" srcFile="dependencies.list"/>
<script language="javascript">
<![CDATA[
importClass(java.lang.System);
importClass(java.lang.Character);
+ basedir = project.getProperty("basedir");
+ sep = System.getProperty("file.separator");
+ dependencyFilename = basedir + sep + "dependencies.list";
+ System.out.println( "Getting: " + dependencyFilename );
+
+ loadfile = project.createTask("loadfile");
+ loadfile.setProperty("jbs.dependencies.file");
+ loadfile.setSrcFile( new java.io.File( dependencyFilename ) );
+ loadfile.execute();
+
dependencyFile = project.getProperty("jbs.dependencies.file");
localRepository = project.getProperty("jbs.repository.local");
libDir = project.getProperty("jbs.build.dist.lib.dir");
@@ -615,7 +614,7 @@
for( i=0; i < dependencies.length; i++ )
{
- if( dependencies[i].length == 0 ||
+ if( dependencies[i].length() == 0 ||
hash.equals( new Character( dependencies[i].charAt(0) ) ) ||
dependencies[i].charAt(0) == space ||
(dependencies[i].length() > 1 && dependencies[i].charAt(0) == slash && dependencies[i].charAt(1) == slash) )
@@ -653,32 +652,28 @@
<!-- Repository management -->
- <target name="jbs:jar:install" depends="jbs:jar">
- <echo>
-=======================================================================
- Installing generated jar into local repository
-=======================================================================
- </echo>
+ <target name="jbs:jar:install" depends="jbs:init,jbs:jar">
+ <echo>=======================================================================
+ Installing ${project.name} jar into local repository
+=======================================================================</echo>
<mkdir dir="${jbs.home}/repository/${project.name}/jars/"/>
<copy todir="${jbs.home}/repository/${project.name}/jars/"
file="${jbs.build.dir}/${project.name}-${project.version}.jar"/>
</target>
- <target name="jbs:jar:install-snapshot" depends="jbs:jar">
- <echo>
-=======================================================================
- Installing generated jar into local repository as snapshot
-=======================================================================
- </echo>
+ <target name="jbs:jar:install-snapshot" depends="jbs:init,jbs:jar">
+ <echo>=======================================================================
+ Installing ${project.name} jar into local repository as snapshot
+=======================================================================</echo>
<mkdir dir="${jbs.home}/repository/${project.name}/jars/"/>
<tstamp>
<format property="snapshot.version" pattern="yyyyMMdd"/>
</tstamp>
- <copy tofile="${jbs.home}/repository/${project.name}/jars/{project.name}-SNAPSHOT.jar"
+ <copy tofile="${jbs.home}/repository/${project.name}/jars/${project.name}-SNAPSHOT.jar"
file="${jbs.build.dir}/${project.name}-${project.version}.jar"/>
- <copy tofile="${jbs.home}/repository/${project.name}/jars/{project.name}-${snapshot.version}.jar"
+ <copy tofile="${jbs.home}/repository/${project.name}/jars/${project.name}-${snapshot.version}.jar"
file="${jbs.build.dir}/${project.name}-${project.version}.jar"/>
</target>
Index: build-reactor.xml
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/buildsystem/build-reactor.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- build-reactor.xml 12 Feb 2004 16:16:39 -0000 1.4
+++ build-reactor.xml 12 Feb 2004 23:46:26 -0000 1.5
@@ -36,8 +36,8 @@
</target>
<target name="jbs:debug" unless="do.not.debug">
- <echo>
-=======================================================================
+ <echo>=======================================================================
+ _______________________________________________________
The / /__/ __ \/ __ | / ___ |/__/ / / / / __ |
/ /__/ / \__/ /_| |/ /__/ /__/ / / / / /_| |
___ / / / / ___/ ____ / ____ / / / / / / ____ |
@@ -61,13 +61,11 @@
jarfile = ${jbs.build.dir}/${project.name}-${project.version}.jar
javadocs = ${jbs.build.dir}/docs/apidocs
junitreports = ${jbs.build.dir}/docs/junitreports
-=======================================================================
- </echo>
+=======================================================================</echo>
</target>
<target name="jbs:warn-project.name" unless="project.name.set">
- <echo>
-=======================================================================
+ <echo>=======================================================================
WARNING!
The property 'project.name' has not been set. This will result in a
@@ -77,8 +75,7 @@
To fix this, add a property to the gump build definition or the
properties file for the current component.
-=======================================================================
- </echo>
+=======================================================================</echo>
</target>
<!-- Basic functionality -->
@@ -130,14 +127,13 @@
<target name="jbs:compile" depends="jbs:init">
<antcall target="jbs:reactor">
- <param name="target" value="jar"/>
+ <param name="target" value="jar:install-snapshot"/>
+ <param name="do.not.debug" value="true"/>
</antcall>
- <echo>
-=======================================================================
- Gathering sources and classes from subprojects
-=======================================================================
- </echo>
+ <echo>=======================================================================
+ Gathering sources and classes from subprojects for ${project.name}
+=======================================================================</echo>
<mkdir dir="${jbs.build.dir}"/>
<mkdir dir="${jbs.build.dir}/classes"/>
<copy todir="${jbs.build.dir}/classes">
@@ -152,11 +148,9 @@
</target>
<target name="jbs:test" depends="jbs:compile">
- <echo>
-=======================================================================
- Consolidating test reports
-=======================================================================
- </echo>
+ <echo>=======================================================================
+ Consolidating test reports for ${project.name}
+=======================================================================</echo>
<!-- note: this completely deviates from the approach maven
takes to generating the junit reports and stores them
@@ -179,24 +173,29 @@
</target>
<target name="jbs:jar" depends="jbs:init,jbs:compile,jbs:test">
- <echo>
-=======================================================================
- Generating combined jar
-=======================================================================
- </echo>
+ <echo>=======================================================================
+ Generating combined jar for ${project.name}
+=======================================================================</echo>
<mkdir dir="${jbs.build.dir}/classes"/>
<jar destfile="${jbs.build.dir}/${project.name}-${project.version}.jar" basedir="${jbs.build.dir}/classes"/>
+
+ <echo>
+ Jar Generated!
+
+ The generated jarfile is at
+
+ ${jbs.build.dir}/${project.name}-${project.version}.jar
+ </echo>
</target>
<target name="jbs:javadocs" depends="jbs:init,jbs:compile">
<antcall target="jbs:reactor">
<param name="target" value="javadocs"/>
+ <param name="do.not.debug" value="true"/>
</antcall>
- <echo>
-=======================================================================
- Generating combined javadocs
-=======================================================================
- </echo>
+ <echo>=======================================================================
+ Generating combined javadocs for ${project.name}
+=======================================================================</echo>
<mkdir dir="${jbs.build.dir}/docs"/>
<mkdir dir="${jbs.build.dir}/docs/apidocs"/>
@@ -226,17 +225,16 @@
<target name="jbs:dist" depends="jbs:init,jbs:jar">
<antcall target="jbs:reactor">
<param name="target" value="dist"/>
+ <param name="do.not.debug" value="true"/>
</antcall>
<mkdir dir="${jbs.build.dir}"/>
<mkdir dir="${jbs.build.dir}/${project.name}-${project.version}"/>
<mkdir dir="${jbs.build.dir}/dist"/>
- <echo>
-=======================================================================
- Building Source/Binary Distribution
-=======================================================================
- </echo>
+ <echo>=======================================================================
+ Building Source/Binary Distribution for ${project.name}
+=======================================================================</echo>
<mkdir dir="${jbs.build.dir}/${project.name}-${project.version}/bin"/>
<copy todir="${jbs.build.dir}/${project.name}-${project.version}/bin">
<fileset dir="${jbs.build.dir}">
@@ -261,6 +259,15 @@
<zipfileset dir="${jbs.build.dir}/${project.name}-${project.version}/bin"
prefix="${project.name}-${project.version}"/>
</zip>
+
+ <echo>
+ Distributions generated!
+
+ The generated distributions are at
+
+ ${jbs.build.dir}/dist/${project.name}-${project.version}-bin.zip
+ ${jbs.build.dir}/dist/${project.name}-${project.version}-src.zip
+ </echo>
</target>
<target name="jbs:distclean" depends="jbs:init">
@@ -273,11 +280,9 @@
<target name="jbs:reactor"
depends="jbs:init">
- <echo>
-=======================================================================
+ <echo>=======================================================================
Building the api/ and impl/ subprojects, target ${target}
-=======================================================================
- </echo>
+=======================================================================</echo>
<condition property="reactor.target.isset">
<isset property="target"/>
@@ -304,17 +309,16 @@
<target name="jbs:reactor-run" if="reactor.target.isset">
<ant dir="${dir}" target="${target}" inheritAll="false">
<property name="project.version" value="${project.version}"/>
+ <property name="do.not.debug" value="true"/>
</ant>
</target>
<!-- Repository management -->
<target name="jbs:jar:install" depends="jbs:jar">
- <echo>
-=======================================================================
- Installing generated jar into local repository
-=======================================================================
- </echo>
+ <echo>=======================================================================
+ Installing ${project.name} jar into local repository
+=======================================================================</echo>
<mkdir dir="${jbs.home}/repository/${project.name}/jars/"/>
<copy todir="${jbs.home}/repository/${project.name}/jars/"
@@ -322,19 +326,17 @@
</target>
<target name="jbs:jar:install-snapshot" depends="jbs:jar">
- <echo>
-=======================================================================
- Installing generated jar into local repository as snapshot
-=======================================================================
- </echo>
+ <echo>=======================================================================
+ Installing ${project.name} jar into local repository as snapshot
+=======================================================================</echo>
<mkdir dir="${jbs.home}/repository/${project.name}/jars/"/>
<tstamp>
<format property="snapshot.version" pattern="yyyyMMdd"/>
</tstamp>
- <copy tofile="${jbs.home}/repository/${project.name}/jars/{project.name}-SNAPSHOT.jar"
+ <copy tofile="${jbs.home}/repository/${project.name}/jars/${project.name}-SNAPSHOT.jar"
file="${jbs.build.dir}/${project.name}-${project.version}.jar"/>
- <copy tofile="${jbs.home}/repository/${project.name}/jars/{project.name}-${snapshot.version}.jar"
+ <copy tofile="${jbs.home}/repository/${project.name}/jars/${project.name}-${snapshot.version}.jar"
file="${jbs.build.dir}/${project.name}-${project.version}.jar"/>
</target>
</project>
\ No newline at end of file
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.