You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by wj...@apache.org on 2006/10/19 06:50:47 UTC
svn commit: r465483 - in /incubator/harmony/enhanced/classlib/trunk: make/
modules/luni/ modules/luni/src/main/native/common/
modules/luni/src/main/native/include/linux/
modules/luni/src/main/native/include/shared/
modules/luni/src/main/native/include/...
Author: wjwashburn
Date: Wed Oct 18 21:50:43 2006
New Revision: 465483
URL: http://svn.apache.org/viewvc?view=rev&rev=465483
Log:
HARMONY-1843, moving hythread and hyprt out of luni. This major move was build and "build test"ed on both windowsxp and linux w/ gcc 3.4.5
Added:
incubator/harmony/enhanced/classlib/trunk/modules/portlib/
incubator/harmony/enhanced/classlib/trunk/modules/portlib/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/portlib/make/
incubator/harmony/enhanced/classlib/trunk/modules/portlib/make/hyproperties.xml
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/
- copied from r465282, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/common/
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/linux/
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/linux/hymutex.h
- copied unchanged from r465282, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/linux/hymutex.h
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/linux/hyportpg.h
- copied unchanged from r465282, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/linux/hyportpg.h
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/linux/hysock.h
- copied unchanged from r465282, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/linux/hysock.h
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/hycomp.h
- copied unchanged from r465282, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hycomp.h
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/hypool.h
- copied unchanged from r465282, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hypool.h
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/hyport.h
- copied unchanged from r465282, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hyport.h
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/hyporterror.h
- copied unchanged from r465282, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hyporterror.h
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/hythread.h
- copied unchanged from r465282, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hythread.h
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/windows/
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/windows/hymutex.h
- copied unchanged from r465282, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/hymutex.h
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/windows/hyportpg.h
- copied unchanged from r465282, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/hyportpg.h
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/windows/hysock.h
- copied unchanged from r465282, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/hysock.h
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/pool/
- copied from r465282, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/pool/
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/
- copied from r465282, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/
- copied from r465282, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/sig/
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/
- copied from r465282, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/
Removed:
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/common/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/linux/hymutex.h
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/linux/hyportpg.h
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/linux/hysock.h
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hycomp.h
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hypool.h
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hyport.h
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hyporterror.h
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hythread.h
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/hymutex.h
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/hyportpg.h
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/hysock.h
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/pool/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/sig/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/
Modified:
incubator/harmony/enhanced/classlib/trunk/make/build-native.xml
incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
Modified: incubator/harmony/enhanced/classlib/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-native.xml?view=diff&rev=465483&r1=465482&r2=465483
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-native.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-native.xml Wed Oct 18 21:50:43 2006
@@ -69,7 +69,8 @@
<!-- These module targets take care of building and copying
their shared libs -->
- <ant dir="modules/luni" antfile="build.xml" target="build-native-core" />
+ <ant dir="modules/portlib" antfile="build.xml" target="build-native" />
+ <ant dir="modules/luni" antfile="build.xml" target="build-native-core" />
<ant dir="modules/archive" antfile="build.xml" target="build-native" />
<ant dir="modules/auth" antfile="build.xml" target="build-native" />
<ant dir="modules/text" antfile="build.xml" target="build-native" />
@@ -92,6 +93,7 @@
depends="copy-makefile-includes,-make-clean,clean-makefile-includes" />
<target name="-make-clean">
+ <ant dir="modules/portlib" antfile="build.xml" target="clean-native" />
<ant dir="modules/auth" antfile="build.xml" target="clean-native" />
<ant dir="modules/archive" antfile="build.xml" target="clean-native" />
<ant dir="modules/text" antfile="build.xml" target="clean-native" />
@@ -170,6 +172,9 @@
target="copy-native-includes" />
<ant dir="modules/luni" antfile="build.xml"
target="copy-native-includes" />
+ <ant dir="modules/portlib" antfile="build.xml"
+ target="copy-native-includes" />
+
</target>
<!-- =================================
@@ -183,7 +188,8 @@
target="clean-native-includes" />
<ant dir="modules/luni" antfile="build.xml"
target="clean-native-includes" />
-
+ <ant dir="modules/portlib" antfile="build.xml"
+ target="clean-native-includes" />
<!-- delete the deploy/include and deploy/jdk/include directories -->
<delete dir="${hy.hdk}/include" />
<delete dir="${hy.hdk}/jdk/include" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml?view=diff&rev=465483&r1=465482&r2=465483
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Wed Oct 18 21:50:43 2006
@@ -46,12 +46,7 @@
<fileset dir="${hy.luni.src.main.native}/include/shared">
<include name="vmi.h" />
<include name="hyvmls.h" />
- <include name="hypool.h" />
- <include name="hyport.h" />
- <include name="hythread.h" />
- <include name="hycomp.h" />
<include name="hysocket.h" />
- <include name="hyporterror.h" />
<include name="gp.h" />
<include name="iohelp.h" />
<include name="exceptions.h" />
@@ -77,10 +72,7 @@
<target name="copy-native-includes-windows" if="is.windows">
<copy todir="${hy.hdk}/include" overwrite="yes">
<fileset dir="${hy.luni.src.main.native}/include/windows">
- <include name="hymutex.h" />
<include name="jclprots.h" />
- <include name="hysock.h" />
- <include name="hyportpg.h" />
</fileset>
</copy>
</target>
@@ -88,10 +80,7 @@
<target name="copy-native-includes-linux" if="is.linux">
<copy todir="${hy.hdk}/include" overwrite="yes">
<fileset dir="${hy.luni.src.main.native}/include/linux">
- <include name="hymutex.h" />
<include name="jclprots.h" />
- <include name="hysock.h" />
- <include name="hyportpg.h" />
</fileset>
</copy>
</target>
@@ -103,39 +92,6 @@
<!-- Build the core luni native components -->
<target name="build-native-core" >
- <!-- Build sig dll -->
- <make dir="${hy.luni.src.main.native}/sig/${hy.os}" />
-
- <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
- <fileset dir="${hy.luni.src.main.native}/sig">
- <patternset includes="*${shlib.suffix}*" />
- </fileset>
- </copy>
-
- <!-- Build common lib -->
- <make dir="${hy.luni.src.main.native}/common/${hy.os}" />
-
- <!-- Build pool lib -->
- <make dir="${hy.luni.src.main.native}/pool/${hy.os}" />
-
- <!-- Build thread dll -->
- <make dir="${hy.luni.src.main.native}/thread/${hy.os}" />
-
- <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
- <fileset dir="${hy.luni.src.main.native}/thread">
- <patternset includes="*${shlib.suffix}*" />
- </fileset>
- </copy>
-
- <!-- Build port dll -->
- <make dir="${hy.luni.src.main.native}/port/${hy.os}" />
-
- <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
- <fileset dir="${hy.luni.src.main.native}/port">
- <patternset includes="*${shlib.suffix}*" />
- </fileset>
- </copy>
-
<!-- Build fdlibm lib -->
<make dir="${hy.luni.src.main.native}/fdlibm/${hy.os}" />
@@ -197,11 +153,6 @@
<!-- Clean natives -->
<target name="clean-native">
- <make dir="${hy.luni.src.main.native}/sig/${hy.os}" target="clean" />
- <make dir="${hy.luni.src.main.native}/common/${hy.os}" target="clean" />
- <make dir="${hy.luni.src.main.native}/pool/${hy.os}" target="clean" />
- <make dir="${hy.luni.src.main.native}/thread/${hy.os}" target="clean" />
- <make dir="${hy.luni.src.main.native}/port/${hy.os}" target="clean" />
<make dir="${hy.luni.src.main.native}/fdlibm/${hy.os}" target="clean" />
<make dir="${hy.luni.src.main.native}/vmi/${hy.os}" target="clean" />
<make dir="${hy.luni.src.main.native}/luni/${hy.os}" target="clean" />
@@ -226,17 +177,9 @@
<fileset dir="${hy.hdk}/include">
<include name="vmi.h" />
<include name="hyvmls.h" />
- <include name="hypool.h" />
- <include name="hyport.h" />
- <include name="hythread.h" />
- <include name="hymutex.h" />
<include name="jclprots.h" />
- <include name="hycomp.h" />
<include name="hysocket.h" />
- <include name="hyporterror.h" />
<include name="gp.h" />
- <include name="hysock.h" />
- <include name="hyportpg.h" />
<include name="iohelp.h" />
<include name="exceptions.h" />
<include name="libglob.h" />
Added: incubator/harmony/enhanced/classlib/trunk/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/portlib/build.xml?view=auto&rev=465483
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/portlib/build.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/portlib/build.xml Wed Oct 18 21:50:43 2006
@@ -0,0 +1,135 @@
+<?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="PORTLIB Build" default="build" basedir=".">
+ <description>Build for PORTLIB component</description>
+
+ <!-- import common properties -->
+ <import file="${basedir}/../../make/properties.xml" />
+
+ <!-- set global properties for this build. -->
+ <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+ <property file="../../make/depends.properties" />
+ <property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
+
+ <target name="build" /> <!-- depends="compile-java, copy-resources, build-jar" -->
+
+ <target name="copy-native-includes">
+ <copy todir="${hy.hdk}/include" overwrite="yes">
+ <fileset dir="${hy.portlib.src.main.native}/include/shared">
+ <include name="hyport.h" />
+ <include name="hythread.h" />
+ <include name="hycomp.h" />
+ <include name="hyporterror.h" />
+ <include name="hypool.h" />
+
+ </fileset>
+ </copy>
+
+ <antcall target="copy-native-includes-windows" />
+ <antcall target="copy-native-includes-linux" />
+ </target>
+
+ <target name="copy-native-includes-windows" if="is.windows">
+ <copy todir="${hy.hdk}/include" overwrite="yes">
+ <fileset dir="${hy.portlib.src.main.native}/include/windows">
+ <include name="hymutex.h" />
+ <include name="hysock.h" />
+ <include name="hyportpg.h" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="copy-native-includes-linux" if="is.linux">
+ <copy todir="${hy.hdk}/include" overwrite="yes">
+ <fileset dir="${hy.portlib.src.main.native}/include/linux">
+ <include name="hymutex.h" />
+ <include name="hysock.h" />
+ <include name="hyportpg.h" />
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- Build the portlib native components -->
+ <target name="build-native" >
+
+ <!-- Build common lib -->
+ <make dir="${hy.portlib.src.main.native}/common/${hy.os}" />
+
+ <!-- Build pool lib -->
+ <make dir="${hy.portlib.src.main.native}/pool/${hy.os}" />
+
+ <!-- Build sig dll -->
+ <make dir="${hy.portlib.src.main.native}/sig/${hy.os}" />
+
+ <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+ <fileset dir="${hy.portlib.src.main.native}/sig">
+ <patternset includes="*${shlib.suffix}*" />
+ </fileset>
+ </copy>
+
+ <!-- Build thread dll -->
+ <make dir="${hy.portlib.src.main.native}/thread/${hy.os}" />
+
+ <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+ <fileset dir="${hy.portlib.src.main.native}/thread">
+ <patternset includes="*${shlib.suffix}*" />
+ </fileset>
+ </copy>
+
+ <!-- Build port dll -->
+ <make dir="${hy.portlib.src.main.native}/port/${hy.os}" />
+
+ <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+ <fileset dir="${hy.portlib.src.main.native}/port">
+ <patternset includes="*${shlib.suffix}*" />
+ </fileset>
+ </copy>
+
+ </target>
+
+ <!-- Clean natives -->
+ <target name="clean-native">
+ <make dir="${hy.portlib.src.main.native}/sig/${hy.os}" target="clean" />
+ <make dir="${hy.portlib.src.main.native}/thread/${hy.os}" target="clean" />
+ <make dir="${hy.portlib.src.main.native}/port/${hy.os}" target="clean" />
+ <make dir="${hy.portlib.src.main.native}/common/${hy.os}" target="clean" />
+ <make dir="${hy.portlib.src.main.native}/pool/${hy.os}" target="clean" />
+
+ </target>
+
+ <target name="clean">
+ <antcall target="clean-native-includes" />
+ </target>
+
+ <target name="clean-native-includes">
+ <delete failonerror="false">
+ <fileset dir="${hy.hdk}/include">
+ <include name="hyport.h" />
+ <include name="hythread.h" />
+ <include name="hymutex.h" />
+ <include name="hycomp.h" />
+ <include name="hyporterror.h" />
+ <include name="hysock.h" />
+ <include name="hyportpg.h" />
+ <include name="hypool.h" />
+ </fileset>
+ </delete>
+ </target>
+</project>
Added: incubator/harmony/enhanced/classlib/trunk/modules/portlib/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/portlib/make/hyproperties.xml?view=auto&rev=465483
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/portlib/make/hyproperties.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/portlib/make/hyproperties.xml Wed Oct 18 21:50:43 2006
@@ -0,0 +1,53 @@
+<?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.
+-->
+
+<hy>
+ <portlib location=".">
+ <src>
+ <main>
+ <java location="src/main/java" />
+ <native location="src/main/native" />
+ <resources location="src/main/resources" />
+ </main>
+ <test location="src/test">
+ <resources location="src/test/resources" />
+ </test>
+ <natives location="src/natives" />
+ </src>
+ <bin>
+ <main location="bin/main" />
+ <test location="bin/test" />
+ </bin>
+ <packaging>
+ <jarname>luni</jarname>
+ </packaging>
+ </portlib>
+
+ <hdk location="../../deploy" />
+ <jdk location="../../deploy/jdk" />
+ <build location="../../build/classes" />
+
+ <tests>
+ <reports location="../../build/test_report" />
+ <support>
+ <bin location="../../build/tests" />
+ </support>
+ </tests>
+</hy>