harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From qi...@apache.org
Subject svn commit: r693355 [1/4] - in /harmony/enhanced/classlib/branches/java6: ./ depends/build/ depends/build/platform/ depends/jars/ make/ modules/archive/src/main/native/zlib/unix/ modules/awt/src/main/native/gl/shared/ modules/awt/src/main/native/lcmm/s...
Date Tue, 09 Sep 2008 03:19:55 GMT
Author: qiuxx
Date: Mon Sep  8 20:19:53 2008
New Revision: 693355

URL: http://svn.apache.org/viewvc?rev=693355&view=rev
Log:
Merge updates from classlib trunk@693025 since r681495

Added:
    harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86_64.mk
      - copied unchanged from r693025, harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86_64.mk
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/hw.jar
      - copied unchanged from r693025, harmony/enhanced/classlib/trunk/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/hw.jar
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/sqlUnpacked.jar
      - copied unchanged from r693025, harmony/enhanced/classlib/trunk/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/sqlUnpacked.jar
Removed:
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/shared/jsig.h
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/hysignal.h
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/HelloWorldJavap.out
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/sqlJavap.out
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/freebsd.x86/hysignal_context.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/freebsd.x86/hysignal_context.h
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysignal.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/linux.ia64/hysignal_context.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/linux.ia64/hysignal_context.h
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/linux.x86/hysignal_context.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/linux.x86/hysignal_context.h
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/linux.x86_64/hysignal_context.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/linux.x86_64/hysignal_context.h
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/windows/hysignal.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/sig/
Modified:
    harmony/enhanced/classlib/branches/java6/README.txt
    harmony/enhanced/classlib/branches/java6/depends/build/defines.mak
    harmony/enhanced/classlib/branches/java6/depends/build/defines.mk
    harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk
    harmony/enhanced/classlib/branches/java6/depends/jars/   (props changed)
    harmony/enhanced/classlib/branches/java6/make/build-java.xml
    harmony/enhanced/classlib/branches/java6/make/depends.properties
    harmony/enhanced/classlib/branches/java6/make/properties.xml
    harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/blitter.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/shared/NativeCMM.c
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/shared/org_apache_harmony_awt_gl_opengl_GL.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/org_apache_harmony_awt_nativebridge_linux_GLX.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/org_apache_harmony_awt_nativebridge_linux_X11.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/org_apache_harmony_awt_nativebridge_linux_Xft.cpp
    harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml
    harmony/enhanced/classlib/branches/java6/modules/concurrent/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/shared/JpegEncoder.c
    harmony/enhanced/classlib/branches/java6/modules/luni/build.xml
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/File.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetAddress.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Date.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Hashtable.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/HugeEnumSet.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/SimpleTimeZone.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/shared/cmain.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/harmonyglob.h
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/luniglob.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSMemoryLinux32.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/freebsd/OSResourcesMonitor.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/helpers.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/InetAddressTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/DateTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/EnumSetTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/windows/org/apache/harmony/luni/tests/java/io/WinFileTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/BcBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/CpBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcTuple.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/NewAttributeBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/Segment.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassConstantPool.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/NewAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ArchiveTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BcBandsTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ICTupleTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/bytecode/ConstantPoolTest.java
    harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hyerror.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hyexit.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hyport.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hyportcontrol.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hystr.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/portpriv.h
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyosdump.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysl.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysock.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/print/src/main/native/print/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Date.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Time.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Timestamp.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DateTest.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimeTest.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
    harmony/enhanced/classlib/branches/java6/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java

Modified: harmony/enhanced/classlib/branches/java6/README.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/README.txt?rev=693355&r1=693354&r2=693355&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/README.txt (original)
+++ harmony/enhanced/classlib/branches/java6/README.txt Mon Sep  8 20:19:53 2008
@@ -252,11 +252,11 @@
 variable if they see the following error message when attempting to run a Java
 application with the built class library components on a compatible VM : 
 
-error while loading shared libraries: libhysig.so: cannot open shared 
+error while loading shared libraries: libhyprt.so: cannot open shared 
 object file: No such file or directory
 
 On some systems this error can occur even when the shared library
-(e.g. <EXTRACT_DIR>/deploy/jdk/jre/bin/libhysig.so) has been built correctly
+(e.g. <EXTRACT_DIR>/deploy/jdk/jre/bin/libhyprt.so) has been built correctly
 and is present in the correct location. This is not a problem with the built
 shared library but instead is dependent on how the operating system locates and 
 loads dynamically linked libraries at runtime. Updating the LD_LIBRARY_PATH 

Modified: harmony/enhanced/classlib/branches/java6/depends/build/defines.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/defines.mak?rev=693355&r1=693354&r2=693355&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/defines.mak (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/defines.mak Mon Sep  8 20:19:53
2008
@@ -69,12 +69,6 @@
 HYCFLAGS = $(HYCFLAGS) -DHY_NO_THR
 !ENDIF
   
-!IF "$(HY_NO_SIG)" == "false"
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hysig.lib
-!ELSE  
-HYCFLAGS = $(HYCFLAGS) -DHY_NO_SIG
-!ENDIF
-
 !IF "$(HY_ZIP_API)" == "true"
 HYCFLAGS = $(HYCFLAGS) -DHY_ZIP_API
 !ENDIF

Modified: harmony/enhanced/classlib/branches/java6/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/defines.mk?rev=693355&r1=693354&r2=693355&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/defines.mk Mon Sep  8 20:19:53
2008
@@ -94,12 +94,6 @@
 DEFINES += -DHY_NO_THR
 endif
 
-ifeq ($(HY_NO_SIG),false)
-MDLLIBFILES += $(DLLPATH)libhysig$(HY_LINKLIB_SUFFIX)
-else
-DEFINES += -DHY_NO_SIG
-endif
-
 ifeq ($(HY_ZIP_API),true)
 DEFINES += -DHY_ZIP_API
 endif

Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk?rev=693355&r1=693354&r2=693355&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk Mon Sep
 8 20:19:53 2008
@@ -15,6 +15,6 @@
 
 DEFINES += -DFREEBSD -DFREEBSD_X86 -DHYX86 -DNEEDS_SYS_TYPES -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic -march=pentium3
-OSLIBS = -lpthread -lm
+OSLIBS = -L/usr/local/lib -lpthread -lm
 INCLUDES += -I/usr/local/include
-XLIBS = -L/usr/local/lib -lX11 -lXft -lXext -lXtst
+XLIBS = -lX11 -lXft -lXext -lXtst

Propchange: harmony/enhanced/classlib/branches/java6/depends/jars/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Sep  8 20:19:53 2008
@@ -16,11 +16,7 @@
 bcel-5.2
 jetty
 bcprov-jdk14-134
-yoko_M1-20061027
 bcprov-jdk15-134
-yoko_M2-200611115
-yoko_M2-20061115
-yoko_M2-20070130
 xerces_2.9.0
 bcprov-jdk15-136
 bcprov-jdk15-137
@@ -29,4 +25,4 @@
 xerces_2.9.1
 xmlsec_1.4.0
 bcprov-jdk15-138
-yoko-1.0-SNAPSHOT-20080304
+yoko-1.0

Modified: harmony/enhanced/classlib/branches/java6/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/build-java.xml?rev=693355&r1=693354&r2=693355&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-java.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-java.xml Mon Sep  8 20:19:53 2008
@@ -207,10 +207,10 @@
                 <patternset includes="mx4j_3.0.2/*.jar" />
                 <patternset includes="xalan-j_2.7.0/*.jar" />
                 <patternset includes="xerces_2.9.1/*.jar" />
-                <patternset includes="yoko_M2-20070130/yoko-rmi-spec.jar" />
-                <patternset includes="yoko_M2-20070130/yoko-rmi-impl.jar" />
-                <patternset includes="yoko_M2-20070130/yoko.jar" />
-                <patternset includes="yoko_M2-20070130/yoko-core.jar" />
+                <patternset includes="yoko-1.0/yoko-rmi-spec.jar" />
+                <patternset includes="yoko-1.0/yoko-rmi-impl.jar" />
+                <patternset includes="yoko-1.0/yoko.jar" />
+                <patternset includes="yoko-1.0/yoko-core.jar" />
             </fileset>
             <fileset dir="${depends.manifests}"/>
         </copy>

Modified: harmony/enhanced/classlib/branches/java6/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.properties?rev=693355&r1=693354&r2=693355&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.properties Mon Sep  8 20:19:53 2008
@@ -73,25 +73,25 @@
 mx4j.jar=${mx4j.dir}/mx4j.jar
 mx4j.remote.jar=${mx4j.dir}/mx4j-remote.jar
 
-yoko.dir=${depends.jars}/yoko_M2-20070130
+yoko.dir=${depends.jars}/yoko-1.0
 yoko.jar=${yoko.dir}/yoko.jar
-yoko.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-spec-corba/1.0-incubating-M2-SNAPSHOT/yoko-spec-corba-1.0-incubating-M2-20070130.104323-7.jar
-yoko.md5=d59e36ee960a53f4f75e14db3dc483ca
+yoko.url=http://repo1.maven.org/maven2/org/apache/yoko/yoko-spec-corba/1.0/yoko-spec-corba-1.0.jar
+yoko.md5=9785a46807b2f9d374296b4af1ff97fb
 
-yoko-core.dir=${depends.jars}/yoko_M2-20070130
+yoko-core.dir=${depends.jars}/yoko-1.0
 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-incubating-M2-SNAPSHOT/yoko-core-1.0-incubating-M2-20070130.104323-5.jar
-yoko-core.md5=f68c368999daab6857900a74d8a1ac04
+yoko-core.url=http://repo1.maven.org/maven2/org/apache/yoko/yoko-core/1.0/yoko-core-1.0.jar
+yoko-core.md5=14acb2d10e6725ebda5bd02e7afc8218
 
-yoko-rmi-impl.dir=${depends.jars}/yoko_M2-20070130
+yoko-rmi-impl.dir=${depends.jars}/yoko-1.0
 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-incubating-M2-SNAPSHOT/yoko-rmi-impl-1.0-incubating-M2-20070130.104323-5.jar
-yoko-rmi-impl.md5=2a0cecb7d2b0567ad1758e43df67efce
+yoko-rmi-impl.url=http://repo1.maven.org/maven2/org/apache/yoko/yoko-rmi-impl/1.0/yoko-rmi-impl-1.0.jar
+yoko-rmi-impl.md5=dee6e519c83796d99a51b1379abf772a
 
-yoko-rmi-spec.dir=${depends.jars}/yoko_M2-20070130
+yoko-rmi-spec.dir=${depends.jars}/yoko-1.0
 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-incubating-M2-SNAPSHOT/yoko-rmi-spec-1.0-incubating-M2-20070130.104323-6.jar
-yoko-rmi-spec.md5=532438a96cbb6948c37f0f7650aa1d5e
+yoko-rmi-spec.url=http://repo1.maven.org/maven2/org/apache/yoko/yoko-rmi-spec/1.0/yoko-rmi-spec-1.0.jar
+yoko-rmi-spec.md5=2f8e962b3a5b9dea0a573a5285b669f6
 
 # bcel is needed by yoko-rmi
 bcel.dir=${depends.jars}/bcel-5.2

Modified: harmony/enhanced/classlib/branches/java6/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/properties.xml?rev=693355&r1=693354&r2=693355&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/properties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/properties.xml Mon Sep  8 20:19:53 2008
@@ -293,13 +293,6 @@
         </not>
     </condition>
 
-    <property name="hy.no.sig" value="${hy.no.thr}" />
-    <condition property="hy.skip.sig" value="true">
-        <not>
-            <equals arg1="${hy.no.sig}" arg2="false" />
-        </not>
-    </condition>
-
     <property name="hy.local.zlib" value="false" />
     <condition property="hy.skip.zlib" value="true">
         <not>
@@ -463,10 +456,13 @@
         <condition property="hy.test.vm.name" value="drl" else="ibm" >
             <contains string="${test.vm.info.tmp}" substring="harmony" />
         </condition>
-        <echo level="verbose" message="hy.test.vm.name = ${hy.test.vm.name}" />
+        <echo level="info" message="hy.test.vm.name = ${hy.test.vm.name}" />
     </target>
 
-    <target name="-get-test-vm-output" if="test.jre.home">
+    <target name="-get-test-vm-output">
+        <condition property="test.jre.home" value="${hy.jdk}/jre">
+            <not><isset property="test.jre.home" /></not>
+        </condition>
         <exec executable="${test.jre.home}/bin/java" failifexecutionfails="false">
             <arg value="-version" />
             <redirector outputproperty="test.vm.info.tmp"/>
@@ -505,7 +501,6 @@
                 <env key="HY_ARCH" value="${hy.arch}" />
                 <env key="HY_OS" value="${hy.os}" />
                 <env key="HY_PLATFORM" value="${hy.platform}" />
-                <env key="HY_NO_SIG" value="${hy.no.sig}" />
                 <env key="HY_NO_THR" value="${hy.no.thr}" />
                 <env key="HY_LOCAL_ZLIB" value="${hy.local.zlib}" />
                 <env key="HY_SHLIB_SUFFIX" value="${shlib.suffix}" />

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/unix/makefile?rev=693355&r1=693354&r2=693355&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/unix/makefile
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/unix/makefile
Mon Sep  8 20:19:53 2008
@@ -17,6 +17,16 @@
 # Makefile for module 'zlib'
 #
 
+# We don't need to debug into zlib
+HY_CFG=release
+
+HYRELEASECFLAGS = -O3
+
+# Further performance improvement on x86 and x86_64
+ifneq (,$(findstring x86,$(HY_ARCH)))
+HYRELEASECFLAGS += -DUNALIGNED_OK
+endif
+
 include $(HY_HDK)/build/make/defines.mk
 
 ZLIB_DIST=../../zlib_dist/# Path to zlib

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.cpp?rev=693355&r1=693354&r2=693355&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.cpp
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.cpp
Mon Sep  8 20:19:53 2008
@@ -229,7 +229,7 @@
 
                     for(int _x = w; _x > 0; _x--){
                         *d = 255;
-                        *s--;
+                        s--;
                         *(d - 3) = *s--;
                         *(d - 2) = *s--;
                         *(d - 1) = *s--;

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/blitter.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/blitter.cpp?rev=693355&r1=693354&r2=693355&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/blitter.cpp
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/blitter.cpp
Mon Sep  8 20:19:53 2008
@@ -595,7 +595,7 @@
                                   sb = *sp++;
                                   sg = *sp++;
                                   sr = *sp++;
-                                  *sp++;
+                                  sp++;
                                   sa = MUL(alpha, 255);
                                   sb = MUL(sa, sb);
                                   sg = MUL(sa, sg);

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/shared/NativeCMM.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/shared/NativeCMM.c?rev=693355&r1=693354&r2=693355&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/shared/NativeCMM.c
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/shared/NativeCMM.c
Mon Sep  8 20:19:53 2008
@@ -29,7 +29,7 @@
 int gl_cmsErrorHandler(int errorCode, const char *msg) {
   if(errorCode == LCMS_ERRC_ABORTED) {
     // Throw exception later, after returning control from cmm
-#if defined(ZOS) || defined(LINUX)
+#if defined(ZOS) || defined(LINUX) || defined(FREEBSD)
     errMsg = strdup(msg);
 #else
     errMsg = _strdup(msg);

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/shared/org_apache_harmony_awt_gl_opengl_GL.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/shared/org_apache_harmony_awt_gl_opengl_GL.cpp?rev=693355&r1=693354&r2=693355&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/shared/org_apache_harmony_awt_gl_opengl_GL.cpp
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/shared/org_apache_harmony_awt_gl_opengl_GL.cpp
Mon Sep  8 20:19:53 2008
@@ -37,7 +37,7 @@
     if (p_nbridge_glVertexPointer == NULL) {
         p_nbridge_glVertexPointer = (void (__stdcall*) (int, int, int, void *)) FindFunction(libGL,
"glVertexPointer");
     }
-    (* p_nbridge_glVertexPointer)((int) size, (int) type, (int) stride, (void *) pointer);
+    (* p_nbridge_glVertexPointer)((int) size, (int) type, (int) stride, (void *)(size_t)
pointer);
 }
 
 void (__stdcall* p_nbridge_glPixelStoref) (int, float) = NULL;
@@ -91,7 +91,7 @@
     if (p_nbridge_glColor4ubv == NULL) {
         p_nbridge_glColor4ubv = (void (__stdcall*) (void *)) FindFunction(libGL, "glColor4ubv");
     }
-    (* p_nbridge_glColor4ubv)((void *) v);
+    (* p_nbridge_glColor4ubv)((void *)(size_t) v);
 }
 
 void (__stdcall* p_nbridge_glTexImage1D) (int, int, int, int, int, int, int, void *) = NULL;
@@ -100,7 +100,7 @@
     if (p_nbridge_glTexImage1D == NULL) {
         p_nbridge_glTexImage1D = (void (__stdcall*) (int, int, int, int, int, int, int, void
*)) FindFunction(libGL, "glTexImage1D");
     }
-    (* p_nbridge_glTexImage1D)((int) target, (int) level, (int) internalformat, (int) width,
(int) border, (int) format, (int) type, (void *) pixels);
+    (* p_nbridge_glTexImage1D)((int) target, (int) level, (int) internalformat, (int) width,
(int) border, (int) format, (int) type, (void *)(size_t) pixels);
 }
 
 void (__stdcall* p_nbridge_gluOrtho2D) (double, double, double, double) = NULL;
@@ -154,7 +154,7 @@
     if (p_nbridge_glGetIntegerv == NULL) {
         p_nbridge_glGetIntegerv = (void (__stdcall*) (int, void *)) FindFunction(libGL, "glGetIntegerv");
     }
-    (* p_nbridge_glGetIntegerv)((int) pname, (void *) params);
+    (* p_nbridge_glGetIntegerv)((int) pname, (void *)(size_t) params);
 }
 
 void (__stdcall* p_nbridge_glTexGendv) (int, int, void *) = NULL;
@@ -163,7 +163,7 @@
     if (p_nbridge_glTexGendv == NULL) {
         p_nbridge_glTexGendv = (void (__stdcall*) (int, int, void *)) FindFunction(libGL,
"glTexGendv");
     }
-    (* p_nbridge_glTexGendv)((int) coord, (int) pname, (void *) params);
+    (* p_nbridge_glTexGendv)((int) coord, (int) pname, (void *)(size_t) params);
 }
 
 void (__stdcall* p_nbridge_glTexCoord2d) (double, double) = NULL;
@@ -271,7 +271,7 @@
     if (p_nbridge_glDrawPixels == NULL) {
         p_nbridge_glDrawPixels = (void (__stdcall*) (int, int, int, int, void *)) FindFunction(libGL,
"glDrawPixels");
     }
-    (* p_nbridge_glDrawPixels)((int) width, (int) height, (int) format, (int) type, (void
*) pixels);
+    (* p_nbridge_glDrawPixels)((int) width, (int) height, (int) format, (int) type, (void
*)(size_t) pixels);
 }
 
 void (__stdcall* p_nbridge_glCopyPixels) (int, int, int, int, int) = NULL;
@@ -307,7 +307,7 @@
     if (p_nbridge_glMultMatrixd == NULL) {
         p_nbridge_glMultMatrixd = (void (__stdcall*) (void *)) FindFunction(libGL, "glMultMatrixd");
     }
-    (* p_nbridge_glMultMatrixd)((void *) m);
+    (* p_nbridge_glMultMatrixd)((void *)(size_t) m);
 }
 
 void (__stdcall* p_nbridge_glClear) (int) = NULL;
@@ -334,7 +334,7 @@
     if (p_nbridge_glColorPointer == NULL) {
         p_nbridge_glColorPointer = (void (__stdcall*) (int, int, int, void *)) FindFunction(libGL,
"glColorPointer");
     }
-    (* p_nbridge_glColorPointer)((int) size, (int) type, (int) stride, (void *) pointer);
+    (* p_nbridge_glColorPointer)((int) size, (int) type, (int) stride, (void *)(size_t) pointer);
 }
 
 void (__stdcall* p_nbridge_glScaled) (double, double, double) = NULL;
@@ -379,7 +379,7 @@
     if (p_nbridge_glBitmap == NULL) {
         p_nbridge_glBitmap = (void (__stdcall*) (int, int, float, float, float, float, void
*)) FindFunction(libGL, "glBitmap");
     }
-    (* p_nbridge_glBitmap)((int) width, (int) height, (float) xorig, (float) yorig, (float)
xmove, (float) ymove, (void *) bitmap);
+    (* p_nbridge_glBitmap)((int) width, (int) height, (float) xorig, (float) yorig, (float)
xmove, (float) ymove, (void *)(size_t) bitmap);
 }
 
 void (__stdcall* p_nbridge_glColorTable) (int, int, int, int, int, void *) = NULL;
@@ -388,7 +388,7 @@
     if (p_nbridge_glColorTable == NULL) {
         p_nbridge_glColorTable = (void (__stdcall*) (int, int, int, int, int, void *)) FindFunction(libGL,
"glColorTable");
     }
-    (* p_nbridge_glColorTable)((int) param_0, (int) param_1, (int) param_2, (int) param_3,
(int) param_4, (void *) param_5);
+    (* p_nbridge_glColorTable)((int) param_0, (int) param_1, (int) param_2, (int) param_3,
(int) param_4, (void *)(size_t) param_5);
 }
 
 void (__stdcall* p_nbridge_glGenTextures) (int, void *) = NULL;
@@ -397,7 +397,7 @@
     if (p_nbridge_glGenTextures == NULL) {
         p_nbridge_glGenTextures = (void (__stdcall*) (int, void *)) FindFunction(libGL, "glGenTextures");
     }
-    (* p_nbridge_glGenTextures)((int) n, (void *) textures);
+    (* p_nbridge_glGenTextures)((int) n, (void *)(size_t) textures);
 }
 
 void (__stdcall* p_nbridge_glFinish) (void) = NULL;
@@ -415,7 +415,7 @@
     if (p_nbridge_glDeleteTextures == NULL) {
         p_nbridge_glDeleteTextures = (void (__stdcall*) (int, void *)) FindFunction(libGL,
"glDeleteTextures");
     }
-    (* p_nbridge_glDeleteTextures)((int) n, (void *) textures);
+    (* p_nbridge_glDeleteTextures)((int) n, (void *)(size_t) textures);
 }
 
 void (__stdcall* p_nbridge_glDisableClientState) (int) = NULL;
@@ -460,7 +460,7 @@
     if (p_nbridge_glLoadMatrixd == NULL) {
         p_nbridge_glLoadMatrixd = (void (__stdcall*) (void *)) FindFunction(libGL, "glLoadMatrixd");
     }
-    (* p_nbridge_glLoadMatrixd)((void *) m);
+    (* p_nbridge_glLoadMatrixd)((void *)(size_t) m);
 }
 
 void (__stdcall* p_nbridge_glReadPixels) (int, int, int, int, int, int, void *) = NULL;
@@ -469,7 +469,7 @@
     if (p_nbridge_glReadPixels == NULL) {
         p_nbridge_glReadPixels = (void (__stdcall*) (int, int, int, int, int, int, void *))
FindFunction(libGL, "glReadPixels");
     }
-    (* p_nbridge_glReadPixels)((int) x, (int) y, (int) width, (int) height, (int) format,
(int) type, (void *) pixels);
+    (* p_nbridge_glReadPixels)((int) x, (int) y, (int) width, (int) height, (int) format,
(int) type, (void *)(size_t) pixels);
 }
 
 void (__stdcall* p_nbridge_glBindTexture) (int, int) = NULL;
@@ -514,7 +514,7 @@
     if (p_nbridge_glTexImage2D == NULL) {
         p_nbridge_glTexImage2D = (void (__stdcall*) (int, int, int, int, int, int, int, int,
void *)) FindFunction(libGL, "glTexImage2D");
     }
-    (* p_nbridge_glTexImage2D)((int) target, (int) level, (int) internalformat, (int) width,
(int) height, (int) border, (int) format, (int) type, (void *) pixels);
+    (* p_nbridge_glTexImage2D)((int) target, (int) level, (int) internalformat, (int) width,
(int) height, (int) border, (int) format, (int) type, (void *)(size_t) pixels);
 }
 
 void (__stdcall* p_nbridge_glPixelMapusv) (int, int, void *) = NULL;
@@ -523,7 +523,7 @@
     if (p_nbridge_glPixelMapusv == NULL) {
         p_nbridge_glPixelMapusv = (void (__stdcall*) (int, int, void *)) FindFunction(libGL,
"glPixelMapusv");
     }
-    (* p_nbridge_glPixelMapusv)((int) map, (int) mapsize, (void *) values);
+    (* p_nbridge_glPixelMapusv)((int) map, (int) mapsize, (void *)(size_t) values);
 }
 
 void (__stdcall* p_nbridge_glViewport) (int, int, int, int) = NULL;
@@ -550,7 +550,7 @@
     if (p_nbridge_glTexSubImage2D == NULL) {
         p_nbridge_glTexSubImage2D = (void (__stdcall*) (int, int, int, int, int, int, int,
int, void *)) FindFunction(libGL, "glTexSubImage2D");
     }
-    (* p_nbridge_glTexSubImage2D)((int) target, (int) level, (int) xoffset, (int) yoffset,
(int) width, (int) height, (int) format, (int) type, (void *) pixels);
+    (* p_nbridge_glTexSubImage2D)((int) target, (int) level, (int) xoffset, (int) yoffset,
(int) width, (int) height, (int) format, (int) type, (void *)(size_t) pixels);
 }
 
 void (__stdcall* p_nbridge_glDrawBuffer) (int) = NULL;

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/org_apache_harmony_awt_nativebridge_linux_GLX.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/org_apache_harmony_awt_nativebridge_linux_GLX.cpp?rev=693355&r1=693354&r2=693355&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/org_apache_harmony_awt_nativebridge_linux_GLX.cpp
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/org_apache_harmony_awt_nativebridge_linux_GLX.cpp
Mon Sep  8 20:19:53 2008
@@ -16,7 +16,7 @@
  */
  /**
  * @author Oleg V. Khaschansky
- * @version $Revision$
+ * @version $Revision$(size_t) 
  */
  
 /* DO NOT EDIT THIS FILE - it is based on GLX headers and was autogenerated by nativebridge
tool */
@@ -35,7 +35,7 @@
     if (p_nbridge_glXQueryExtension == NULL) {
         p_nbridge_glXQueryExtension = (int (*) (void *, void *, void *)) FindFunction(libGL,
"glXQueryExtension");
     }
-    return (jint) (* p_nbridge_glXQueryExtension)((void *) dpy, (void *) error_base, (void
*) event_base);
+    return (jint) (* p_nbridge_glXQueryExtension)((void *)(size_t) dpy, (void *)(size_t)
 error_base, (void *)(size_t)  event_base);
 }
 
 int (* p_nbridge_glXGetFBConfigAttrib) (void *, void *, int, void *) = NULL;
@@ -44,7 +44,7 @@
     if (p_nbridge_glXGetFBConfigAttrib == NULL) {
         p_nbridge_glXGetFBConfigAttrib = (int (*) (void *, void *, int, void *)) FindFunction(libGL,
"glXGetFBConfigAttrib");
     }
-    return (jint) (* p_nbridge_glXGetFBConfigAttrib)((void *) dpy, (void *) config, (int)
attribute, (void *) value);
+    return (jint) (* p_nbridge_glXGetFBConfigAttrib)((void *)(size_t)  dpy, (void *)(size_t)
 config, (int) attribute, (void *)(size_t)  value);
 }
 
 void * (* p_nbridge_glXCreateNewContext) (void *, void *, int, void *, int) = NULL;
@@ -53,7 +53,7 @@
     if (p_nbridge_glXCreateNewContext == NULL) {
         p_nbridge_glXCreateNewContext = (void * (*) (void *, void *, int, void *, int)) FindFunction(libGL,
"glXCreateNewContext");
     }
-    return (jlong) (* p_nbridge_glXCreateNewContext)((void *) dpy, (void *) config, (int)
render_type, (void *) share_list, (int) direct);
+    return (jlong)(size_t) (* p_nbridge_glXCreateNewContext)((void *)(size_t)  dpy, (void
*)(size_t)  config, (int) render_type, (void *)(size_t)  share_list, (int) direct);
 }
 
 int (* p_nbridge_glXMakeCurrent) (void *, long, void *) = NULL;
@@ -62,7 +62,7 @@
     if (p_nbridge_glXMakeCurrent == NULL) {
         p_nbridge_glXMakeCurrent = (int (*) (void *, long, void *)) FindFunction(libGL, "glXMakeCurrent");
     }
-    return (jint) (* p_nbridge_glXMakeCurrent)((void *) dpy, (long) drawable, (void *) ctx);
+    return (jint) (* p_nbridge_glXMakeCurrent)((void *)(size_t)  dpy, (long) drawable, (void
*)(size_t)  ctx);
 }
 
 void (* p_nbridge_glXDestroyContext) (void *, void *) = NULL;
@@ -71,7 +71,7 @@
     if (p_nbridge_glXDestroyContext == NULL) {
         p_nbridge_glXDestroyContext = (void (*) (void *, void *)) FindFunction(libGL, "glXDestroyContext");
     }
-    (* p_nbridge_glXDestroyContext)((void *) dpy, (void *) ctx);
+    (* p_nbridge_glXDestroyContext)((void *)(size_t)  dpy, (void *)(size_t)  ctx);
 }
 
 void (* p_nbridge_glXDestroyPbuffer) (void *, long) = NULL;
@@ -80,7 +80,7 @@
     if (p_nbridge_glXDestroyPbuffer == NULL) {
         p_nbridge_glXDestroyPbuffer = (void (*) (void *, long)) FindFunction(libGL, "glXDestroyPbuffer");
     }
-    (* p_nbridge_glXDestroyPbuffer)((void *) dpy, (long) pbuf);
+    (* p_nbridge_glXDestroyPbuffer)((void *)(size_t) dpy, (long) pbuf);
 }
 
 void * (* p_nbridge_glXChooseFBConfig) (void *, int, void *, void *) = NULL;
@@ -89,7 +89,7 @@
     if (p_nbridge_glXChooseFBConfig == NULL) {
         p_nbridge_glXChooseFBConfig = (void * (*) (void *, int, void *, void *)) FindFunction(libGL,
"glXChooseFBConfig");
     }
-    return (jlong) (* p_nbridge_glXChooseFBConfig)((void *) dpy, (int) screen, (void *) attrib_list,
(void *) nelements);
+    return (jlong)(size_t) (* p_nbridge_glXChooseFBConfig)((void *)(size_t) dpy, (int) screen,
(void *)(size_t) attrib_list, (void *)(size_t) nelements);
 }
 
 unsigned long  (* p_nbridge_glXCreatePbuffer) (void *, void *, void *) = NULL;
@@ -98,7 +98,7 @@
     if (p_nbridge_glXCreatePbuffer == NULL) {
         p_nbridge_glXCreatePbuffer = (unsigned long  (*) (void *, void *, void *)) FindFunction(libGL,
"glXCreatePbuffer");
     }
-    return (jlong) (* p_nbridge_glXCreatePbuffer)((void *) dpy, (void *) config, (void *)
attrib_list);
+    return (jlong) (* p_nbridge_glXCreatePbuffer)((void *)(size_t) dpy, (void *)(size_t)
config, (void *)(size_t) attrib_list);
 }
 
 void (* p_nbridge_glXSwapBuffers) (void *, long) = NULL;
@@ -107,7 +107,7 @@
     if (p_nbridge_glXSwapBuffers == NULL) {
         p_nbridge_glXSwapBuffers = (void (*) (void *, long)) FindFunction(libGL, "glXSwapBuffers");
     }
-    (* p_nbridge_glXSwapBuffers)((void *) dpy, (long) drawable);
+    (* p_nbridge_glXSwapBuffers)((void *)(size_t) dpy, (long) drawable);
 }
 
 int (* p_nbridge_glXMakeContextCurrent) (void *, long, long, void *) = NULL;
@@ -116,5 +116,5 @@
     if (p_nbridge_glXMakeContextCurrent == NULL) {
         p_nbridge_glXMakeContextCurrent = (int (*) (void *, long, long, void *)) FindFunction(libGL,
"glXMakeContextCurrent");
     }
-    return (jint) (* p_nbridge_glXMakeContextCurrent)((void *) display, (long) draw, (long)
read, (void *) ctx);
+    return (jint) (* p_nbridge_glXMakeContextCurrent)((void *)(size_t) display, (long) draw,
(long) read, (void *)(size_t) ctx);
 }



Mime
View raw message