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/24 03:38:50 UTC
svn commit: r201534 - /myfaces/build/trunk/build.xml
Author: schof
Date: Thu Jun 23 18:38:48 2005
New Revision: 201534
URL: http://svn.apache.org/viewcvs?rev=201534&view=rev
Log:
additional tweaks to build
Modified:
myfaces/build/trunk/build.xml
Modified: myfaces/build/trunk/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/build.xml?rev=201534&r1=201533&r2=201534&view=diff
==============================================================================
--- myfaces/build/trunk/build.xml (original)
+++ myfaces/build/trunk/build.xml Thu Jun 23 18:38:48 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<project name="myfaces-release" default="all" >
+<project name="myfaces-release" default="jar-all" >
<!-- ========== Prerequisite Properties =================================== -->
@@ -100,8 +100,25 @@
javac.optimize Indicates whether source should be
compiled with optimization.
-
-
+ jsf-api.jar The path to the JAR file for the JSF api
+ package. Needed in order to compile the
+ tomahawk subproject. Generally this will
+ be a reference to a locally built copy
+ of myfaces-api.jar but the RI can be used
+ as well.
+
+ jsf-impl.jar The path to the JAR file for the JSF impl
+ package. Needed in order to compile the
+ tomahawk subproject. Generally this will
+ be a reference to a locally built copy
+ of myfaces-impl.jar but the RI can be used
+ as well.
+
+ tomahawk.jar The path to the JAR file for the MyFaces
+ tomahawk package. Needed in order to
+ compile the examples subproject. This
+ should be a reference to a locally built
+ copy.
-->
<property file="../build.properties"/>
<property file="../manfiest.properties"/>
@@ -118,7 +135,7 @@
Default values for unspecified subproject properties (keeps build from crashing
if subproject doesn't need/specify them)
-->
- <property name="api.classes.dir" location="${basedir}/../api/build/temp/classes/"/>
+ <property name="api.classes.dir" location="${basedir}/../../api/build/temp/classes/"/>
<property name="jar.fileset2.dir" location=""/>
<property name="jar.include2.pattern" value="**"/>
<property name="jar.exclude2.pattern" value="**"/>
@@ -128,6 +145,9 @@
<property name="zip.fileset2.dir" location=""/>
<property name="zip.fileset2.inc.pat" value="*.foo"/>
<property name="zip.fileset2.exc.pat" value="**"/>
+ <property name="jsf-api.jar" location="${basedir}/../../api/build/dist/myfaces-api.jar"/>
+ <property name="jsf-impl.jar" location="${basedir}/../../impl/build/dist/myfaces-impl.jar"/>
+ <property name="tomahawk.jar" location="${basedir}/../../tomahawk/build/dist/tomahawk.jar"/>
<!-- ========== Initialization Properties ================================= -->
@@ -159,6 +179,10 @@
<property name="tlddoc.xslt.dir" location="${build.dir}/tlddoc-xslt"/>
<property name="tlddoc.dtd" location="${tlddoc.dtd.dir}/web-jsptaglibrary_1_2.dtd"/>
+ <!-- This is only used if you execute "ant download-dependencies" -->
+ <property name="lib.dir" value="${project.dir}/lib" />
+
+<!--
<property name="project.home" location="${project.dir}"/>
<property name="nightly.dir" location="${build.dir}/nightly"/>
<property name="dist.dir" location="${build.dir}/dist"/>
@@ -178,11 +202,6 @@
<property name="generated.src" location="${project.dir}/src/generated"/>
<property name="sign.script" location="${release.dir}/sign.sh"/>
- <!-- This is only used if you execute "ant download-dependencies" -->
- <property name="lib.dir" value="${project.dir}/lib" />
-
-
-
<property name="release.version" value="${manifest.impl.version}"/>
<property name="src.release.bundle" value="myfaces-${release.version}-src"/>
<property name="bin.release.bundle" value="myfaces-${release.version}"/>
@@ -195,28 +214,33 @@
<property name="impl.classes" location="${temp.dir}/myfaces-impl/classes"/>
<property name="components.classes" location="${temp.dir}/myfaces-components/classes"/>
-
+-->
<!-- Compilation Classpath -->
<path id="compile.classpath">
- <pathelement location="${commons-beanutils.jar}"/>
- <pathelement location="${commons-codec.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-digester.jar}"/>
- <pathelement location="${commons-el.jar}"/>
- <pathelement location="${commons-fileupload.jar}"/>
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${commons-validator.jar}"/>
- <pathelement location="${jakarta-oro.jar}"/>
- <pathelement location="${jsp.jar}"/>
- <pathelement location="${jstl.jar}"/>
- <pathelement location="${portlet-api.jar}"/>
- <pathelement location="${servlet-api.jar}"/>
- <pathelement location="${struts.jar}"/>
- <pathelement location="${tlddoc.jar}"/>
- <pathelement location="${xdoclet.jar}"/>
- <pathelement location="${xjavadoc.jar}"/>
+ <!-- these jars available through maven repository -->
+ <pathelement location="${commons-beanutils.jar}"/>
+ <pathelement location="${commons-codec.jar}"/>
+ <pathelement location="${commons-collections.jar}"/>
+ <pathelement location="${commons-digester.jar}"/>
+ <pathelement location="${commons-el.jar}"/>
+ <pathelement location="${commons-fileupload.jar}"/>
+ <pathelement location="${commons-logging.jar}"/>
+ <pathelement location="${commons-validator.jar}"/>
+ <pathelement location="${jakarta-oro.jar}"/>
+ <pathelement location="${jsp.jar}"/>
+ <pathelement location="${jstl.jar}"/>
+ <pathelement location="${portlet-api.jar}"/>
+ <pathelement location="${servlet-api.jar}"/>
+ <pathelement location="${struts.jar}"/>
+ <pathelement location="${tlddoc.jar}"/>
+ <pathelement location="${xdoclet.jar}"/>
+ <pathelement location="${xjavadoc.jar}"/>
+ <!-- these jars are built/provided locally -->
+ <pathelement location="${jsf-api.jar}"/>
+ <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${tomahawk.jar}"/>
<!-- this is harmless if not used -->
<!--
@@ -355,6 +379,10 @@
<property name="classes.dir" value="${basedir}/../${subproject}/build/temp/classes"/>
<property name="javadoc.dir" value="${basedir}/../${subproject}/build/temp/javadoc"/>
<property name="tlddoc.dir" value="${basedir}/../${subproject}/build/temp/tlddoc"/>
+ <property name="jsf-api.jar" location="${basedir}/../api/build/dist/myfaces-api.jar"/>
+ <property name="jsf-impl.jar" location="${basedir}/../impl/build/dist/myfaces-impl.jar"/>
+ <property name="api.classes.dir" location="${basedir}/../api/build/temp/classes/"/>
+ <property name="tomahawk.jar" location="${basedir}/../tomahawk/build/dist/tomahawk.jar"/>
<property file="${basedir}/../${subproject}/build.properties"/>
<property file="${basedir}/../${subproject}/manifest.properties"/>
</ant>
@@ -388,6 +416,10 @@
Compile current subproject
-->
<target name="compile">
+<!--
+ <property name="cp" refid="compile.classpath"/>
+ <echo message="cp = ${cp}"/>
+-->
<mkdir dir="${classes.dir}"/>
<javac srcdir="${src.dir}"
destdir="${classes.dir}"