Skip to content

Commit

Permalink
Fixed overwrite of classes files by Retroweaver.
Browse files Browse the repository at this point in the history
git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@227 c6a108a4-781c-0410-a6c6-c2d559e19af0
  • Loading branch information
lucboudreau committed May 7, 2009
1 parent ecd743d commit 39cd229
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@

<property name="jar-jdk14.file"
value="${dist.dir}/${ivy.artifact.id}-${project.revision}-jdk14.jar" />

<property name="classes-jdk14.dir"
value="${bin.dir}/classes-jdk14" />

<property name="dist.doc.file" value="${dist.dir}/doc.tar.gz" />

<property name="generated.java.files"
Expand Down Expand Up @@ -194,16 +198,22 @@ test.properties.example" />
</target>

<!-- create a retrowoven jar file which will work under jdk1.4 -->
<target name="jar-jdk14" depends="retroweave">
<mkdir dir="${lib.dir}" />
<target name="jar-jdk14">
<copy todir="${classes-jdk14.dir}">
<fileset dir="${classes.dir}" includes="**/*"/>
</copy>
<antcall target="retroweave"/>
<zip zipfile="${jar-jdk14.file}" update="true">
<zipfileset dir="${classes.dir}"
<zipfileset dir="${classes-jdk14.dir}"
includes="
**/*.class,
**/*.properties,
**/*.xml,
META-INF/**" />
</zip>
<delete includeemptydirs="true">
<fileset dir="${classes-jdk14.dir}" includes="**/*"/>
</delete>
</target>

<target name="retroweave">
Expand All @@ -215,7 +225,7 @@ META-INF/**" />
<pathelement location="${lib.dir}/retroweaver-rt.jar" />
</classpath>
</taskdef>
<retroweaver srcdir="${classes.dir}" />
<retroweaver srcdir="${classes-jdk14.dir}" />
</target>

<!--
Expand Down

0 comments on commit 39cd229

Please sign in to comment.