1.1 --- a/build.xml Wed Jun 24 14:53:01 2009 +0200
1.2 +++ b/build.xml Wed Jun 24 16:38:24 2009 +0200
1.3 @@ -16,7 +16,7 @@
1.4 </target>
1.5
1.6 <!-- basic parameters -->
1.7 - <property name="plugs" value="../../plugs"/>
1.8 + <property name="plugs" value="${ant.file.modularize}/../../../plugs"/>
1.9 <fail message="You need to provide location of plugs">
1.10 <condition><not><available file="${plugs}/jre/lib/rt-closed.jar"/></not></condition>
1.11 </fail>
1.12 @@ -63,7 +63,13 @@
1.13 <pathelement location="src/solaris/classes"/>
1.14 <!-- <pathelement location="src/windows/classes"/> -->
1.15 </path>
1.16 - <property name="build.dir" location="build/modularize"/>
1.17 + <property name="build.dir" location="${ant.file.modularize}/../build/modularize"/>
1.18 + <path id="boot">
1.19 + <fileset dir="${build.dir}">
1.20 + <include name="*.jar"/>
1.21 + </fileset>
1.22 + </path>
1.23 + <property name="test.dir" value="${ant.file.modularize}/../build/test"/>
1.24
1.25 <!-- this is the core of the separation - definition
1.26 of what classes belong into what compilation group.
1.27 @@ -360,15 +366,11 @@
1.28
1.29 <!-- basic sanity tests -->
1.30 <target name="test">
1.31 - <property name="test.dir" value="build/test"/>
1.32 <mkdir dir="${test.dir}"/>
1.33 - <path id="boot">
1.34 - <fileset dir="${build.dir}">
1.35 - <include name="*.jar"/>
1.36 - </fileset>
1.37 - </path>
1.38 -
1.39 - <javac srcdir="test/java/util/Properties" destdir="${test.dir}" includeantruntime="false" includejavaruntime="false">
1.40 + <javac srcdir="test/java/util/Properties" destdir="${test.dir}"
1.41 + includeantruntime="false" includejavaruntime="false"
1.42 + debug="true" debuglevel="lines,vars,source"
1.43 + >
1.44 <bootclasspath refid="boot"/>
1.45 </javac>
1.46
1.47 @@ -402,6 +404,8 @@
1.48 includejavaruntime="false"
1.49 includeantruntime="false"
1.50 classpath="${module.cp}:${plugs}/jre/lib/rt-closed.jar"
1.51 + debug="true"
1.52 + debuglevel="lines,vars,source"
1.53 >
1.54 <src refid="src.path"/>
1.55 <and>