You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2006/07/11 16:07:07 UTC
svn commit: r420855 - in /incubator/harmony/enhanced/classlib/trunk:
make/properties.xml modules/archive/build.xml modules/auth/build.xml
modules/luni/build.xml modules/nio/build.xml modules/prefs/build.xml
modules/text/build.xml
Author: hindessm
Date: Tue Jul 11 07:07:06 2006
New Revision: 420855
URL: http://svn.apache.org/viewvc?rev=420855&view=rev
Log:
Adding make macro and fixing clean calls in luni.
Modified:
incubator/harmony/enhanced/classlib/trunk/make/properties.xml
incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
Modified: incubator/harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?rev=420855&r1=420854&r2=420855&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Tue Jul 11 07:07:06 2006
@@ -200,4 +200,20 @@
</subant>
</target>
+ <!-- macros for modules -->
+ <!-- TOFIX move to a shared file in the HDK/build/make directory. -->
+
+ <macrodef name="make">
+ <attribute name="dir" />
+ <attribute name="target" default="" />
+ <sequential>
+ <exec failonerror="true"
+ executable="${make.command}"
+ dir="@{dir}">
+ <env key="HY_HDK" value="${hy.hdk}" />
+ <arg line="@{target}" />
+ </exec>
+ </sequential>
+ </macrodef>
+
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml?rev=420855&r1=420854&r2=420855&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml Tue Jul 11 07:07:06 2006
@@ -46,67 +46,42 @@
</copy>
</target>
- <target name="overlay-oss">
- <mkdir dir="${hy.archive.src.main.native}/zlib_dist" />
- <unzip src="${zlib.zip}" dest="${hy.archive.src.main.native}/zlib_dist" />
- <chmod dir="${hy.archive.src.main.native}/zlib_dist" perm="ugo+r" />
- </target>
-
- <target name="clean-overlay-oss">
- <delete dir="${hy.archive.src.main.native}/zlib_dist" quiet="true" />
- </target>
-
- <!-- Build native code -->
+ <target name="overlay-oss">
+ <mkdir dir="${hy.archive.src.main.native}/zlib_dist" />
+ <unzip src="${zlib.zip}" dest="${hy.archive.src.main.native}/zlib_dist" />
+ <chmod dir="${hy.archive.src.main.native}/zlib_dist" perm="ugo+r" />
+ </target>
+
+ <target name="clean-overlay-oss">
+ <delete dir="${hy.archive.src.main.native}/zlib_dist" quiet="true" />
+ </target>
+
+ <!-- Build native code -->
<target name="build.native" >
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.archive.src.main.native}/zip/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- </exec>
+ <make dir="${hy.archive.src.main.native}/zip/${hy.os}" />
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.archive.src.main.native}/zlib/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- </exec>
+ <make dir="${hy.archive.src.main.native}/zlib/${hy.os}" />
<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
- <fileset dir="${hy.archive.src.main.native}/zlib">
+ <fileset dir="${hy.archive.src.main.native}/zlib">
<patternset includes="*${shlib.suffix}*" />
</fileset>
</copy>
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.archive.src.main.native}/archive/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- </exec>
- <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
- <fileset dir="${hy.archive.src.main.native}/archive">
+ <make dir="${hy.archive.src.main.native}/archive/${hy.os}" />
+ <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+ <fileset dir="${hy.archive.src.main.native}/archive">
<patternset includes="*${shlib.suffix}*" />
</fileset>
</copy>
</target>
- <!-- Clean natives -->
+ <!-- Clean natives -->
<target name="clean.native">
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.archive.src.main.native}/zip/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- <arg line="clean" />
- </exec>
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.archive.src.main.native}/zlib/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- <arg line="clean" />
- </exec>
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.archive.src.main.native}/archive/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- <arg line="clean" />
- </exec>
+ <make dir="${hy.archive.src.main.native}/zip/${hy.os}" target="clean" />
+ <make dir="${hy.archive.src.main.native}/zlib/${hy.os}"
+ target="clean" />
+ <make dir="${hy.archive.src.main.native}/archive/${hy.os}"
+ target="clean" />
</target>
<target name="test" depends="build, compile.tests, run.tests" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml?rev=420855&r1=420854&r2=420855&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml Tue Jul 11 07:07:06 2006
@@ -48,30 +48,21 @@
<target name="test" depends="build, compile.tests, run.tests" />
- <!-- Build native code -->
+ <!-- Build native code -->
<target name="build.native" >
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.auth.src.main.native}/auth/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- </exec>
+ <make dir="${hy.auth.src.main.native}/auth/${hy.os}" />
- <!-- Copy the built shared libs over to the jre/bin dir -->
- <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
- <fileset dir="${hy.auth.src.main.native}/auth">
+ <!-- Copy the built shared libs over to the jre/bin dir -->
+ <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+ <fileset dir="${hy.auth.src.main.native}/auth">
<patternset includes="*${shlib.suffix}*" />
</fileset>
</copy>
</target>
- <!-- Clean natives -->
+ <!-- Clean natives -->
<target name="clean.native">
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.auth.src.main.native}/auth/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- <arg line="clean" />
- </exec>
+ <make dir="${hy.auth.src.main.native}/auth/${hy.os}" target="clean" />
</target>
<target name="clean">
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=420855&r1=420854&r2=420855&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Tue Jul 11 07:07:06 2006
@@ -92,113 +92,81 @@
</copy>
</target>
- <!-- Build native code -->
- <target name="build.native" depends="build.native.core, build.native.secondary" />
+ <!-- Build native code -->
+ <target name="build.native"
+ depends="build.native.core, build.native.secondary" />
<!-- Build the core luni native components -->
- <target name="build.native.core" >
- <!-- Build sig dll -->
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.luni.src.main.native}/sig/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- </exec>
- <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
- <fileset dir="${hy.luni.src.main.native}/sig">
- <patternset includes="*${shlib.suffix}*" />
- </fileset>
- </copy>
+ <target name="build.native.core" >
+
+ <!-- Build sig dll -->
+ <make dir="${hy.luni.src.main.native}/sig/${hy.os}" />
+
+ <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+ <fileset dir="${hy.luni.src.main.native}/sig">
+ <patternset includes="*${shlib.suffix}*" />
+ </fileset>
+ </copy>
- <!-- Build common lib -->
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.luni.src.main.native}/common/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- </exec>
+ <!-- Build common lib -->
+ <make dir="${hy.luni.src.main.native}/common/${hy.os}" />
- <!-- Build pool lib -->
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.luni.src.main.native}/pool/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- </exec>
-
- <!-- Build thread dll -->
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.luni.src.main.native}/thread/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- </exec>
+ <!-- Build pool lib -->
+ <make dir="${hy.luni.src.main.native}/pool/${hy.os}" />
+
+ <!-- Build thread dll -->
+ <make dir="${hy.luni.src.main.native}/thread/${hy.os}" />
+
<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
- <fileset dir="${hy.luni.src.main.native}/thread">
+ <fileset dir="${hy.luni.src.main.native}/thread">
<patternset includes="*${shlib.suffix}*" />
- </fileset>
- </copy>
+ </fileset>
+ </copy>
- <!-- Build port dll -->
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.luni.src.main.native}/port/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- </exec>
+ <!-- Build port dll -->
+ <make dir="${hy.luni.src.main.native}/port/${hy.os}" />
+
<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
- <fileset dir="${hy.luni.src.main.native}/port">
+ <fileset dir="${hy.luni.src.main.native}/port">
<patternset includes="*${shlib.suffix}*" />
- </fileset>
- </copy>
+ </fileset>
+ </copy>
- <!-- Build fdlibm lib -->
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.luni.src.main.native}/fdlibm/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- </exec>
+ <!-- Build fdlibm lib -->
+ <make dir="${hy.luni.src.main.native}/fdlibm/${hy.os}" />
- <!-- Build vmi dll -->
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.luni.src.main.native}/vmi/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- </exec>
+ <!-- Build vmi dll -->
+ <make dir="${hy.luni.src.main.native}/vmi/${hy.os}" />
- <!-- On Linux we want to copy the libvmi.so into the deploy/lib
- directory so that the natives can link against it. This is only used at
- build time - at runtime the libvmi.so provided by the VM implementation
- is loaded -->
- <copy todir="${hy.hdk}/lib" overwrite="yes" failonerror="false">
- <fileset dir="${hy.luni.src.main.native}/vmi">
- <include name="libvmi.so"/>
- </fileset>
+ <!-- On Linux we want to copy the libvmi.so into the
+ deploy/lib directory so that the natives can link
+ against it. This is only used at build time - at
+ runtime the libvmi.so provided by the VM
+ implementation is loaded
+ -->
+ <copy todir="${hy.hdk}/lib" overwrite="yes" failonerror="false">
+ <fileset dir="${hy.luni.src.main.native}/vmi">
+ <include name="libvmi.so"/>
+ </fileset>
</copy>
- </target>
+ </target>
- <!-- Build secondary native luni components -->
+ <!-- Build secondary native luni components -->
<target name="build.native.secondary" >
<!-- Build luni dll -->
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.luni.src.main.native}/luni/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- </exec>
+ <make dir="${hy.luni.src.main.native}/luni/${hy.os}" />
<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
- <fileset dir="${hy.luni.src.main.native}/luni">
+ <fileset dir="${hy.luni.src.main.native}/luni">
<patternset includes="*${shlib.suffix}*" />
- </fileset>
- </copy>
+ </fileset>
+ </copy>
<!-- Build vmls lib -->
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.luni.src.main.native}/vmls/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- </exec>
+ <make dir="${hy.luni.src.main.native}/vmls/${hy.os}" />
<!-- Build launcher executables -->
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.luni.src.main.native}/launcher/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- </exec>
+ <make dir="${hy.luni.src.main.native}/launcher/${hy.os}" />
+
<!-- Copy across the built executables -->
<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
<fileset dir="${hy.luni.src.main.native}/launcher">
@@ -206,8 +174,10 @@
<patternset includes="javaw${exe.suffix}" />
</fileset>
</copy>
+
<!-- Make sure the Linux launcher has execute permission -->
<chmod file="${hy.jdk}/jre/bin/java${exe.suffix}" perm="ugo+x" />
+
</target>
<!-- Overlay OSS packages into their required locations -->
@@ -222,31 +192,18 @@
</target>
<!-- Clean natives -->
- <target name="clean.native" if="is.windows">
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.luni.src.main.native}/vmi/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- <arg line="clean" />
- </exec>
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.luni.src.main.native}/luni/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- <arg line="clean" />
- </exec>
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.luni.src.main.native}/launcher/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- <arg line="clean" />
- </exec>
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.luni.src.main.native}/vmls/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- <arg line="clean" />
- </exec>
+ <target name="clean.native">
+ <make dir="${hy.luni.src.main.native}/sig/${hy.os}" target="clean" />
+ <make dir="${hy.luni.src.main.native}/common/${hy.os}" target="clean" />
+ <make dir="${hy.luni.src.main.native}/pool/${hy.os}" target="clean" />
+ <make dir="${hy.luni.src.main.native}/thread/${hy.os}" target="clean" />
+ <make dir="${hy.luni.src.main.native}/port/${hy.os}" target="clean" />
+ <make dir="${hy.luni.src.main.native}/fdlibm/${hy.os}" target="clean" />
+ <make dir="${hy.luni.src.main.native}/vmi/${hy.os}" target="clean" />
+ <make dir="${hy.luni.src.main.native}/luni/${hy.os}" target="clean" />
+ <make dir="${hy.luni.src.main.native}/vmls/${hy.os}" target="clean" />
+ <make dir="${hy.luni.src.main.native}/launcher/${hy.os}"
+ target="clean" />
</target>
<target name="test" depends="build, compile.tests, run.tests" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml?rev=420855&r1=420854&r2=420855&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml Tue Jul 11 07:07:06 2006
@@ -44,12 +44,7 @@
<!-- Build natives.-->
<target name="build.native">
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.nio.src.main.native}/nio/${hy.os}">
-
- <env key="HY_HDK" value="${hy.hdk}" />
- </exec>
+ <make dir="${hy.nio.src.main.native}/nio/${hy.os}" />
<!-- Copy the built shared libs over to the jre/bin dir -->
<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
@@ -68,13 +63,8 @@
<!-- Clean natives. -->
<target name="clean.native">
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.nio.src.main.native}/nio/${hy.os}">
-
- <env key="HY_HDK" value="${hy.hdk}" />
- <arg line="clean" />
- </exec>
+ <make dir="${hy.nio.src.main.native}/nio/${hy.os}"
+ target="clean" />
</target>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?rev=420855&r1=420854&r2=420855&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml Tue Jul 11 07:07:06 2006
@@ -42,11 +42,7 @@
<!-- Build natives. Currently there are only windows natives for
prefs, so we check if we are on a windows platform -->
<target name="build.native" if="is.windows">
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.prefs.src.main.native}/prefs/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- </exec>
+ <make dir="${hy.prefs.src.main.native}/prefs/${hy.os}" />
<!-- Copy the built shared libs over to the jre/bin dir -->
<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
@@ -66,12 +62,7 @@
<!-- Clean natives. Currently there are only windows natives for
prefs, so we check if we are on a windows platform -->
<target name="clean.native" if="is.windows">
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.prefs.src.main.native}/prefs/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- <arg line="clean" />
- </exec>
+ <make dir="${hy.prefs.src.main.native}/prefs/${hy.os}" target="clean" />
</target>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml?rev=420855&r1=420854&r2=420855&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml Tue Jul 11 07:07:06 2006
@@ -41,40 +41,31 @@
<target name="test" depends="build, compile.tests, run.tests" />
- <target name="overlay-oss">
- <mkdir dir="${hy.text.src.main.native}/icu4c/unicode" />
- <unzip src="${iculib.zip}" dest="${hy.text.src.main.native}/icu4c/unicode" />
- <chmod dir="${hy.text.src.main.native}/icu4c/unicode" perm="ugo+r" />
- </target>
+ <target name="overlay-oss">
+ <mkdir dir="${hy.text.src.main.native}/icu4c/unicode" />
+ <unzip src="${iculib.zip}" dest="${hy.text.src.main.native}/icu4c/unicode" />
+ <chmod dir="${hy.text.src.main.native}/icu4c/unicode" perm="ugo+r" />
+ </target>
- <target name="clean-overlay-oss">
- <delete dir="${hy.text.src.main.native}/icu4c" quiet="true" />
- </target>
+ <target name="clean-overlay-oss">
+ <delete dir="${hy.text.src.main.native}/icu4c" quiet="true" />
+ </target>
- <!-- Build native code -->
+ <!-- Build native code -->
<target name="build.native" >
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.text.src.main.native}/text/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- </exec>
+ <make dir="${hy.text.src.main.native}/text/${hy.os}" />
- <!-- Copy the built shared libs over to the jre/bin dir -->
- <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
- <fileset dir="${hy.text.src.main.native}/text">
+ <!-- Copy the built shared libs over to the jre/bin dir -->
+ <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+ <fileset dir="${hy.text.src.main.native}/text">
<patternset includes="*${shlib.suffix}*" />
</fileset>
</copy>
</target>
- <!-- Clean natives -->
+ <!-- Clean natives -->
<target name="clean.native">
- <exec failonerror="true"
- executable="${make.command}"
- dir="${hy.text.src.main.native}/text/${hy.os}">
- <env key="HY_HDK" value="${hy.hdk}" />
- <arg line="clean" />
- </exec>
+ <make dir="${hy.text.src.main.native}/text/${hy.os}" target="clean" />
</target>
<target name="clean">