harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r953446 [1/2] - in /harmony/enhanced/java/branches/mrh: ./ classlib/ classlib/make/ classlib/modules/portlib/ common_resources/depends/ common_resources/depends/build/ common_resources/depends/build/platform/ common_resources/make/ drlvm/ d...
Date Thu, 10 Jun 2010 20:31:58 GMT
Author: hindessm
Date: Thu Jun 10 20:31:56 2010
New Revision: 953446

URL: http://svn.apache.org/viewvc?rev=953446&view=rev
Log:
Work-in-progress:

 * rationalizing property.xml files - classlib needs common resources now.
 * start moving drlvm build to new target/build tree.


Added:
    harmony/enhanced/java/branches/mrh/common_resources/depends/
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mak
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mk
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc32.mk
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc64.mk
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/freebsd.x86.mk
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/freebsd.x86_64.mk
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.ia64.mk
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.ppc32.mk
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.ppc64.mk
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.s390.mk
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.s390x.mk
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86.mk
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86_64.mk
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/macosx.ppc32.mk
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/macosx.x86.mk
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/macosx.x86_64.mk
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390.mk
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390x.mk
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mak
    harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mk
    harmony/enhanced/java/branches/mrh/drlvm/make/extra/make/
    harmony/enhanced/java/branches/mrh/drlvm/make/extra/make/depends.properties   (with props)
    harmony/enhanced/java/branches/mrh/drlvm/make/tests/make/
    harmony/enhanced/java/branches/mrh/drlvm/make/tests/make/depends.properties   (with props)
Removed:
    harmony/enhanced/java/branches/mrh/classlib/make/depends-common.xml
    harmony/enhanced/java/branches/mrh/classlib/make/properties.xml
Modified:
    harmony/enhanced/java/branches/mrh/build.xml
    harmony/enhanced/java/branches/mrh/classlib/   (props changed)
    harmony/enhanced/java/branches/mrh/classlib/build.xml
    harmony/enhanced/java/branches/mrh/classlib/make/depends.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml
    harmony/enhanced/java/branches/mrh/common_resources/make/depends.properties
    harmony/enhanced/java/branches/mrh/common_resources/make/depends.xml
    harmony/enhanced/java/branches/mrh/common_resources/make/platform.xml
    harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml
    harmony/enhanced/java/branches/mrh/common_resources/make/svn.xml
    harmony/enhanced/java/branches/mrh/drlvm/build.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/build-java.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/build-native.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/depends.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/extra/apr.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/properties.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/tests/ehwa-test.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/tests/test-common.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/em.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/encoder.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/gc_gen.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/hythr.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/interpreter.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/jitrino.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/kernel.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/port.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/port_ch.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/verifier-ext.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/verifier.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmcore.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmi.xml

Modified: harmony/enhanced/java/branches/mrh/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/build.xml?rev=953446&r1=953445&r2=953446&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/build.xml Thu Jun 10 20:31:56 2010
@@ -20,18 +20,6 @@
 
 <project name="build-harmony" default="build" basedir=".">
 
-    <fail>
-        <condition>
-            <isset property="java6" />
-        </condition>
-The -Djava6=true federated build has been deprecated.  Please checkout
-the java6 federated build from:
-
-  https://svn.apache.org/repos/asf/harmony/enhanced/java/branches/java6
-
-Thanks.
-    </fail>
-
     <!-- name of the target directory to use for building and final assembly -->
     <property name="hy.target" value="target" />
 
@@ -42,6 +30,8 @@ Thanks.
     <property name="hy.cfg" value="release" />
 
     <property name="hy.hdk" location="${hy.target}/hdk" />
+    <property name="hy.component" location="federated" />
+    <property name="hy.module" location="toplevel" />
 
     <!-- property to identify when components are being built by the 
          federated build -->
@@ -53,7 +43,15 @@ Thanks.
     <!-- import some vm-specific properties -->
     <property file="${vm.dir.loc}/make/build.properties" />
 
-    <import file="common_resources/make/properties.xml" />
+    <property name="common.resources" location="common_resources" />
+
+    <mkdir dir="${hy.hdk}/build/ant" />
+    <copy todir="${hy.hdk}/build/ant" preservelastmodified="true">
+        <fileset dir="${common.resources}/make" includes="*.xml"/>
+    </copy>
+
+    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <init-hdk />
 
     <description>
         Apache Harmony project federation script
@@ -116,7 +114,6 @@ Usage:
         depends="properties,
                  build-classlib,
                  build-vm,
-                 build-commonresources,
                  build-jdktools,
                  assemble-artifacts"/>
     
@@ -166,14 +163,12 @@ Usage:
         description="Fetches dependencies. Note: Some of Harmony dependencies are licensed under terms other than the Apache License v2."
         depends="fetch-classlib-libs,
                  fetch-vm-libs,
-                 fetch-commonresources,
                  fetch-jdktools-libs"/>
 
     <target name="check-depends"
         description="Checks dependencies."
         depends="check-classlib-libs,
                  check-vm-libs,
-                 check-commonresources,
                  check-jdktools-libs"/>
 
     <target name="bundle-hdk-tgz" depends="init" if="is.unix">
@@ -469,6 +464,7 @@ Usage:
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="keep.working" value="true" />
             <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
         <!-- hack to make sure the federated build doesn't use the classlib
              LICENSE/NOTICE files as they don't cover ICU4C
@@ -487,6 +483,7 @@ Usage:
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -497,6 +494,7 @@ Usage:
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -507,6 +505,7 @@ Usage:
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -517,17 +516,19 @@ Usage:
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="keep.working" value="true" />
             <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
     <target name="-init-classlib-hdk-for-clean">
-        <ant antfile="classlib/build.xml"
+ <!--       <ant antfile="classlib/build.xml"
              target="-init-hdk-for-clean" inheritAll="false" >
             <propertyset refid="required.props" />
             <property name="keep.working" value="true" />
             <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
-    </target>
+-->    </target>
 
     <!-- ============================================================== -->
     <!-- ensures that dependencies are up to date and then builds a vm  -->
@@ -542,6 +543,7 @@ Usage:
             <property name="drlvm.deploy.dir" location="${hy.hdk}"/>
             <property name="import.hdk" value="false"/>
             <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -551,6 +553,7 @@ Usage:
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -561,6 +564,7 @@ Usage:
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -571,6 +575,7 @@ Usage:
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -584,43 +589,10 @@ Usage:
             <property name="drlvm.deploy.dir" location="${hy.hdk}"/>
             <property name="import.hdk" value="false"/>
             <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
-    <!-- ============================================================== -->
-    <!-- fetches the common resources                                   -->
-    <!-- ============================================================== -->
-    <target name="build-commonresources"
-            depends="init,auto-fetch-commonresources"/>
-
-    <target name="auto-fetch-commonresources" if="auto.fetch">
-        <ant target="fetch-commonresources">
-            <propertyset refid="required.props" />
-            <property name="svn.info" value="${harmony.long.version}"/>
-            <property name="svn.revision" value="${harmony.version}"/>
-            <property name="hy.target" location="${hy.target}"/>
-        </ant>
-    </target>
-
-    <target name="fetch-commonresources">
-        <ant antfile="common_resources/build.xml" target="fetch-depends"
-             inheritall="false" >
-            <propertyset refid="required.props" />
-            <property name="svn.info" value="${harmony.long.version}"/>
-            <property name="svn.revision" value="${harmony.version}"/>
-            <property name="hy.target" location="${hy.target}"/>
-        </ant>
-    </target>
-
-    <target name="check-commonresources">
-        <ant antfile="common_resources/build.xml" target="check-depends"
-             inheritall="false" >
-            <propertyset refid="required.props" />
-            <property name="svn.info" value="${harmony.long.version}"/>
-            <property name="svn.revision" value="${harmony.version}"/>
-            <property name="hy.target" location="${hy.target}"/>
-        </ant>
-    </target>
 
     <!-- ============================================================== -->
     <!-- ensures dependencies are up to date, then builds jdktools      -->
@@ -629,18 +601,18 @@ Usage:
             depends="init,auto-fetch-jdktools-libs">
         <ant antfile="jdktools/build.xml" target="build" inheritall="false" >
             <propertyset refid="required.props" />
-            <property name="common.resources" location="common_resources" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
     <target name="auto-fetch-jdktools-libs" if="auto.fetch">
         <ant target="fetch-jdktools-libs" inheritall="false" >
             <propertyset refid="required.props" />
-            <property name="common.resources" location="common_resources" />
             <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -648,8 +620,8 @@ Usage:
         <ant antfile="jdktools/build.xml" target="fetch-depends"
              inheritall="false" >
             <propertyset refid="required.props" />
-            <property name="common.resources" location="common_resources" />
             <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -657,18 +629,18 @@ Usage:
         <ant antfile="jdktools/build.xml" target="check-depends"
              inheritall="false" >
             <propertyset refid="required.props" />
-            <property name="common.resources" location="common_resources" />
             <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
     <target name="clean-jdktools">
         <ant antfile="jdktools/build.xml" target="clean" inheritall="false" >
             <propertyset refid="required.props" />
-            <property name="common.resources" location="common_resources" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 

Propchange: harmony/enhanced/java/branches/mrh/classlib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jun 10 20:31:56 2010
@@ -1 +1,2 @@
 target
+target

Modified: harmony/enhanced/java/branches/mrh/classlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/build.xml?rev=953446&r1=953445&r2=953446&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/build.xml Thu Jun 10 20:31:56 2010
@@ -76,8 +76,20 @@ module:
     <property name="hy.component" value="classlib" />
     <property name="hy.module" value="toplevel" />
 
+    <fail message="Property 'common.resources' is not defined">
+        <condition>
+            <not><isset property="common.resources" /></not>
+        </condition>
+    </fail>
+
+    <mkdir dir="${hy.target}/hdk/build/ant" />
+    <copy todir="${hy.target}/hdk/build/ant" preservelastmodified="true">
+        <fileset dir="${common.resources}/make" includes="*.xml"/>
+    </copy>
+
     <!-- import properties for snapshot targets -->
-    <import file="make/properties.xml" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
+    <init-hdk/>
 
     <property name="build.output" location="${hy.build.top}/java" />
     <property name="tests.output" location="${hy.target}/test_report" />
@@ -86,7 +98,7 @@ module:
     <property name="depends.files" location="depends/files"/>
     <property name="depends.manifests" location="depends/manifests"/>
 
-    <import file="make/depends.xml" />
+    <import file="${hy.hdk}/build/ant/depends.xml" />
     <property file="make/depends.properties" />
 
     <condition property="needs.vme.v3.hack" value="true">
@@ -470,7 +482,7 @@ Generating HTML using Doxygen...
     <!-- ================================= 
           target: -properties
          ================================= -->
-    <target name="-properties" depends="-svn-prop">
+    <target name="-properties" depends="-svn-info">
         <property name="deploy.file.prefix"
                   value="harmony-classlib-r${svn.revision}" />
         <property name="deploy.tar"
@@ -662,47 +674,5 @@ Generating snapshot zip
         </sequential>
     </macrodef>
 
-    <macrodef name="init-hdk">
-        <sequential>
-            <mkdir dir="${hy.hdk}/build/ant" />
-            <copy file="make/properties.xml"
-                  tofile="${hy.hdk}/build/ant/properties.xml"
-                  outputencoding="UTF-8" >
-                <filterchain>
-                    <tokenfilter>
-                        <replacestring from="Top-Level property definitions"
-                                       to="Classlib property definitions" />
-                    </tokenfilter>
-                </filterchain>
-            </copy>
-            <copy file="make/make.xml"
-                  tofile="${hy.hdk}/build/ant/make.xml"
-                  outputencoding="UTF-8" >
-            </copy>
-            <copy file="make/depends-common.xml"
-                  tofile="${hy.hdk}/build/ant/depends.xml"
-                  outputencoding="UTF-8" >
-                <filterchain>
-                    <tokenfilter>
-                        <replacestring from="Common dependency definitions"
-                                       to="Classlib dependency definitions" />
-                    </tokenfilter>
-                </filterchain>
-            </copy>
-            <copy file="make/depends.properties"
-                  tofile="${hy.hdk}/build/ant/depends.properties"
-                  outputencoding="UTF-8" >
-            </copy>
-
-	    <mkdir dir="${hy.hdk}/build/make" />
-	    <copy todir="${hy.hdk}/build/make" overwrite="yes">
-                <fileset dir="depends/build">
-                    <include name="**" />
-                </fileset>
-            </copy>
-
-        </sequential>
-    </macrodef>
-
 </project>
 

Modified: harmony/enhanced/java/branches/mrh/classlib/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/make/depends.xml?rev=953446&r1=953445&r2=953446&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/make/depends.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/make/depends.xml Thu Jun 10 20:31:56 2010
@@ -25,8 +25,8 @@
     where possible.
     </description>
 
-    <import file="${basedir}/make/properties.xml" />
-    <import file="${basedir}/make/depends-common.xml" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
+    <import file="${hy.target}/hdk/build/ant/depends.xml" />
 
     <target name="check" description="Check whether dependencies are available"
             depends="-check,-check-win,-extract" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml?rev=953446&r1=953445&r2=953446&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml Thu Jun 10 20:31:56 2010
@@ -24,6 +24,11 @@
     <property name="hy.target" location="${basedir}/../../target" />
     <import file="${hy.target}/hdk/build/ant/properties.xml" />
 
+    <echo>
+hy.os=${hy.os}
+hy.arch=${hy.arch}
+    </echo>
+
     <property file="../../make/depends.properties" />
 
     <available property="hythr.available"

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mak?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mak (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mak Thu Jun 10 20:31:56 2010
@@ -0,0 +1,78 @@
+# 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.
+
+!include <$(HY_HDK)/build/make/properties.mak>
+
+!ifndef APPVER
+APPVER=4.0 #Default Windows version
+!endif
+
+!ifndef TARGETOS
+TARGETOS=WIN95 #Compile for Win95 by default
+!endif
+
+_WIN32_IE=0x0500
+SEHMAP = TRUE
+!include <win32.mak>
+
+LIBPATH=$(HY_HDK)\lib\# comment to avoid \ being treated as continuation
+DLLPATH=$(HY_HDK)\jdk\jre\bin\# ditto
+EXEPATH=$(HY_HDK)\jdk\jre\bin\# ditto
+DBGPATH=$(HY_HDK)\jdk\lib\# ditto
+SHAREDSUB=..\shared\# ditto
+
+!IF "$(HY_OS)-$(HY_ARCH)" == "windows-x86_64" 
+WARNING_LEVEL=W0
+PLATFORM_64=-DHYX86_64
+!ELSE
+WARNING_LEVEL=WX
+!ENDIF
+
+HYCOMMONCFLAGS = \
+  -$(WARNING_LEVEL) -GF -Gs -MD -Zm400 $(PLATFORM_64) \
+  -D_CRT_SECURE_NO_DEPRECATE \
+  -D_CRT_SECURE_NO_WARNINGS \
+  -D_SCL_SECURE_NO_DEPRECATE \
+  -D_DLL -D_MT -D_WINSOCKAPI_ \
+  /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I.
+
+!ifndef HYDEBUGCFLAGS
+HYDEBUGCFLAGS = \
+  -Zi -Od
+!endif
+
+!ifndef HYRELEASECFLAGS  
+HYRELEASECFLAGS = \
+  -Ogityb1 -DNDEBUG
+!endif
+
+!IF "$(HY_CFG)" == "debug"
+HYCFLAGS = $(HYDEBUGCFLAGS) $(HYCOMMONCFLAGS)
+!ELSE  
+HYCFLAGS = $(HYRELEASECFLAGS) $(HYCOMMONCFLAGS)
+!ENDIF
+  
+MDLLIBFILES = $(LIBPATH)hycommon.lib
+  
+!IF "$(HY_NO_THR)" == "false"
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hythr.lib
+!ELSE
+HYCFLAGS = $(HYCFLAGS) -DHY_NO_THR
+!ENDIF
+  
+!IF "$(HY_ZIP_API)" == "true"
+HYCFLAGS = $(HYCFLAGS) -DHY_ZIP_API
+!ENDIF
+

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,84 @@
+# 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.
+
+#
+# Configuration Makefile
+#
+
+HY_HDK=$(HY_TARGET)/hdk
+include $(HY_HDK)/build/make/properties.mk
+
+CXX = $(CC)
+CPP = $(CC) -E
+AS = as
+AR = ar
+RANLIB=echo
+ARFLAGS =
+ARCREATE = rcv
+AREXTRACT = xo
+DLL_LD = $(CC)
+DLL_LDFLAGS = -shared -Wl,-soname=$(@F) -Wl,--version-script,$(EXPFILE)
+CXX_DLL_LD = $(CXX)
+STDCLIBS = -lstdc++
+OSLIBS = -lc
+XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst
+MDLLIBPREFIX = -Xlinker --start-group
+MDLLIBSUFFIX = -Xlinker --end-group
+EXELDFLAGS = $(LDFLAGS)
+EXERPATHPREFIX = -Xlinker -z -Xlinker origin -Xlinker -rpath \
+	-Xlinker \$$ORIGIN/ -Xlinker -rpath-link \
+	-Xlinker
+WARNFLAGS=-Werror
+
+PLATFORM = -fpic
+HYDEBUGCFLAGS = -ggdb -O0
+HYRELEASECFLAGS = -O1 -DNDEBUG
+
+LIBPATH=$(HY_HDK)/lib/
+DLLPATH=$(HY_HDK)/jdk/jre/bin/
+EXEPATH=$(HY_HDK)/jdk/jre/bin/
+DBGPATH=$(HY_HDK)/jdk/lib/
+SHAREDSUB=../shared/
+INCLUDES += -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
+
+include $(HY_HDK)/build/make/platform/$(HY_PLATFORM).mk
+
+DEFINES += -D_REENTRANT
+
+ifeq ($(HY_CFG),release)
+OPT += $(HYRELEASECFLAGS)
+else
+OPT += $(HYDEBUGCFLAGS)
+endif
+
+MDLLIBFILES = $(LIBPATH)libhycommon.a
+ifeq ($(HY_OS),zos)
+# On z/OS we need to link every module against the ascii2ebcdic library
+MDLLIBFILES += $(LIBPATH)libhya2e.x
+endif
+
+ifeq ($(HY_NO_THR),false)
+ifeq ($(HY_THR_NO_DEPLOY), true)
+MDLLIBFILES += $(HY_HDK)/../modules/portlib/src/main/native/thread/libhythr$(HY_LINKLIB_SUFFIX)
+else
+MDLLIBFILES += $(DLLPATH)libhythr$(HY_LINKLIB_SUFFIX)
+endif
+else
+DEFINES += -DHY_NO_THR
+endif
+
+ifeq ($(HY_ZIP_API),true)
+DEFINES += -DHY_ZIP_API
+endif

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc32.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc32.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc32.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,36 @@
+#  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.
+
+CC = xlc
+DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -qcpluscmt -q32 -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro \
+	    -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE \
+            -D_LARGE_FILES -qsuppress=1500-010
+OSLIBS = -lc_r -lC_r -lpthread -liconv
+XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext -lXtst
+STDCLIBS = 
+WARNFLAGS =
+HYDEBUGCFLAGS = -g -O0
+HYRELEASEFLAGS = -s -O3 -DNDEBUG
+
+ARFLAGS = -X32
+ASFLAGS += -a32 -mppc
+DLL_LD = $(LD)
+DLL_LDFLAGS = -bE:$(EXPFILE)
+LDFLAGS += -G -bnoentry -bernotok
+EXELDFLAGS = -brtl
+EXERPATHPREFIX =
+MDLLIBPREFIX =
+MDLLIBSUFFIX =

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc64.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc64.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc64.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,36 @@
+#  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.
+
+CC = xlc
+DEFINES += -DAIX -DAIX_PPC64 -DHYPPC64 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -qcpluscmt -q64 -DPPC64 -q mbcs -qlanglvl=extended -qarch=ppc \
+            -qinfo=pro -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE \
+            -D_LARGE_FILES -qsuppress=1500-010
+OSLIBS = -lc_r -lC_r -lpthread -liconv
+XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext -lXtst
+STDCLIBS = 
+WARNFLAGS =
+HYDEBUGCFLAGS = -g -O0
+HYRELEASEFLAGS = -s -O3 -DNDEBUG
+
+ARFLAGS = -X64
+ASFLAGS += -a64 -many
+DLL_LD = $(LD)
+DLL_LDFLAGS = -bE:$(EXPFILE)
+LDFLAGS += -b64 -G -bnoentry -bernotok
+EXELDFLAGS = -q64 -brtl
+EXERPATHPREFIX =
+MDLLIBPREFIX =
+MDLLIBSUFFIX =

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/freebsd.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/freebsd.x86.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/freebsd.x86.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/freebsd.x86.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,21 @@
+#  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.
+
+DEFINES += -DFREEBSD -DFREEBSD_X86 -DHYX86 -DNEEDS_SYS_TYPES \
+           -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -march=pentium3
+OSLIBS = -L/usr/local/lib -lpthread
+INCLUDES += -I/usr/local/include
+XLIBS = -lX11 -lXft -lXext -lXtst

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/freebsd.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/freebsd.x86_64.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/freebsd.x86_64.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/freebsd.x86_64.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,20 @@
+#  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.
+
+DEFINES += -DFREEBSD -DFREEBSD_X86_64 -DHYX86_64 -DNEEDS_SYS_TYPES \
+           -DIPv6_FUNCTION_SUPPORT
+OSLIBS = -L/usr/local/lib -lpthread
+INCLUDES += -I/usr/local/include
+XLIBS = -lX11 -lXft -lXext -lXtst

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.ia64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.ia64.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.ia64.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.ia64.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,18 @@
+#  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.
+
+DEFINES += -DLINUX -DLINUX_IA64 -DHYIA64 -DIPv6_FUNCTION_SUPPORT
+OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.ppc32.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.ppc32.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.ppc32.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,21 @@
+#  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.
+
+DEFINES += -DLINUX -DLINUX_PPC32 -DHYPPC32 -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -m32
+ASFLAGS += -a32
+LDFLAGS += -m32
+OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.ppc64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.ppc64.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.ppc64.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.ppc64.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,22 @@
+#  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.
+
+DEFINES += -DLINUX -DLINUX_PPC64 -DHYPPC64 -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -m64
+XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext -lXtst
+ASFLAGS += -a64
+LDFLAGS += -m64
+OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.s390.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.s390.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.s390.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,21 @@
+#  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.
+
+DEFINES += -DLINUX -DLINUX_S390 -DHYS390 -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -m31
+ASFLAGS += -m31
+LDFLAGS += -m31
+OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.s390x.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.s390x.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.s390x.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,21 @@
+#  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.
+
+DEFINES += -DLINUX -DLINUX_S390X -DHYS390X -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -m64
+ASFLAGS += -m64
+LDFLAGS += -m64
+OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,19 @@
+#  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.
+
+DEFINES += -DLINUX -DLINUX_X86 -DHYX86 -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -march=pentium3
+OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86_64.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86_64.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86_64.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,19 @@
+#  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.
+
+DEFINES += -DLINUX -DLINUX_X86_64 -DHYX86_64 -DIPv6_FUNCTION_SUPPORT
+XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext -lXtst
+OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/macosx.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/macosx.ppc32.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/macosx.ppc32.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/macosx.ppc32.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,28 @@
+#  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.
+
+DEFINES += -DMACOSX -DMACOSX_PPC32 -DPPC32 -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -fno-common
+OSLIBS += -ldl -liconv
+XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
+        -L/sw/lib/freetype2/lib -lfreetype -lfontconfig
+MDLLIBPREFIX =
+MDLLIBSUFFIX =
+EXERPATHPREFIX = 
+DLL_LD = $(CC)
+# TOFIX: exports?
+DLL_LDFLAGS = -dynamiclib -dynamic -install_name $(@F)
+
+RANLIB=ranlib

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/macosx.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/macosx.x86.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/macosx.x86.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/macosx.x86.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,34 @@
+#  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.
+
+CC = gcc-4.2
+CXX = g++-4.2
+
+DEFINES += -DMACOSX -DMACOSX_X86 -DHYX86 -DIPv6_FUNCTION_SUPPORT
+
+# Add the default location of the macports.org install to the includes
+INCLUDES += -I/opt/local/include
+PLATFORM = -fPIC -fno-common -arch i386 -mmacosx-version-min=10.5
+ASFLAGS += -arch i386
+OSLIBS = -L/opt/local/lib -lc -ldl -liconv
+XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
+        -lfreetype -lfontconfig
+MDLLIBPREFIX =
+MDLLIBSUFFIX =
+EXERPATHPREFIX = 
+DLL_LD = $(CC)
+DLL_LDFLAGS = -dynamiclib -dynamic -install_name $(@F)
+
+RANLIB=ranlib

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/macosx.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/macosx.x86_64.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/macosx.x86_64.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/macosx.x86_64.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,32 @@
+#  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.
+
+DEFINES += -DMACOSX -DMACOSX_X86_64 -DHYX86_64 -DIPv6_FUNCTION_SUPPORT
+
+# Add the default location of the macports.org install to the includes
+INCLUDES += -I/opt/local/include
+PLATFORM = -fPIC -fno-common -arch x86_64 -mmacosx-version-min=10.5
+ASFLAGS += -arch x86_64
+# WARNFLAGS += -Wconversion -Wformat -Wshorten-64-to-32
+OSLIBS = -L/opt/local/lib -lc -ldl -liconv
+XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
+        -lfreetype -lfontconfig
+MDLLIBPREFIX =
+MDLLIBSUFFIX =
+EXERPATHPREFIX = 
+DLL_LD = $(CC)
+DLL_LDFLAGS = -dynamiclib -dynamic -install_name $(@F)
+
+RANLIB=ranlib

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,54 @@
+#  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.
+
+# Use cc for assembly compiles on z/OS
+AS = cc
+
+# Use cxx/c++ for c++ compiles on z/OS
+CXX = cxx
+
+DEFINES += -DZOS -DZOS_S390 -DHYS390 -DHY_ATOE
+PLATFORM = -Wc,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) -Wa,goff \
+           -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
+
+CFLAGS += -Wc,"SSCOMM" -Wc,"langlvl(commonc)" -Wc,gonumber
+CXXFLAGS += -+ -Wc,"langlvl(extended)" -Wc,gonumber
+
+ASFLAGS += -Wc,xplink,convlit\(ISO8859-1\) -Wc,gonumber -Wa,goff \
+           -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL -c
+LDFLAGS += -Wl,xplink,dll
+
+# No need for --start-group and --end-group tags here
+MDLLIBPREFIX =
+MDLLIBSUFFIX =
+
+# No need to specify STDC libs on z/OS
+STDCLIBS =
+
+# Don't use these flags on zOS
+DLL_LDFLAGS =
+
+# We can't use the -Xlinker options on zOS
+EXERPATHPREFIX =
+
+# Different compiler on zOS
+WARNFLAGS =
+
+# z/OS has different debug flags
+HYDEBUGCFLAGS = -g -O0
+
+# On z/OS set DLLPATH to LIBPATH so we link against .x export files in
+# $(HY_HDK)/lib instead of directly against the .so libraries.
+DLLPATH=$(LIBPATH)

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390x.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390x.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390x.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,54 @@
+#  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.
+
+# Use cc for assembly compiles on z/OS
+AS = cc
+
+# Use cxx/c++ for c++ compiles on z/OS
+CXX = cxx
+
+DEFINES += -DZOS -DZOS_S390X -DHYS390X -DHY_ATOE
+PLATFORM = -Wc,lp64,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) \
+           -Wa,goff -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
+
+CFLAGS += -Wc,"SSCOMM" -Wc,"langlvl(commonc)"
+CXXFLAGS += -+ -Wc,"langlvl(extended)"
+
+ASFLAGS += -Wc,lp64,xplink,convlit\(ISO8859-1\)  -Wa,goff -Wc,NOANSIALIAS \
+           -Wc,DLL,EXPORTALL -Wa,SYSPARM\(BIT64\) -c
+LDFLAGS += -Wl,lp64 -Wl,xplink,dll
+
+# No need for --start-group and --end-group tags here
+MDLLIBPREFIX =
+MDLLIBSUFFIX =
+
+# No need to specify STDC libs on z/OS
+STDCLIBS =
+
+# Don't use these flags on z/OS
+DLL_LDFLAGS =
+
+# We can't use the -Xlinker options on z/OS
+EXERPATHPREFIX = 
+
+# Different compiler on zOS
+WARNFLAGS =
+
+# z/OS has different debug flags
+HYDEBUGCFLAGS = -g -O0
+
+# On z/OS set DLLPATH to LIBPATH so we link against .x export files in
+# $(HY_HDK)/lib instead of directly against the .so libraries.
+DLLPATH=$(LIBPATH)

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mak?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mak (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mak Thu Jun 10 20:31:56 2010
@@ -0,0 +1,89 @@
+# 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.
+
+!IF "$(HY_OS)-$(HY_ARCH)" == "windows-x86_64" 
+ml=ml64
+DLLENTRY=
+!ELSE
+ml=ml
+DLLENTRY=@12
+!ENDIF
+
+.c.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.c
+
+.cpp.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.cpp
+
+.asm.obj:
+	$(ml) /Fo$*.obj /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
+
+.rc.res:
+	rc -I..\include $<
+
+all: $(DLLNAME) $(EXENAME) $(LIBNAME)
+
+!ifdef LIBNAME
+$(LIBNAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+	$(implib) /NOLOGO -subsystem:windows -out:$(LIBNAME) \
+	$(HYLDFLAGS) -machine:$(CPU) \
+	/NODEFAULTLIB:libc \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+!endif
+
+!ifdef DLLNAME
+$(DLLNAME): $(LIBNAME)
+	-mkdir $(DBGPATH)
+	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
+	/NODEFAULTLIB:libcmt /NODEFAULTLIB:libc /FORCE:UNRESOLVED \
+	-entry:_DllMainCRTStartup$(DLLENTRY) -dll /BASE:$(DLLBASE) -machine:$(CPU) \
+	-subsystem:windows -out:$@ \
+	-map:$(LIBPATH)$(*F).map -pdb:$(DBGPATH)$(*F).pdb \
+        -manifestfile:$(LIBPATH)$(*F).manifest \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES) \
+	kernel32.lib  msvcrt.lib ws2_32.lib advapi32.lib user32.lib gdi32.lib \
+	comdlg32.lib winspool.lib  $(LIBPATH)$(*F).exp
+	if exist $(LIBPATH)$(*F).manifest \
+            mt -manifest $(LIBPATH)$(*F).manifest -outputresource:$(DLLNAME);#2
+        -del $(LIBPATH)$(*F).manifest >nul 2>&1
+!endif
+
+!ifdef EXENAME
+$(EXENAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+	-mkdir $(DBGPATH)
+	link /NOLOGO $(EXEFLAGS) /debug /opt:icf /opt:ref $(VMLINK) \
+	-out:$(EXENAME) -pdb:$(DBGPATH)$(*F).pdb \
+        -manifestfile:$(LIBPATH)$(*F).manifest \
+	-machine:$(CPU) setargv.obj  \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(EXEDLLFILES)
+	if exist $(LIBPATH)$(*F).manifest \
+            mt -manifest $(LIBPATH)$(*F).manifest -outputresource:$(EXENAME);#1
+        -del $(LIBPATH)$(*F).manifest >nul 2>&1
+!endif
+
+clean:
+    -del $(BUILDFILES) >nul 2>&1
+    -del *.res >nul 2>&1
+    -del *.pdb >nul 2>&1
+    -del $(LIBNAME) >nul 2>&1
+    -del $(LIBNAME:.lib=.exp) >nul 2>&1
+    -del $(LIBNAME:.lib=.map) >nul 2>&1
+    -del $(LIBNAME:.lib=.manifest) >nul 2>&1
+    -del $(DLLNAME) >nul 2>&1
+    -del $(DBGPATH)$(LIBBASE).pdb >nul 2>&1
+    -del $(EXENAME) >nul 2>&1
+    -del $(DBGPATH)$(EXEBASE).pdb >nul 2>&1
+    -del $(LIBPATH)$(EXEBASE).manifest >nul 2>&1
+    -del $(CLEANFILES) >nul 2>&1

Added: harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mk?rev=953446&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mk (added)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mk Thu Jun 10 20:31:56 2010
@@ -0,0 +1,135 @@
+# 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.
+
+#
+# Configuration Makefile
+#
+
+CFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(PLATFORM) $(CFLAGS) $(WARNFLAGS)
+CXXFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(PLATFORM) $(CXXFLAGS) $(WARNFLAGS)
+EXPFILE = $(HY_BIN)$(notdir $(basename $(DLLNAME))).exp
+
+BUILDFILES := $(addprefix $(HY_BIN),$(BUILDFILES))
+
+ifneq ($(HY_OS),zos)
+# Convert $(LIBPATH)libblah.so to -L$(LIBPATH) ... -lblah, also for $(DLLPATH)
+MDLLIBARGS := \
+  $(MDLLIBPREFIX) -L$(LIBPATH) -L$(DLLPATH) \
+  $(patsubst $(LIBPATH)lib%$(HY_LINKLIB_SUFFIX),-l%, \
+    $(patsubst $(DLLPATH)lib%$(HY_LINKLIB_SUFFIX),-l%, $(MDLLIBFILES))) \
+  $(MDLLIBSUFFIX)
+else
+# Do not change on zOS
+MDLLIBARGS := \
+  $(MDLLIBPREFIX) $(MDLLIBFILES) $(MDLLIBSUFFIX)
+endif
+
+all: $(HY_BIN) $(DLLNAME) $(EXENAME) $(LIBNAME)
+
+$(LIBNAME): $(BUILDFILES)
+	$(AR) $(ARFLAGS) $(ARCREATE) $@ $(BUILDFILES)
+	$(RANLIB) $@
+
+$(EXPFILE): exports.txt
+ifeq ($(HY_OS),aix)
+	cp $< $@
+else
+	echo "$(EXPNAME) {" >$@
+	echo "  global :" >>$@
+	sed -e's/^/    /;s/$$/;/' <$< >>$@
+	echo "  local : *;" >>$@
+	echo "};" >>$@
+endif
+
+$(DLLNAME): $(BUILDFILES) $(MDLLIBFILES) $(EXPFILE)
+	$(DLL_LD) $(DLL_LDFLAGS) $(LDFLAGS) $(VMLINK) -o $@ \
+	$(BUILDFILES) $(MDLLIBARGS) $(OSLIBS)
+ifeq ($(HY_CAN_LINK_DEBUG),yes)
+	objcopy --only-keep-debug $@ $@.dbg
+	strip --strip-debug --strip-unneeded $@
+	( cd $(@D) && objcopy --add-gnu-debuglink=$(@F).dbg $(@F) )
+	-mkdir -p $(DBGPATH)
+	test "$@.dbg" = "$(DBGPATH)$(@F).dbg" || \
+		mv $@.dbg $(DBGPATH)$(@F).dbg
+endif
+ifeq ($(HY_OS),zos)
+	mv $(notdir $(basename $(DLLNAME)))$(HY_LINKLIB_SUFFIX) $(LIBPATH)
+endif
+
+$(EXENAME): $(BUILDFILES) $(MDLLIBFILES)
+	$(CC) $(VMLINK) $(EXELDFLAGS) \
+	$(BUILDFILES) $(MDLLIBARGS) -o $@ $(OSLIBS) \
+	$(EXERPATHPREFIX) -L$(DLLPATH)
+	@chmod 755 $(EXENAME)
+
+clean:
+	-rm -f $(BUILDFILES) $(DLLNAME) $(EXENAME) $(LIBNAME) $(EXPFILE) \
+	       $(CLEANFILES) $(DBGPATH)$(notdir $(DLLNAME)).dbg
+
+$(HY_BIN):
+	mkdir -p $(HY_BIN)
+
+# C rules
+$(HY_BIN)%.o: $(HY_PLATFORM)/%.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(HY_ARCH)/%.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(HY_OS)/%.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(SHAREDSUB)%.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(SHAREDSUB)additional/%.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: %.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(OSS_DIST)%.c # for zlib_dist / fdlibm_dist
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+# C++ rules
+$(HY_BIN)%.o: $(HY_ARCH)/%.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(HY_OS)/%.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(SHAREDSUB)%.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: %.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+
+# assembler rules
+$(HY_BIN)%.o: $(HY_PLATFORM)/%.s
+	$(AS) $(ASFLAGS) -o $@ $<
+
+$(HY_BIN)%.o: $(HY_ARCH)/%.s
+	$(AS) $(ASFLAGS) -o $@ $<
+
+$(HY_BIN)%.o: $(HY_OS)/%.s
+	$(AS) $(ASFLAGS) -o $@ $<
+
+$(HY_BIN)%.o: $(SHAREDSUB)%.s
+	$(AS) $(ASFLAGS) -o $@ $<
+
+$(HY_BIN)%.o: %.s
+	$(AS) $(ASFLAGS) -o $@ $<
+

Modified: harmony/enhanced/java/branches/mrh/common_resources/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/make/depends.properties?rev=953446&r1=953445&r2=953446&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/make/depends.properties Thu Jun 10 20:31:56 2010
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-depends.jars=${base.dep.dir}/jars
-depends.oss=${base.dep.dir}/oss
+depends.jars=${depends.dir}/jars
+depends.oss=${depends.dir}/oss
 
 maven2.base=http://repo1.maven.org/maven2
 depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
@@ -45,7 +45,7 @@ icuhdr=${depends.oss}/icu4c/icu4c-3.4-ha
 icuhdr.url=${depends.url}/oss/icu4c-3.4-harmony-includes.zip
 icuhdr.md5=46dbe39e5f6c4ea206a9daad9e29f8b0
 
-icudll=${base.dep.dir}/libs/${hy.platform.variant}/icu-3.4/icu-3.4.zip
+icudll=${depends.dir}/libs/${hy.platform.variant}/icu-3.4/icu-3.4.zip
 icudll.url=${depends.url}/libs/${hy.platform.variant}/icu-3.4.zip
 icuuc.linkname@windows@=icuuc.lib
 icuuc.linkname@unix@=libicuuc.so.34
@@ -82,12 +82,6 @@ xerces.zip=${xerces.dir}/xerces.zip
 xerces.url=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.9.1.zip
 xerces.md5=a0e07ede1c3bd5231fe15eae24032b2e
 
-bcprov.ver=bcprov-jdk15-138
-bcprov.dir=${depends.jars}/${bcprov.ver}
-bcprov.jar=${bcprov.dir}/bcprov.noidea.jar
-bcprov.url=${depends.url}/jars/bcprov/${bcprov.ver}/bcprov.noidea.jar
-bcprov.md5=7e2cf5f39012b303b4246e33a66bf078
-
 msvcr.dir.x86=${depends.dir}/libs/windows.x86
 msvcr.dll.x86=${msvcr.dir.x86}/msvcr71.dll
 msvcr.url.x86=file:///${hyenv.SystemRoot}/system32/msvcr71.dll
@@ -123,26 +117,6 @@ mx4j.md5=443bd83ee36414de4b8fc5722b038b0
 mx4j.jar=${mx4j.dir}/mx4j.jar
 mx4j.remote.jar=${mx4j.dir}/mx4j-remote.jar
 
-yoko.dir=${depends.jars}/yoko-1.0-SNAPSHOT-20080304
-yoko.jar=${yoko.dir}/yoko.jar
-yoko.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-spec-corba/1.0-SNAPSHOT/yoko-spec-corba-1.0-20080304.193341-1.jar
-yoko.md5=884ac35840a92d13efa155812bfe54a9
-
-yoko-core.dir=${depends.jars}/yoko-1.0-SNAPSHOT-20080304
-yoko-core.jar=${yoko.dir}/yoko-core.jar
-yoko-core.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-core/1.0-SNAPSHOT/yoko-core-1.0-20080304.193341-1.jar
-yoko-core.md5=03638ebf8c1da647ad64412a2c5fb2f4
-
-yoko-rmi-impl.dir=${depends.jars}/yoko-1.0-SNAPSHOT-20080304
-yoko-rmi-impl.jar=${yoko-rmi-impl.dir}/yoko-rmi-impl.jar
-yoko-rmi-impl.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-rmi-impl/1.0-SNAPSHOT/yoko-rmi-impl-1.0-20080304.193341-1.jar
-yoko-rmi-impl.md5=4a45c7a0308227a46fd3ef675c6fde6c
-
-yoko-rmi-spec.dir=${depends.jars}/yoko-1.0-SNAPSHOT-20080304
-yoko-rmi-spec.jar=${yoko-rmi-spec.dir}/yoko-rmi-spec.jar
-yoko-rmi-spec.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-rmi-spec/1.0-SNAPSHOT/yoko-rmi-spec-1.0-20080304.193341-1.jar
-yoko-rmi-spec.md5=8ef16849448ecccabc0f1aac8b840e9c
-
 # bcel is needed by yoko-rmi
 bcel.version=5.2
 bcel.base=bcel-${bcel.version}

Modified: harmony/enhanced/java/branches/mrh/common_resources/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/make/depends.xml?rev=953446&r1=953445&r2=953446&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/make/depends.xml (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/make/depends.xml Thu Jun 10 20:31:56 2010
@@ -22,6 +22,8 @@
 <project name="external-deps">
     
     <dirname property="ed.basedir" file="${ant.file.external-deps}"/>
+    <echo>ed.basedir=${ed.basedir}</echo>
+    <echo>basedir=${basedir}</echo>
     <import file="${ed.basedir}/properties.xml"/>
     
     <loadproperties srcfile="${ed.basedir}/depends.properties">
@@ -35,126 +37,17 @@
       </filterchain>
     </loadproperties>
 
-    <macrodef name="poll-modules" 
-        description="directory-based macros for polling sub-builds">
-        <attribute name="target" />
-        <attribute name="dir" />
-        <attribute name="includes" default="${build.module}"/>
-        <attribute name="excludes" default="${exclude.module}"/>
-        <attribute name="antfile" default="*.xml"/>
-        <sequential>
-            <!-- convert dirset pattern to fileset pattern-->
-            <property name="@{dir}.loc" location="@{dir}"/>
-            <pathconvert property="list.@{dir}.@{target}" 
-                pathsep="${file.separator}@{antfile}," setonempty="no">
-                <path>
-                    <dirset dir="@{dir}"
-                            includes="@{includes}"
-                            excludes="@{excludes}">
-                        <exclude name=".*" />
-                    </dirset>
-                </path>
-                <map from="${@{dir}.loc}${file.separator}" to=""/>
-            </pathconvert>
-            <!-- append antfile suffix to last item in the list, if any -->
-            <condition property="poll.@{dir}.@{target}"
-                value="${list.@{dir}.@{target}}${file.separator}@{antfile}" 
-                else="">
-                <isset property="list.@{dir}.@{target}"/>
-            </condition>
-            <poll-build target="@{target}" dir="@{dir}" 
-                includes="${poll.@{dir}.@{target}}"/>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="poll-build"
-        description="plain-filter macros for polling sub-builds">
-        <attribute name="target" />
-        <attribute name="dir" />
-        <attribute name="includes" default="**/*.xml"/>
-        <attribute name="excludes" default=""/>
-        <sequential>
-            <echo message="polling @{includes}"/>
-            <subant target="@{target}">
-                <fileset dir="@{dir}" includes="@{includes}" excludes="@{excludes}">
-                    <containsregexp expression="&lt;target[^&gt;]*name=&quot;@{target}&quot;"/>
-                </fileset>
-            </subant>
-        </sequential>
-    </macrodef>
-
-    <target name="fetch">
-        <fetch dep="${dependency}"/>
-    </target>
-    
-    <macrodef name="fetch">
-        <attribute name="dep" />
-        <sequential>
-            <dirname file="${@{dep}}" property="@{dep}.dir"/>
-            <mkdir dir="${@{dep}.dir}"/>
-            <download-one-file dest="${@{dep}}" 
-                src="${@{dep}.url}" md5="${@{dep}.md5}"/>
-            <unzip-one-file dep="@{dep}"/>
-        </sequential>
-    </macrodef>
-    
-    <target name="-really-unzip" unless="unzipped" if="unzip.path">
-        <tempfile destdir="${dest}" property="tmp"/>
-        <unzip src="${src}" dest="${tmp}" >
-            <patternset includes="${unzip.path}"/>
-        </unzip>
-        <touch>
-            <fileset dir="${tmp}">
-                <patternset includes="${unzip.path}"/>
-            </fileset>
-        </touch>
-        <move todir="${dest}" flatten="yes" failonerror="no">
-            <fileset dir="${tmp}">
-                <patternset includes="${unzip.path}"/>
-            </fileset>
-        </move>
-        <delete dir="${tmp}" />
-    </target>
-    
-    <macrodef name="unzip-one-file">
-        <attribute name="dep" />
-        <sequential>
-            <dirname file="${@{dep}}" property="@{dep}.dir"/>
-            <!-- quite tricky way to detect if unzip operation is pending,
-                still not very robust ...
-                Life could be simpler if unzip supported nested mappers
-            -->
-            <basename file="${@{dep}}" property="@{dep}.basename"/>
-            <basename file="${@{dep}.unzip.path}" property="@{dep}.unzip.basename"/>
-            <pathconvert property="@{dep}.matching.list" setonempty="no">
-                <path><fileset dir="${@{dep}.dir}" includes="${@{dep}.unzip.basename}"/></path>
-            </pathconvert>
-            <pathconvert property="@{dep}.uptodate.list" setonempty="no">
-                <path>
-                    <fileset dir="${@{dep}.dir}" includes="${@{dep}.unzip.basename}">
-                        <depend targetdir="${@{dep}.dir}">
-                            <mapper type="merge" to="${@{dep}.basename}"/>
-                        </depend>
-                    </fileset>
-                </path>
-            </pathconvert>
-            <condition property="@{dep}.unzipped">
-                <equals arg1="${@{dep}.uptodate.list}" arg2="${@{dep}.matching.list}"/>
-                <!--uptodate srcfile="${@{dep}}"
-                        targetfile="${@{dep}.dir}/${@{dep}.unzip.basename}"/-->
-            </condition>
+    <loadproperties srcfile="${basedir}/make/depends.properties">
+      <filterchain>
+        <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
+            <param type="token" name="${hy.arch}" value=""/>
+            <param type="token" name="${hy.os.family}" value=""/>
+            <param type="token" name="${hy.platform}" value=""/>
+            <param type="token" name="${hy.platform.variant}" value=""/>
+        </filterreader>
+      </filterchain>
+    </loadproperties>
 
-            <antcall target="-really-unzip">
-                <param name="src" value="${@{dep}}" />
-                <param name="dest" value="${@{dep}.dir}" />
-                <propertyset>
-                  <propertyref prefix="@{dep}.unzip"/>
-                  <globmapper from="@{dep}.*" to="*"/>
-                </propertyset>
-            </antcall>
-        </sequential>
-    </macrodef>
-    
     <macrodef name="download-one-file">
         <attribute name="src" />
         <attribute name="dest" />
@@ -234,6 +127,32 @@ than the Apache License v2.
         </sequential>
     </macrodef>
 
+    <macrodef name="check-os-file">
+        <attribute name="src" />
+        <attribute name="message" />
+        <sequential>
+            <echo level="info">Checking for system file @{src}</echo>
+            <available file="@{src}" type="file"
+                       property="@{src}.exists" />
+            <fail>
+                <condition>
+                    <not>
+                        <isset property="@{src}.exists" />
+                    </not>
+                </condition>
+...
+
+Missing dependency.  The system file:
+
+  @{src}
+
+is missing.
+
+@{message}
+            </fail>
+        </sequential>
+    </macrodef>
+
     <macrodef name="check-one-link">
         <attribute name="src" />
         <attribute name="dest" />
@@ -280,15 +199,76 @@ But @{src} doesn't exist.
         <symlink resource="${src}" link="${dest}" />
     </target>
 
+    <target name="fetch">
+        <fetch dep="${dependency}"/>
+    </target>
     
-    <!--macrodef name="chksum">
-        <attribute name="file" />
-        <attribute name="type" default="md5" />
+    <macrodef name="fetch">
+        <attribute name="dep" />
+        <sequential>
+            <dirname file="${@{dep}}" property="@{dep}.dir"/>
+            <mkdir dir="${@{dep}.dir}"/>
+            <download-one-file dest="${@{dep}}" 
+                src="${@{dep}.url}" md5="${@{dep}.md5}"/>
+            <unzip-one-file dep="@{dep}"/>
+        </sequential>
+    </macrodef>
+    
+    <target name="-really-unzip" unless="unzipped" if="unzip.path">
+        <tempfile destdir="${dest}" property="tmp"/>
+        <unzip src="${src}" dest="${tmp}" >
+            <patternset includes="${unzip.path}"/>
+        </unzip>
+        <touch>
+            <fileset dir="${tmp}">
+                <patternset includes="${unzip.path}"/>
+            </fileset>
+        </touch>
+        <move todir="${dest}" flatten="yes" failonerror="no">
+            <fileset dir="${tmp}">
+                <patternset includes="${unzip.path}"/>
+            </fileset>
+        </move>
+        <delete dir="${tmp}" />
+    </target>
+
+    <macrodef name="unzip-one-file">
+        <attribute name="dep" />
         <sequential>
-            <checksum property="@{file}.@{type}" file="@{file}"
-                      algorithm="@{type}" />
-            <echo file="@{file}.@{type}"
-                  message="${@{file}.@{type}}  @{file}${line.separator}" />
+            <dirname file="${@{dep}}" property="@{dep}.dir"/>
+            <!-- quite tricky way to detect if unzip operation is pending,
+                still not very robust ...
+                Life could be simpler if unzip supported nested mappers
+            -->
+            <basename file="${@{dep}}" property="@{dep}.basename"/>
+            <basename file="${@{dep}.unzip.path}" property="@{dep}.unzip.basename"/>
+            <pathconvert property="@{dep}.matching.list" setonempty="no">
+                <path><fileset dir="${@{dep}.dir}" includes="${@{dep}.unzip.basename}"/></path>
+            </pathconvert>
+            <pathconvert property="@{dep}.uptodate.list" setonempty="no">
+                <path>
+                    <fileset dir="${@{dep}.dir}" includes="${@{dep}.unzip.basename}">
+                        <depend targetdir="${@{dep}.dir}">
+                            <mapper type="merge" to="${@{dep}.basename}"/>
+                        </depend>
+                    </fileset>
+                </path>
+            </pathconvert>
+            <condition property="@{dep}.unzipped">
+                <equals arg1="${@{dep}.uptodate.list}" arg2="${@{dep}.matching.list}"/>
+                <!--uptodate srcfile="${@{dep}}"
+                        targetfile="${@{dep}.dir}/${@{dep}.unzip.basename}"/-->
+            </condition>
+
+            <antcall target="-really-unzip">
+                <param name="src" value="${@{dep}}" />
+                <param name="dest" value="${@{dep}.dir}" />
+                <propertyset>
+                  <propertyref prefix="@{dep}.unzip"/>
+                  <globmapper from="@{dep}.*" to="*"/>
+                </propertyset>
+            </antcall>
         </sequential>
-    </macrodef-->
+    </macrodef>
+
 </project>

Modified: harmony/enhanced/java/branches/mrh/common_resources/make/platform.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/make/platform.xml?rev=953446&r1=953445&r2=953446&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/make/platform.xml (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/make/platform.xml Thu Jun 10 20:31:56 2010
@@ -254,8 +254,19 @@
         <or>
             <isset property="is.aix"/>
             <isset property="is.freebsd"/>
+            <isset property="is.zos"/>
         </or>
     </condition>
     <property name="make.command" value="make" />
 
+    <condition property="make.arg" value="/nologo">
+        <isset property="is.windows"/>
+    </condition>
+    <property name="make.arg" value="-r" />
+
+    <condition property="make.suffix" value="mak">
+        <isset property="is.windows"/>
+    </condition>
+    <property name="make.suffix" value="mk" />
+
 </project>



Mime
View raw message