Author: steveh Date: Thu Dec 9 16:09:16 2004 New Revision: 111449 URL: http://svn.apache.org/viewcvs?view=rev&rev=111449 Log: Making the Forrest installation a manual process. Building.txt has been amended with new instructions for installing Forrest. build.xml now checks for a FORREST_HOME before running docs-related targets.
DRTs passed. Modified: incubator/beehive/trunk/BUILDING.txt incubator/beehive/trunk/beehiveEnv.cmd incubator/beehive/trunk/beehiveEnv.sh incubator/beehive/trunk/build.xml Modified: incubator/beehive/trunk/BUILDING.txt Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/BUILDING.txt?view=diff&rev=111449&p1=incubator/beehive/trunk/BUILDING.txt&r1=111448&p2=incubator/beehive/trunk/BUILDING.txt&r2=111449 ============================================================================== --- incubator/beehive/trunk/BUILDING.txt (original) +++ incubator/beehive/trunk/BUILDING.txt Thu Dec 9 16:09:16 2004 @@ -60,6 +60,58 @@ $>ant drt + +Installation of Apache Forrest +============================== +The following documentation-related targets require that you have Apache Forrest 0.6 installed on your machine. + + $>ant docs + $>ant build.dist + +Before running these targets, complete the following steps. + +(1) Download a Forrest 0.6 archive from one of the following locations: + + For Windows machines: + http://mirrors.ccs.neu.edu/Apache/dist/forrest/apache-forrest-0.6.zip + + For Unix machines: + http://mirrors.ccs.neu.edu/Apache/dist/forrest/apache-forrest-0.6.tar.gz + +(2) Unzip the archive onto your machine. You may unzip to any location. + +(3) Copy the JAR file + + apache-forrest-0.6/lib/core/xml-commons-resolver-1.1.jar + +into + + $ANT_HOME/lib + +(This allows the Ant targets to call Forrest tasks.) + +(4) In the command shell (where you have already run beehiveEnv.cmd|.sh) set FORREST_HOME as follows. + + On Windows machines: + set FORREST_HOME=C:\MyApacheStuff\apache-forrest-0.6\src\core + + On Unix machines: + export FORREST_HOME=/MyApacheStuff/apache-forrest-0.6/src/core + +(5) Set the PATH as follows: + + On Windows machines: + set PATH=%FORREST_HOME%\bin;%PATH% + + On Unix machines: + export PATH=$FORREST_HOME/bin:$PATH + +You are now ready to run these targets: + + $>ant docs + $>ant build.dist + + Using Proxies With a Beehive Build ==================================== Modified: incubator/beehive/trunk/beehiveEnv.cmd Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/beehiveEnv.cmd?view=diff&rev=111449&p1=incubator/beehive/trunk/beehiveEnv.cmd&r1=111448&p2=incubator/beehive/trunk/beehiveEnv.cmd&r2=111449 ============================================================================== --- incubator/beehive/trunk/beehiveEnv.cmd (original) +++ incubator/beehive/trunk/beehiveEnv.cmd Thu Dec 9 16:09:16 2004 @@ -10,6 +10,5 @@ set ANT_HOME=%BEEHIVE_HOME%\installed\apache-ant-1.6.2 set CATALINA_HOME=%BEEHIVE_HOME%\installed\jakarta-tomcat-5.0.25 -set FORREST_HOME=%BEEHIVE_HOME%\installed\apache-forrest-0.6\src\core -set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%FORREST_HOME%\bin;%PATH% \ No newline at end of file +set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%PATH% \ No newline at end of file Modified: incubator/beehive/trunk/beehiveEnv.sh Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/beehiveEnv.sh?view=diff&rev=111449&p1=incubator/beehive/trunk/beehiveEnv.sh&r1=111448&p2=incubator/beehive/trunk/beehiveEnv.sh&r2=111449 ============================================================================== --- incubator/beehive/trunk/beehiveEnv.sh (original) +++ incubator/beehive/trunk/beehiveEnv.sh Thu Dec 9 16:09:16 2004 @@ -10,6 +10,5 @@ export CATALINA_HOME=$BEEHIVE_HOME/installed/jakarta-tomcat-5.0.25 export ANT_HOME=$BEEHIVE_HOME/installed/apache-ant-1.6.2 -export FORREST_HOME=$BEEHIVE_HOME/installed/apache-forrest-0.6/src/core -export PATH=$JAVA_HOME/bin:$ANT_HOME/bin:$FORREST_HOME/bin:$PATH +export PATH=$JAVA_HOME/bin:$ANT_HOME/bin:$PATH Modified: incubator/beehive/trunk/build.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/build.xml?view=diff&rev=111449&p1=incubator/beehive/trunk/build.xml&r1=111448&p2=incubator/beehive/trunk/build.xml&r2=111449 ============================================================================== --- incubator/beehive/trunk/build.xml (original) +++ incubator/beehive/trunk/build.xml Thu Dec 9 16:09:16 2004 @@ -12,7 +12,6 @@ <property name="tomcat.installer" location="${beehive.external.dir}/tomcat/jakarta-tomcat-5.0.25.zip"/> <property name="ant.installer" location="${beehive.external.dir}/ant/apache-ant-1.6.2-bin.zip"/> <property name="jsr173.installer" location="${beehive.external.dir}/xmlbeans/jsr173_api.jar"/> - <property name="forrest.installer" location="${beehive.external.dir}/forrest/apache-forrest-0.6.zip"/> <target name="bootstrap" depends="ensure.proxysettings" description="Install external dependencies to the installed/ directory"> <antcall target="install.deps"/> @@ -80,7 +79,6 @@ <antcall target="ensure.ant"/> <antcall target="ensure.tomcat"/> <antcall target="ensure.jsr173"/> - <antcall target="ensure.forrest"/> </target> <target name="uninstall.deps" description="Uninstall the external dependencies"> @@ -151,27 +149,6 @@ <!-- ============================================= --> <!-- --> - <!-- Forrest == this is required for building Beehive documentation. --> - <!-- --> - <!-- ============================================= --> - - <target name="ensure.forrest"> - <echo>Ensuring Forrest present in directory: ${beehive.installed.dir}</echo> - <available file="${forrest.dir}" type="dir" property="forrest.present"/> - <echo>forrest.present: ${forrest.present}</echo> - <antcall target="unzip.forrest"/> - </target> - - <target name="unzip.forrest" unless="forrest.present"> - <echo>Unzipping Forrest to directory: ${beehive.installed.dir} from installer ${forrest.installer}</echo> - <unzip src="${forrest.installer}" dest="${beehive.installed.dir}"/> - <!-- Copying xml-commons-resolver-1.1.jar into the Ant lib dir is necessary for Ant to call Forrest targets. --> - <copy file="${beehive.installed.dir}/apache-forrest-0.6/lib/core/xml-commons-resolver-1.1.jar" todir="${beehive.installed.dir}/apache-ant-1.6.2/lib"/> - <chmod dir="${beehive.installed.dir}/apache-forrest-0.6/src/core/bin" perm="755" includes="**/*.sh"/> - </target> - - <!-- ============================================= --> - <!-- --> <!-- Proxy Setup Targets. --> <!-- --> <!-- These settings are used if a proxy needs to --> @@ -226,12 +203,18 @@ <!-- ============================================= --> <target name="docs" description="Generate the Beehive documentation"> - <ant dir="docs" target="site"/> + <echo>Ensuring Forrest present in directory: ${forrest.dir}</echo> + <available file="${forrest.dir}" type="dir" property="forrest.present"/> + <echo>forrest.present: ${forrest.present}</echo> + <echo>You must have Apache Forrest 0.6 installed to execute this target. For instructions on installing Forrest 0.6, see the file BEEHIVE_HOME/Building.txt, the section called "Installation of Apache Forrest".</echo> + <ant target="build-site"/> <ant dir="controls" target="docs" inheritAll="false"/> <ant dir="netui" target="docs" inheritAll="false"/> <ant dir="wsm" target="docs" inheritAll="false"/> - - + </target> + + <target name="build-site" unless="forrest.present"> + <ant dir="docs" target="site"/> </target> <!-- ============================================= -->
