diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2008-12-16 17:23:22 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2008-12-16 17:23:22 +0000 |
| commit | 93cd46fd77d246d9abacf9148bc8d3753c089f59 (patch) | |
| tree | b08c5ad9d2309f64cc3462cdea35b9d85068b8e4 | |
| parent | 941d559c7ba17f65d4e07afbbaf8a28db7a71dc5 (diff) | |
| download | scala-93cd46fd77d246d9abacf9148bc8d3753c089f59.tar.gz scala-93cd46fd77d246d9abacf9148bc8d3753c089f59.tar.bz2 scala-93cd46fd77d246d9abacf9148bc8d3753c089f59.zip | |
enabling 1.4 specific actors sources
| -rw-r--r-- | src/build/four.xml | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/src/build/four.xml b/src/build/four.xml index 64e7987aad..857e858ab3 100644 --- a/src/build/four.xml +++ b/src/build/four.xml @@ -52,6 +52,31 @@ JAVA 1.4 LIBRARY AND COMPILER BUILD (FOUR) </union> </difference> </delete> + <mkdir dir="${build-four-src.dir}-actors"/> + <copy todir="${build-four-src.dir}-actors" overwrite="true"> + <fileset dir="${src.dir}/actors"> + <and> + <present present="srconly" targetdir="${src.dir}/jvm14-actors"/> + <different targetdir="${build-four-src.dir}-actors" ignoreFileTimes="true"/> + </and> + </fileset> + <fileset dir="${src.dir}/jvm14-actors"> + <different targetdir="${build-four-src.dir}-actors" ignoreFileTimes="true"/> + </fileset> + </copy> + <delete verbose="true"> + <difference> + <fileset dir="${build-four-src.dir}-actors"/> + <union> + <fileset dir="${build-four-src.dir}-actors"> + <present targetdir="${src.dir}/jvm14-actors"/> + </fileset> + <fileset dir="${build-four-src.dir}-actors"> + <present targetdir="${src.dir}/actors"/> + </fileset> + </union> + </difference> + </delete> </target> <target name="four.lib" depends="four.src"> @@ -64,7 +89,7 @@ JAVA 1.4 LIBRARY AND COMPILER BUILD (FOUR) includes="**/*.java" target="1.4" source="1.4"/> <javac - srcdir="${src.dir}/actors" + srcdir="${build-four-src.dir}-actors" destdir="${build-four.dir}/classes/library" classpath="${build-four.dir}/classes/library" includes="**/*.java" @@ -86,7 +111,7 @@ JAVA 1.4 LIBRARY AND COMPILER BUILD (FOUR) <exclude name="scala/Predef.scala"/> </scalac> <scalac - srcdir="${src.dir}/actors" + srcdir="${build-four-src.dir}-actors" destdir="${build-four.dir}/classes/library" classpath="${build-four.dir}/classes/library" target="jvm-1.4"> @@ -275,7 +300,7 @@ DOCUMENTATION classpathref="pack.classpath"> <src> <files includes="${src.dir}/dbc"/> - <files includes="${src.dir}/actors"/> + <files includes="${build-four-src.dir}-actors"/> <files includes="${build-four-src.dir}"/> </src> <include name="**/*.scala"/> @@ -388,7 +413,7 @@ DISTRIBUTION <mkdir dir="${four-dist.dir}/src"/> <jar destfile="${four-dist.dir}/src/scala-library-src.jar"> <fileset dir="${build-four-src.dir}"/> - <fileset dir="${src.dir}/actors"/> + <fileset dir="${build-four-src.dir}-actors"/> </jar> <jar destfile="${four-dist.dir}/src/scala-dbc-src.jar"> <fileset dir="${src.dir}/dbc"/> |