You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ge...@apache.org on 2006/07/23 02:05:17 UTC
svn commit: r424655 - /incubator/harmony/enhanced/trunk/build.xml
Author: geirm
Date: Sat Jul 22 17:05:16 2006
New Revision: 424655
URL: http://svn.apache.org/viewvc?rev=424655&view=rev
Log:
ensure we don't pass the awt flag.
At this point, this works for both win and linux. Woo hoo.
Modified:
incubator/harmony/enhanced/trunk/build.xml
Modified: incubator/harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/trunk/build.xml?rev=424655&r1=424654&r2=424655&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/build.xml (original)
+++ incubator/harmony/enhanced/trunk/build.xml Sat Jul 22 17:05:16 2006
@@ -207,9 +207,6 @@
<!-- for now, build the awt stuff specially -->
<antcall target="build_classlib_special_awt_deps"/>
- <ant antfile="working_classlib/build.xml" target="rebuild" inheritAll="false">
- <property name="with.awt.swing" value="${build.with.awt.swing}"/>
- </ant>
</target>
<target name="build_classlib_special_awt_deps" depends="init,
@@ -220,7 +217,10 @@
<exec executable="sh" dir="working_classlib" >
<arg line="depends/libs/build/fetch-awt-depends.sh"/>
</exec>
- <property name="build.with.awt.swing" value="true"/>
+
+ <ant antfile="working_classlib/build.xml" target="rebuild" inheritAll="false">
+ <property name="with.awt.swing" value="true"/>
+ </ant>
</target>
<target name="build_classlib_special_awt_deps_win" if="is.windows">
@@ -230,7 +230,11 @@
<arg line="depends/libs/build/fetch-awt-depends.sh"/>
</exec>
-->
- <property name="build.with.awt.swing" value="false"/>
+
+ <!-- don't mention the war... -->
+ <ant antfile="working_classlib/build.xml" target="rebuild" inheritAll="false"/>
+
+
</target>
<!-- ================================================================================ -->