You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sc...@apache.org on 2005/06/27 14:51:23 UTC
svn commit: r201980 - in /myfaces: build/trunk/build.xml
examples/trunk/build.properties
Author: schof
Date: Mon Jun 27 05:51:22 2005
New Revision: 201980
URL: http://svn.apache.org/viewcvs?rev=201980&view=rev
Log:
tweaks to build process
Added:
myfaces/examples/trunk/build.properties
Modified:
myfaces/build/trunk/build.xml
Modified: myfaces/build/trunk/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/build.xml?rev=201980&r1=201979&r2=201980&view=diff
==============================================================================
--- myfaces/build/trunk/build.xml (original)
+++ myfaces/build/trunk/build.xml Mon Jun 27 05:51:22 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<project name="myfaces-release" default="jar-all" >
+<project name="myfaces-release" default="dist-all" >
<!-- ========== Prerequisite Properties =================================== -->
@@ -568,5 +568,90 @@
<arg value="${resolved-tlds.dir}/*.tld"/>
</java>
</target>
+
+ <!--
+ Create distribution files for all subprojects
+ -->
+ <target name="dist-all">
+ <ant target="project">
+ <property name="target" value="dist"/>
+ </ant>
+ <!--
+ Examples subproject needs to be handled specially
+ -->
+ <ant target="subproject">
+ <property name="subproject" value="examples"/>
+ <property name="target" value="dist-examples"/>
+ </ant>
+ </target>
+
+ <!--
+ Create distribution files for examples subproject (requires its own task since its a bit different)
+ -->
+ <target name="dist-examples">
+ <property name="example.name" value="simple"/>
+
+ <property name="examples.lib" value="build/temp/lib"/>
+ <mkdir dir="${examples.lib}"/>
+ <copy file="${commons-beanutils.jar}" todir="${examples.lib}"/>
+ <copy file="${commons-codec.jar}" todir="${examples.lib}"/>
+ <copy file="${commons-collections.jar}" todir="${examples.lib}"/>
+ <copy file="${commons-digester.jar}" todir="${examples.lib}"/>
+ <copy file="${commons-el.jar}" todir="${examples.lib}"/>
+ <copy file="${commons-fileupload.jar}" todir="${examples.lib}"/>
+ <copy file="${commons-logging.jar}" todir="${examples.lib}"/>
+ <copy file="${commons-validator.jar}" todir="${examples.lib}"/>
+ <copy file="${jakarta-oro.jar}" todir="${examples.lib}"/>
+ <copy file="${jsp.jar}" todir="${examples.lib}"/>
+ <copy file="${jstl.jar}" todir="${examples.lib}"/>
+ <copy file="${portlet-api.jar}" todir="${examples.lib}"/>
+ <copy file="${servlet-api.jar}" todir="${examples.lib}"/>
+ <copy file="${struts.jar}" todir="${examples.lib}"/>
+ <copy file="${tlddoc.jar}" todir="${examples.lib}"/>
+ <!--
+ <copy file="${xdoclet.jar}" todir="${examples.lib}"/>
+ <copy file="${xjavadoc.jar}" todir="${examples.lib}"/>
+ -->
+ <!-- these jars are built/provided locally -->
+ <copy file="${jsf-api.jar}" todir="${examples.lib}"/>
+ <copy file="${jsf-impl.jar}" todir="${examples.lib}"/>
+ <copy file="${tomahawk.jar}" todir="${examples.lib}"/>
+
+ <ant target="war" antfile="build/build.xml">
+ <property name="src.dir" value="${example.name}/src/java"/>
+ <property name="classes.dir" value="build/temp/${example.name}/classes"/>
+ <property name="dist.dir" value="build/dist/${example.name}"/>
+ <property name="jar.file" value="${example.name}.jar"/>
+ <property name="jar.include.pattern" value="**/*"/>
+ <property name="war.file" value="build/dist/${example.name}.war"/>
+ <property name="web.dir" value="${example.name}"/>
+<!--
+ <property name="jar.fileset2.dir" value="${example.name}/src/java"/>
+ <property name="jar.fileset2.inc.pat" value="**/*.properties"/>
+ <property name="jar.fileset2.exc.pat" value="nothing"/>
+-->
+ </ant>
+ </target>
+
+ <target name="war" depends="jar">
+ <war warfile="${war.file}" webxml="${web.dir}/WEB-INF/web.xml">
+ <fileset dir="${web.dir}">
+ <exclude name="src/**"/>
+ <exclude name="WEB-INF/classes/**"/>
+ <exclude name="WEB-INF/lib/**"/>
+ <exclude name="WEB-INF/web.xml"/>
+ </fileset>
+ <classes dir="${web.dir}/src/java">
+ <include name="**/*.properties"/>
+ </classes>
+ <lib dir="${examples.lib}"/>
+ <lib dir="${dist.dir}" />
+ </war>
+ </target>
+
+ <!--
+ Create distribution files for current project
+ -->
+ <target name="dist"/><!-- ###uncomment when done testing### depends="jar, javadoc"/>-->
</project>
Added: myfaces/examples/trunk/build.properties
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/build.properties?rev=201980&view=auto
==============================================================================
--- myfaces/examples/trunk/build.properties (added)
+++ myfaces/examples/trunk/build.properties Mon Jun 27 05:51:22 2005
@@ -0,0 +1,10 @@
+# These are the subproject build properties used to perform the build. They allow the same build script
+# to be used to build the entire project or a specific subproject. They should not be changed by the user.
+
+subproject.dir = ${basedir}/../
+src.dir = ${subproject.dir}/src/java
+temp.dir = ${basedir}/temp
+jar.file = myfaces-api.jar
+jar.include.pattern = javax/**/*.class
+javadoc.title = Apache MyFaces: API
+javadoc.package = javax.faces.*
\ No newline at end of file