Author: rgielen
Date: Tue Apr 11 13:51:49 2006
New Revision: 393306
URL: http://svn.apache.org/viewcvs?rev=393306&view=rev
Log:
First works on fixing ant build:
- Quick-fixed compile/jar target
TBD:
- check/fix other targets too
- introduce more modular build as suggested by Jason, including restructuring
of build-files
Modified:
incubator/webwork2/build.xml
incubator/webwork2/osbuild.xml
Modified: incubator/webwork2/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/build.xml?rev=393306&r1=393305&r2=393306&view=diff
==============================================================================
--- incubator/webwork2/build.xml (original)
+++ incubator/webwork2/build.xml Tue Apr 11 13:51:49 2006
@@ -1,7 +1,7 @@
<project name="action" default="jar" basedir=".">
<!-- overridden properties (must be before the import!) -->
- <property name="src.test" value="src/test"/>
- <property name="src.xdt" value="src/xdt"/>
+ <property name="src.test" value="action/src/test"/>
+ <property name="src.xdt" value="action/src/xdt"/>
<property name="compile.version" value="1.4"/>
<property name="test.compile.version" value="1.4"/>
Modified: incubator/webwork2/osbuild.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/osbuild.xml?rev=393306&r1=393305&r2=393306&view=diff
==============================================================================
--- incubator/webwork2/osbuild.xml (original)
+++ incubator/webwork2/osbuild.xml Tue Apr 11 13:51:49 2006
@@ -30,12 +30,14 @@
<property name="lib.build" value="${lib}/build"/>
<property name="lib.optional" value="${lib}/optional"/>
- <property name="src" location="src"/>
- <property name="src.java" value="${src}/java"/>
+ <property name="src" location="action/src"/>
+ <property name="src.java" value="${src}/main/java"/>
<property name="test" value="${src}/test"/>
<property name="src.test" value="${test}/java"/>
+ <property name="src.resources" value="${src}/main/resources"/>
+
<property name="build" location="build"/>
<property name="build.test" value="${build}/test"/>
<property name="build.java-test" value="${build}/java-test"/>
@@ -131,6 +133,11 @@
<target name="compile" depends="init,precompile" description="compile
project">
<compile srcdir="${src.java}" destdir="${build.java}"
excludes="${optional.sources}" />
+ <copy filtering="no" todir="${build.java}" includeemptydirs="false">
+ <fileset dir="${src.resources}" >
+ <exclude name="java/*"/>
+ </fileset>
+ </copy>
</target>
<target name="jar" depends="compile" description="build the project jar
file">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
