You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ap...@apache.org on 2007/06/14 12:48:09 UTC
svn commit: r547210 - /harmony/enhanced/classlib/trunk/modules/awt/build.xml
Author: apetrenko
Date: Thu Jun 14 03:48:09 2007
New Revision: 547210
URL: http://svn.apache.org/viewvc?view=rev&rev=547210
Log:
x86_64 fontlib build fix
clean target added for frontlib
Modified:
harmony/enhanced/classlib/trunk/modules/awt/build.xml
Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?view=diff&rev=547210&r1=547209&r2=547210
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Thu Jun 14 03:48:09 2007
@@ -138,7 +138,7 @@
</target>
<target name="build-native"
- depends="-build-native-unix,-build-native-windows">
+ depends="-build-native-unix,-build-native-windows,-build-native-x86">
<make dir="${hy.awt.src.main.native}/lcmm/${hy.os.family}" />
<!-- Copy the built shared libs over to the jre/bin dir -->
<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
@@ -178,16 +178,6 @@
<exclude name="*${manifest.suffix}"/>
</fileset>
</copy>
-
- <make dir="${hy.awt.src.main.native}/fontlib/${hy.os.family}" />
- <!-- Copy the built shared libs over to the jre/bin dir -->
- <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
- <fileset dir="${hy.awt.src.main.native}/fontlib">
- <include name="*${shlib.suffix}*"/>
- <include name="*${progdb.suffix}*" if="is.windows" />
- <exclude name="*${manifest.suffix}"/>
- </fileset>
- </copy>
</target>
<target name="-build-native-unix" if="is.unix">
@@ -230,6 +220,18 @@
</copy>
</target>
+ <target name="-build-native-x86" if="is.x86">
+ <make dir="${hy.awt.src.main.native}/fontlib/${hy.os.family}" />
+ <!-- Copy the built shared libs over to the jre/bin dir -->
+ <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+ <fileset dir="${hy.awt.src.main.native}/fontlib">
+ <include name="*${shlib.suffix}*"/>
+ <include name="*${progdb.suffix}*" if="is.windows" />
+ <exclude name="*${manifest.suffix}"/>
+ </fileset>
+ </copy>
+ </target>
+
<target name="clean-native"
depends="-clean-native-unix,-clean-native-windows">
<make dir="${hy.awt.src.main.native}/lcmm/${hy.os.family}"
@@ -239,6 +241,8 @@
<make dir="${hy.awt.src.main.native}/gl/${hy.os.family}"
target="clean"/>
<make dir="${hy.awt.src.main.native}/oglwrapper/${hy.os.family}"
+ target="clean"/>
+ <make dir="${hy.awt.src.main.native}/fontlib/${hy.os.family}"
target="clean"/>
</target>