svn commit: r667003 - in /harmony/enhanced/classlib/trunk: build.xml make/make.xml

[hi...@apache.org]

Author: hindessm
Date: Thu Jun 12 01:14:44 2008
New Revision: 667003

URL: http://svn.apache.org/viewvc?rev=667003&view=rev
Log:
I occasionally run make in one of the native code sub-directories.  To
do so correctly you need to define all of the variables that the make
macro defines.  There are quite a lot and the list is growing.  So I've
added a make.xml wrapper that gets copies in to the HDK so that you can
do, for example:

  cd modules/luni/src/main/native/luni/unix
  HY_HDK=../../../../../../../deploy
  ant -f $HY_HDK/build/ant/make.xml

and it will do the equivalent of running make with all the correct flags.
The wrapper has the obvious rebuild, build and clean targets.
Be aware that you still need to specify the same -Dhy.no.thr=true, etc
flags to ant when invoking the wrapper that you normally would use -
or you can just add them to ~//.harmony-classlib.properties - because
these are not recorded in the HDK.

Added:
    harmony/enhanced/classlib/trunk/make/make.xml   (with props)
Modified:
    harmony/enhanced/classlib/trunk/build.xml

Modified: harmony/enhanced/classlib/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/build.xml?rev=667003&r1=667002&r2=667003&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/build.xml (original)
+++ harmony/enhanced/classlib/trunk/build.xml Thu Jun 12 01:14:44 2008
@@ -298,6 +298,10 @@
                 </tokenfilter>
             </filterchain>
         </copy>
+        <copy file="make/make.xml"
+              tofile="${hy.hdk}/build/ant/make.xml"
+              outputencoding="UTF-8" >
+        </copy>
     </target>
 
     <target name="-init-hdk-for-clean">

Added: harmony/enhanced/classlib/trunk/make/make.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/make.xml?rev=667003&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/make/make.xml (added)
+++ harmony/enhanced/classlib/trunk/make/make.xml Thu Jun 12 01:14:44 2008
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+     Licensed to the Apache Software Foundation (ASF) under one or more
+     contributor license agreements.  See the NOTICE file distributed with
+     this work for additional information regarding copyright ownership.
+     The ASF licenses this file to You under the Apache License, Version 2.0
+     (the "License"); you may not use this file except in compliance with
+     the License.  You may obtain a copy of the License at
+     
+         http://www.apache.org/licenses/LICENSE-2.0
+     
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
+
+<project name="make wrapper" default="build">
+    <description>Wrapper for invoking make using an HDK.</description>
+    <dirname property="hy.hdk" file="${ant.file.make wrapper}/../.." />
+    <property file="${user.home}/.harmony-classlib.properties" />
+    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property environment="env" />
+    <target name="rebuild" depends="clean,build" />
+    <target name="build">
+        <make dir="${env.PWD}" />
+    </target>
+    <target name="clean">
+        <make dir="${env.PWD}" target="clean" />
+    </target>
+</project>

Propchange: harmony/enhanced/classlib/trunk/make/make.xml
------------------------------------------------------------------------------
    svn:eol-style = native