User: d_jencks
Date: 01/08/22 21:59:35
Modified: . build.sh build.xml
Log:
Changes to build.sh to make it use jboss's ant and to build.xml to execute html and
printable-html tasks
Revision Changes Path
1.3 +21 -6 manual/build.sh
Index: build.sh
===================================================================
RCS file: /cvsroot/jboss/manual/build.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.sh 2001/08/11 06:16:44 1.2
+++ build.sh 2001/08/23 04:59:35 1.3
@@ -23,7 +23,7 @@
## ##
### ====================================================================== ###
-# $Id: build.sh,v 1.2 2001/08/11 06:16:44 user57 Exp $
+# $Id: build.sh,v 1.3 2001/08/23 04:59:35 d_jencks Exp $
PROGNAME=`basename $0`
DIRNAME=`dirname $0`
@@ -71,12 +71,15 @@
ANT="$ANT_HOME/bin/ant"
if [ -x "$ANT" ]; then
# found one
- echo $ANT
+ #this is return value of function!
+ echo $ANT_HOME
break
fi
done
}
+
+
#
# Main function.
#
@@ -85,14 +88,15 @@
maybe_source "$DIRNAME/build.conf" "$HOME/.build.conf"
# try the search path
- ANT=`search $ANT_SEARCH_PATH`
+ ANT_HOME=`search $ANT_SEARCH_PATH`
+
target="build"
_cwd=`pwd`
- while [ "x$ANT" = "x" ] && [ "$cwd" != "$ROOT" ]; do
+ while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do
cd ..
cwd=`pwd`
- ANT=`search $ANT_SEARCH_PATH`
+ ANT_HOME=`search $ANT_SEARCH_PATH`
done
# make sure we get back
@@ -107,6 +111,9 @@
die "Could not locate Ant; check \$ANT or \$ANT_HOME."
fi
+ #find ANT
+
+ ANT="$ANT_HOME/bin/ant"
# make sure we have one
if [ ! -x "$ANT" ]; then
die "Ant file is not executable: $ANT"
@@ -119,8 +126,16 @@
die "Ant version $ANT_VERSION is required to build."
fi
fi
+
+ echo ant_home is $ANT_HOME
+ #kill preexisting classpath, we want our just found ant.
+ CLASSPATH=
+
+ #for manual only, include optional.jar on classpath- lousy ant style task
+ #design has XSLProcess in ant.jar and loaded classes in optional.jar!!!
+ CLASSPATH=$ANT_HOME/lib/ext/optional.jar
- export ANT ANT_HOME
+ export ANT ANT_HOME CLASSPATH
exec $ANT $ANT_OPTIONS "$@"
}
1.3 +26 -20 manual/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/manual/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 2001/08/11 06:16:44 1.2
+++ build.xml 2001/08/23 04:59:35 1.3
@@ -10,7 +10,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.2 2001/08/11 06:16:44 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.3 2001/08/23 04:59:35 d_jencks Exp $ -->
<project default="main">
@@ -67,7 +67,7 @@
<property file="${module.root}/local.properties"/>
<property file="${project.config}/local.properties"/>
<property file="${module.root}/config.properties"/>
- <property file="${moudle.parent.config}/config.properties"/>
+ <property file="${module.parent.config}/config.properties"/>
<!--
| Setup the basic environment for a source module.
@@ -242,61 +242,67 @@
| so we move all chunked html files to destination
-->
- <delete dir="${build.temp}" quiet="true"/>
+ <!--delete dir="${build.temp}" quiet="true"/>
<mkdir dir="${build.temp}"/>
<copy todir="${build.temp}" filtering="yes">
<fileset dir="${source.docs}">
<include name="**/*"/>
</fileset>
- </copy>
+ </copy build.temp-->
<mkdir dir="${build.html}"/>
- <style basedir="${build.temp}"
- destdir="${build.html}"
+<echo message="build.html is ${build.html}"/>
+ <style basedir="${source.docs}"
style="jboss.xsl"
- extension="html"
+ extension=".html"
+ destdir="output/html"
includes="jbossdocs.xml">
</style>
+ <move todir="${build.html}">
+ <fileset dir="${module.root}" includes="*.html"/>
+ </move>
+
<copy todir="${build.html}">
- <fileset dir="${build.temp}">
+ <fileset dir="${source.docs}">
<include name="**/*"/>
<exclude name="*.xml"/>
<exclude name="*.xsl"/>
<exclude name="**/docbook/**"/>
- <exclude name="**/docbookx/**"/>
- </fileset>
- <fileset dir="${build.temp}/build">
- <include name="*.html"/>
+ <exclude name="**/docbook*/**"/>
</fileset>
</copy>
</target>
<!-- Generate the printable HTML manual -->
<target name="printable-html" depends="init">
- <delete dir="${build.temp}" quiet="true"/>
+ <!--delete dir="${build.temp}" quiet="true"/>
<mkdir dir="${build.temp}"/>
<copy todir="${build.temp}" filtering="yes">
<fileset dir="${source.docs}">
<include name="**/*"/>
</fileset>
- </copy>
+ </copy-->
<mkdir dir="${build.printable-html}"/>
- <style basedir="${build.temp}"
+ <style basedir="${source.docs}"
destdir="${build.printable-html}"
style="docbook/html/docbook.xsl"
- extension="html"
+ extension=".html"
includes="jbossdocs.xml">
</style>
+ <move todir="${build.printable-html}">
+ <fileset dir="${module.root}" includes="*.html"/>
+ </move>
+
<copy todir="${build.printable-html}">
- <fileset dir="${build.tmp}">
+ <fileset dir="${source.docs}">
<include name="**/*"/>
<exclude name="*.xml"/>
<exclude name="*.xsl"/>
<exclude name="**/docbook/**"/>
- <exclude name="**/docbookx/**"/>
+ <exclude name="**/docbook*/**"/>
</fileset>
</copy>
</target>
@@ -416,8 +422,8 @@
<target name="all" depends="jars, docs"
description="Builds everything."/>
- <target name="most" depends="jars"
- description="Builds almost everything."/>
+ <target name="most" depends="html, printable-html"
+ description="Builds html and printable html"/>
<target name="min" depends="compile"
description="Builds a minimal subset."/>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
