avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pro...@apache.org
Subject cvs commit: jakarta-avalon-apps/phyre build.xml default.properties
Date Thu, 01 Aug 2002 20:36:14 GMT
proyal      2002/08/01 13:36:14

  Modified:    phyre    build.xml default.properties
  Log:
  * Update build to build the SAR
  * Sign jars for WebStart
  
  Revision  Changes    Path
  1.2       +184 -11   jakarta-avalon-apps/phyre/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/phyre/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	26 Jul 2002 20:16:34 -0000	1.1
  +++ build.xml	1 Aug 2002 20:36:14 -0000	1.2
  @@ -3,6 +3,7 @@
   ==============================================================================
    Avalon Applications Phyre build file
   
  +
   Type 'ant' to build. The flag '-projecthelp' will list normal targets. If
   combined with '-verbose', all targets are printed.
   
  @@ -11,7 +12,8 @@
   module:{xxx}.
   
   Authors:
  -	Peter Royal <proyal@apache.org>
  +	Leo Simons <lsimons@multimia.com>
  +    Peter Royal <proyal@apache.org>
   
   Legal:
   	Copyright (c) 2002 The Apache Software Foundation. All Rights Reserved.
  @@ -19,11 +21,48 @@
   -->
   <project name="Phyre" default="main" basedir=".">
   
  +    <target name="setup">
  +		<!-- set up properties -->
  +		<property file="${user.home}/build.properties"/>
  +		<property file="${user.home}/.ant.properties"/>
  +		<property file="${basedir}/ant.properties"/>
  +		<property file="${basedir}/../ant.properties"/>
  +		<property file="${basedir}/default.properties"/>
  +		<property file="${basedir}/../default.properties"/>
  +		<property file="${basedir}/../cocoon.properties"/>
  +
  +		<!-- set up classpath -->
  +		<path id="project.class.path">
  +			<pathelement path="${java.class.path}" />
  +			<pathelement path="${build.classes}" />
  +			<fileset dir="${common.lib}">
  +				<include name="*.jar" />
  +			</fileset>
  +			<fileset dir="${lib.dir}">
  +				<include name="*.jar" />
  +			</fileset>
  +		</path>
  +
  +		<path id="tools.class.path">
  +			<path refid="project.class.path"/>
  +			<fileset dir="${tools.lib}">
  +				<include name="*.jar" />
  +				<exclude name="ant.jar" />
  +			</fileset>
  +		</path>
  +
  +		<!-- set up custom tasks -->
  +		<taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
  +			<classpath refid="project.class.path" />
  +		</taskdef>
  +	</target>
  +
  +
   <!-- ==========================================================================================
   	DEFAULT TARGETS
        ==========================================================================================
-->
   
  -	<target name="main" depends="jar" description="Default target to generate build products
minus docs"/>
  +	<target name="main" depends="sar" description="Default target to generate build products
minus docs"/>
   	<target name="all" depends="main,docs" description="Generate build products including
docs"/>
   	<target name="docs" depends="html-docs,javadocs" description="generates all the Avalon
documentation"/>
   
  @@ -32,20 +71,160 @@
        ==========================================================================================
-->
   
   	<target name="compile">
  -		<ant antfile="${basedir}/../build.xml" target="module:compiler"/>
  +		<ant antfile="${basedir}/../build.xml" target="module:compile"/>
   	</target>
   
   	<target name="test" description="Run unit tests to verify the application works corretly.">
   		<ant antfile="${basedir}/../build.xml" target="module:test"/>
   	</target>
   
  +    <target name="phoenix-xdoclet">
  +        <ant antfile="${basedir}/../build.xml" target="module:phoenix-xdoclet"/>
  +    </target>
  +
  +    <target name="no-phoenix-xdoclet">
  +        <ant antfile="${basedir}/../build.xml" target="module:no-phoenix-xdoclet"/>
  +    </target>
  +
   
   <!-- ==========================================================================================
   	DISTRIBUTION TARGETS
        ==========================================================================================
-->
   
  -	<target name="jar">
  -		<ant antfile="${basedir}/../build.xml" target="module:jar"/>
  +	<!-- Jars up project -->
  +	<target name="jar" depends="phoenix-xdoclet, no-phoenix-xdoclet,setup">
  +		<echo message="-------------------------------------------------------------" />
  +		<echo message="INFO: Creating jar file for ${Name}" />
  +		<echo message="   generated file: ${build.lib}/${name}.jar" />
  +		<echo message="-------------------------------------------------------------" />
  +		<mkdir dir="${build.lib}"/>
  +
  +		<jar jarfile="${build.lib}/${name}.jar"
  +				 manifest="${build.xdoclet}/manifest.mf">
  +
  +			<fileset dir="${build.classes}">
  +				<include name="org/apache/**"/>
  +				<exclude name="org/apache/avalon/phyre/block/**"/>
  +			</fileset>
  +		</jar>
  +		<jar jarfile="${build.lib}/${name}-block.jar"
  +				 manifest="${build.xdoclet}/manifest.mf">
  +
  +			<fileset dir="${build.classes}">
  +				<include name="org/apache/avalon/phyre/block/**"/>
  +			</fileset>
  +			<fileset dir="${build.xdoclet}">
  +				<include name="**/*.xinfo"/>
  +			</fileset>
  +		</jar>
  +	</target>
  +
  +    <target name="prep-webstart" depends="setup,jar">
  +		<echo message="-------------------------------------------------------------" />
  +		<echo message="INFO: Gathering webstart files ${Name}" />
  +		<echo message="-------------------------------------------------------------" />
  +		<mkdir dir="${build.dir}/webstart"/>
  +
  +		<copy todir="${build.dir}/webstart">
  +			<fileset dir="${conf.dir}">
  +                <include name="*.jnlp"/>
  +			</fileset>
  +			<fileset dir="${lib.dir}">
  +                <include name="*.jar"/>
  +			</fileset>
  +			<fileset dir="${build.lib}">
  +				<include name="${name}.jar"/>
  +			</fileset>
  +			<fileset dir="${common.lib}">
  +                <include name="avalon-framework-20020725.jar"/>
  +                <include name="excalibur-cli-1.0.jar"/>
  +                <include name="excalibur-collections-1.0.jar"/>
  +                <include name="excalibur-concurrent-1.0.jar"/>
  +                <include name="excalibur-event-1.0a.jar"/>
  +                <include name="excalibur-fortress-1.0.jar"/>
  +                <include name="excalibur-instrument-*0.2.jar"/>
  +                <include name="excalibur-io-1.1.jar"/>
  +                <include name="excalibur-logger-1.0.jar"/>
  +                <include name="excalibur-mpool-1.0.jar"/>
  +                <include name="excalibur-pool-1.0.jar"/>
  +                <include name="excalibur-sourceresolve-1.0.jar"/>
  +                <include name="excalibur-thread-1.0.jar"/>
  +                <include name="excalibur-util-1.0.jar"/>
  +                <include name="logkit-1.1a.jar"/>
  +                <include name="xalan-2.3.1.jar"/>
  +                <include name="xerces-2.0.1.jar"/>
  +                <include name="xml-apis.jar"/>
  +			</fileset>
  +		</copy>
  +    </target>
  +
  +    <target name="sign-webstart" depends="setup, prep-webstart" if="webstart.sign.alias">
  +		<echo message="-------------------------------------------------------------" />
  +		<echo message=" Signing jars for WebStart." />
  +		<echo message="-------------------------------------------------------------" />
  +
  +        <signjar jar="${build.dir}/webstart/${name}.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/avalon-framework-20020725.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/excalibur-cli-1.0.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/excalibur-collections-1.0.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/excalibur-concurrent-1.0.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/excalibur-event-1.0a.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/excalibur-fortress-1.0.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/excalibur-instrument-0.2.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/excalibur-instrument-manager-0.2.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/excalibur-instrument-manager-interfaces-0.2.jar"
alias="${webstart.sign.alias}" storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/excalibur-io-1.1.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/excalibur-logger-1.0.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/excalibur-mpool-1.0.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/excalibur-pool-1.0.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/excalibur-sourceresolve-1.0.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/excalibur-thread-1.0.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/excalibur-util-1.0.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/logkit-1.1a.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/xalan-2.3.1.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/xerces-2.0.1.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/xml-apis.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/mx4j-jmx.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +        <signjar jar="${build.dir}/webstart/mx4j-tools.jar" alias="${webstart.sign.alias}"
storepass="${webstart.sign.storepass}" keypass="${webstart.sign.keypass}"/>
  +    </target>
  +
  +
  +    <target name="no-sign-webstart" depends="setup" unless="webstart.sign.alias">
  +		<echo message="-------------------------------------------------------------" />
  +		<echo message=" *NOT* signing jars for WebStart. It will *NOT* work" />
  +		<echo message="-------------------------------------------------------------" />
  +    </target>
  +
  +
  +	<!-- Sars up project -->
  +	<target name="sar" depends="setup,jar,prep-webstart, sign-webstart, no-sign-webstart">
  +		<echo message="-------------------------------------------------------------" />
  +		<echo message="INFO: Creating sar file for ${Name}" />
  +		<echo message="   generated file: ${build.lib}/${name}.sar" />
  +		<echo message="-------------------------------------------------------------" />
  +		<sar sarfile="${build.lib}/${name}.sar"
  +				config="${conf.dir}/${name}-config.xml"
  +				environment="${conf.dir}/${name}-environment.xml"
  +				assembly="${conf.dir}/${name}-assembly.xml" >
  +
  +			<lib dir="${build.lib}/">
  +				<include name="${name}-block.jar"/>
  +			</lib>
  +			<lib dir="${common.lib}">
  +				<include name="cornerstone.jar"/>
  +			</lib>
  +            <fileset dir="${build.dir}">
  +                <include name="webstart/*"/>
  +            </fileset>
  +		</sar>
  +
  +		<mkdir dir="${dist.dir}"/>
  +
  +		<copy todir="${dist.dir}">
  +			<fileset dir="${build.lib}">
  +				<include name="**"/>
  +			</fileset>
  +		</copy>
   	</target>
   
   	<target name="dist">
  @@ -72,12 +251,6 @@
   		<ant antfile="${basedir}/../build.xml" target="module:clean"/>
   	</target>
   
  -	<target name="distclean">
  -		<echo message="-------------------------------------------------------------" />
  -		<echo message="WARNING: Deprecated. Use the real-clean target instead" />
  -		<echo message="-------------------------------------------------------------" />
  -		<ant antfile="${basedir}/../build.xml" target="module:real-clean"/>
  -	</target>
   	<target name="real-clean" description="Cleans up all generated files and directories">
   		<ant antfile="${basedir}/../build.xml" target="module:real-clean"/>
   	</target>
  
  
  
  1.2       +4 -1      jakarta-avalon-apps/phyre/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/phyre/default.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- default.properties	26 Jul 2002 20:16:34 -0000	1.1
  +++ default.properties	1 Aug 2002 20:36:14 -0000	1.2
  @@ -1,7 +1,10 @@
   # ============================================================================
  -# Standard Build Properties for XCommander
  +# Standard Build Properties for Phyre
   # ============================================================================
   # Overrides the incorrect values in ../default.properties.
  +
  +override.sar        = true
  +override.jar        = true
   
   # ----------------------------------------------------------------------------
   #           DOC GENERATION CONFIGURATION
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message