Return-Path: 
 <commits-return-35243-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 46414 invoked from network); 18 May 2007 08:17:06 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 18 May 2007 08:17:06 -0000
Received: (qmail 55777 invoked by uid 500); 18 May 2007 08:17:12 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 55763 invoked by uid 500); 18 May 2007 08:17:11 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 55754 invoked by uid 99); 18 May 2007 08:17:11 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 May 2007 01:17:11 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 May 2007 01:17:04 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 915821A981A; Fri, 18 May 2007 01:16:44 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r539305 - in
 /harmony/enhanced/buildtest/branches/2.0/adaptors/hdk: ./ adaptor.xml
 parameters.xml
Date: Fri, 18 May 2007 08:16:44 -0000
To: commits@harmony.apache.org
From: smishura@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070518081644.915821A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: smishura
Date: Fri May 18 01:16:43 2007
New Revision: 539305

URL: http://svn.apache.org/viewvc?view=rev&rev=539305
Log:
Apply patch from HARMONY-3791:
([testing] HDK build adapter for buildtest 2.0 infrastructure)

Added:
    harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/
    harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/adaptor.xml   (with props)
    harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/parameters.xml   (with props)

Added: harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/adaptor.xml?view=auto&rev=539305
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/adaptor.xml (added)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/adaptor.xml Fri May 18 01:16:43 2007
@@ -0,0 +1,129 @@
+<?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. -->
+
+<!-- ====================================================================== 
+                    BT Adaptor for Harmony HDK Project
+     ====================================================================== -->
+<project name="hdk" default="run" basedir=".">
+
+    <property name="cc.hdk.config.template" 
+              value="${temp.files.dir}/cc-hdk-project.xml"/>
+
+    <!-- do setup of the HDK workspace -->
+    <target name="setup">
+        <mkdir dir="${hdk.trunk.dir}"/>
+
+        <echo message="Checkout HDK trunk into ${hdk.trunk.dir}"/>
+        <svn-co url="${svn.url}" trunk="${hdk.trunk.dir}"/>
+        <!-- CC does not handle the modifications in 'switched' sub-trunks,
+             so manually add each of sub-trunks to modificationset -->
+        <copy file="${scripts.dir}/templates/cc-project-template.xml" 
+              tofile="${cc.hdk.config.template}"/>
+        <property name="nl" value="${line.separator}"/>
+        <replace file="${cc.hdk.config.template}">
+            <replacefilter 
+                token="&lt;!-- @BT.MODIFICATIONSET@ --&gt;" 
+                value="${nl}
+           &lt;svn localWorkingCopy='${hdk.trunk.dir}' property='repository.updated'/&gt;${nl}
+           &lt;svn localWorkingCopy='${hdk.classlib.trunk.dir}' property='repository.updated'/&gt;${nl}
+           &lt;svn localWorkingCopy='${hdk.drlvm.trunk.dir}' property='repository.updated'/&gt;${nl}
+           &lt;svn localWorkingCopy='${hdk.jdktools.trunk.dir}' property='repository.updated'/&gt;${nl}"/>
+        </replace>
+    </target>
+
+    <target name="run" depends="copy-awt-libs, copy-msvcr80">
+        <exec-ant dir="${hdk.trunk.dir}">
+            <jvmarg line="-Xmx1000M"/>
+            <sysproperty key="auto.fetch" value="true"/>
+            <sysproperty key="hy.cfg" value="${hdk.hy.cfg}"/>
+        </exec-ant>
+    </target>
+
+    <target name="clean">
+        <exec-ant dir="${hdk.trunk.dir}" targets="clean">
+            <sysproperty key="hy.cfg" value="${hdk.hy.cfg}"/>
+        </exec-ant>
+    </target>
+
+    <!-- ================================================================ -->
+    <!--         Workarounds needed to build HDK on 64 workstations       -->
+    <!-- ================================================================ -->
+
+    <condition property="is.linux.64">
+        <and>
+            <os name="linux"/>
+            <or>
+                <os arch="ia64"/>
+                <os arch="x86_64"/>
+            </or>
+        </and>
+    </condition>
+
+    <condition property="is.windows.64">
+        <and>
+            <os family="windows"/>
+            <or>
+                <os arch="ia64"/>
+                <os arch="x86_64"/>
+            </or>
+        </and>
+    </condition>
+
+    <!-- check if it is a 64 bit Linux Workstation and 
+         if it is so, demand path to prebuilt libraries -->
+    <condition property="demand.if.lin64"
+               value="Not In Use (as it is not a 64 bit Linux)"
+               else="">
+        <not><isset property="is.linux.64"/></not>
+    </condition>
+
+    <!-- check if it is a 64 bit Windows Workstation and 
+         if it is so, demand path to msvcr80.dll -->
+    <condition property="demand.if.win64"
+               value="Not In Use (as it is not a 64 bit Windows)"
+               else="">
+        <not><isset property="is.windows.64"/></not>
+    </condition>
+
+    <!-- copy prebuilt AWT libraries into HDK resources dir -->
+    <target name="copy-awt-libs" if="is.linux.64">
+        <mkdir dir="${hdk.trunk.dir}/working_classlib/depends/libs/build/jpeg"/>
+        <mkdir dir="${hdk.trunk.dir}/working_classlib/depends/libs/build/png"/>
+        <mkdir dir="${hdk.trunk.dir}/working_classlib/depends/libs/build/lcms"/>
+        <copy file="${hdk.linux.64.libs.dir}/jpeg/libjpeg.linux.x86_64" 
+              tofile="${hdk.trunk.dir}/working_classlib/depends/libs/build/jpeg/libjpeg.linux.x86_64"/>
+        <copy file="${hdk.linux.64.libs.dir}/png/libpng.linux.x86_64" 
+              tofile="${hdk.trunk.dir}/working_classlib/depends/libs/build/png/libpng.linux.x86_64"/>
+        <copy file="${hdk.linux.64.libs.dir}/lcms/liblcms.linux.x86_64" 
+              tofile="${hdk.trunk.dir}/working_classlib/depends/libs/build/lcms/liblcms.linux.x86_64"/>
+    </target>
+
+    <!-- copy msvcr80.dll into HDK resources dirs -->
+    <target name="copy-msvcr80" if="is.windows.64">
+        <property name="rel.path" value="depends/libs/windows.x86_64"/>
+
+        <mkdir dir="${hdk.trunk.dir}/common_resources/${rel.path}"/>
+		<copy file="${hdk.windows.64.msvcr80}"
+		      todir="${hdk.trunk.dir}/common_resources/${rel.path}"/>
+
+        <mkdir dir="${hdk.trunk.dir}/working_classlib/${rel.path}"/>
+		<copy file="${hdk.windows.64.msvcr80}"
+		      todir="${hdk.trunk.dir}/working_classlib/${rel.path}"/>
+    </target>
+
+</project>
+

Propchange: harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/adaptor.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/parameters.xml?view=auto&rev=539305
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/parameters.xml (added)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/parameters.xml Fri May 18 01:16:43 2007
@@ -0,0 +1,44 @@
+<!-- 
+    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. -->
+
+<parameters>
+    <required>
+        <!-- the value of this parameter will be demanded only on Linux 64 -->
+        <linux.64.libs.dir 
+            description="Path to prebuilt AWT libraries on Linux 64"
+            value="${demand.if.lin64}"/>
+        <!-- the value of this parameter will be demanded only on Windows 64 -->
+        <windows.64.msvcr80 
+            description="Path to msvcr80.dll on Windows 64"
+            value="${demand.if.win64}"/>
+    </required>
+
+    <!-- shared values -->
+    <shared>
+        <svn.url value="https://svn.apache.org/repos/asf/harmony/enhanced/trunk"/>
+        <trunk.dir location="${checkouts.dir}/hdk" id="trunk.dir.id"/>
+        <classlib.trunk.dir location="${checkouts.dir}/hdk/working_classlib"/>
+        <drlvm.trunk.dir location="${checkouts.dir}/hdk/working_vm"/>
+        <jdktools.trunk.dir location="${checkouts.dir}/hdk/working_jdktools"/>
+        <binaries.jre.dir location="${checkouts.dir}/hdk/target/hdk/jdk/jre"/> 
+        <hy.cfg value="debug"/>
+    </shared>
+
+    <!-- CC specific configuration -->
+    <cc config="${cc.hdk.config.template}">
+        <usesvn refid="trunk.dir.id"/>
+    </cc>
+</parameters>

Propchange: harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/parameters.xml
------------------------------------------------------------------------------
    svn:eol-style = native