harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r421913 - in /incubator/harmony/enhanced/classlib/trunk: ./ make/ modules/archive/ modules/awt/ modules/awt/make/ modules/awt/src/main/native/ modules/awt/src/main/native/gl/ modules/awt/src/main/native/gl/linux/ modules/awt/src/main/native...
Date Fri, 14 Jul 2006 14:28:35 GMT
Author: hindessm
Date: Fri Jul 14 07:28:32 2006
New Revision: 421913

URL: http://svn.apache.org/viewvc?rev=421913&view=rev
Log:
Attempt at integration of awt native code.

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/   (with props)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/   (with props)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/libgl.exp
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/
      - copied from r421213, incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/common/native/gl/
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/
      - copied from r421213, incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/windows/native/gl/
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/gl.def
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/gl.rc
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/   (with props)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/   (with props)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/libjpegdecoder.exp
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/
      - copied from r421213, incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/common/native/gl/JPEGDecoder/
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/jpegdecoder.def
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/jpegdecoder.rc
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/   (with props)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/   (with props)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/liblcmm.exp
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/shared/
      - copied from r421213, incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/common/native/gl/cmm/
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/lcmm.def
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/lcmm.rc
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/   (with props)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/
      - copied from r421213, incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/linux/native/linuxfont/
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/liblinuxfont.exp
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/   (with props)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/
      - copied from r421213, incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/windows/native/Win32Wrapper/
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/Win32Wrapper.def
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/Win32Wrapper.rc
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/   (with props)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/
      - copied from r421213, incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/windows/native/fontlib/
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/fontlib.def
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/fontlib.rc
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/   (with props)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/
      - copied from r421213, incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/linux/native/X11Wrapper/
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/libX11Wrapper.exp
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile
Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/JPEGDecoder/
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/cmm/
    incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/common/native/gl/
    incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/linux/native/X11Wrapper/
    incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/linux/native/linuxfont/
    incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/windows/native/Win32Wrapper/
    incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/windows/native/fontlib/
    incubator/harmony/enhanced/classlib/trunk/modules/awt_swing_contribution/modules/awt/src/windows/native/gl/
Modified:
    incubator/harmony/enhanced/classlib/trunk/build.xml
    incubator/harmony/enhanced/classlib/trunk/make/build-native.xml
    incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/LinuxNativeFont.c

Modified: incubator/harmony/enhanced/classlib/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/build.xml?rev=421913&r1=421912&r2=421913&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/build.xml Fri Jul 14 07:28:32 2006
@@ -91,14 +91,8 @@
 
         <ant antfile="make/build-test.xml" inheritall="false"
              target="support.jar"/>
-
-        <antcall target="build-awt-swing" />
     </target>
  
-    <target name="build-awt-swing" if="with.awt.swing">
-        <ant antfile="modules/awt_swing_contribution/modules/awt/make/build.xml" inheritall="false" target="build.native" />
-    </target>
-
     <target name="test">
         <echo>
 ========================================

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?rev=421913&r1=421912&r2=421913&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-native.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-native.xml Fri Jul 14 07:28:32 2006
@@ -116,6 +116,7 @@
     	<ant dir="..\modules\luni" antfile="build.xml" target="build.native.secondary" />
         <ant dir="..\modules\nio" antfile="build.xml" target="build.native" />    	
         <ant dir="..\modules\misc" antfile="build.xml" target="build.native" />    	
+        <ant dir="..\modules\awt" antfile="build.xml" target="build.native" />    	
     </target>
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml?rev=421913&r1=421912&r2=421913&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml Fri Jul 14 07:28:32 2006
@@ -38,10 +38,14 @@
 
     <target name="build" depends="compile.java, build.jar" />
 	
-    <target name="copy.native.includes">
+    <target name="copy.native.includes" depends="overlay-oss">
 	<copy todir="${hy.hdk}/include" overwrite="yes">
 	    <fileset dir="${hy.archive.src.main.native}/include/shared">
 		<include name="zipsup.h" />
+	    </fileset>
+	    <fileset dir="${hy.archive.src.main.native}/zlib_dist">
+		<include name="zlib.h" />
+		<include name="zconf.h" />
 	    </fileset>
 	</copy>
     </target>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml?rev=421913&r1=421912&r2=421913&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml Fri Jul 14 07:28:32 2006
@@ -83,6 +83,97 @@
         </jar>
     </target>
 
+    <target name="build.native"
+            depends="-build.native.linux,-build.native.windows"
+            if="with.awt.swing">
+
+        <make dir="${hy.awt.src.main.native}/lcmm/${hy.os}" />
+        <!-- Copy the built shared libs over to the jre/bin dir -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${hy.awt.src.main.native}/lcmm">
+                <patternset includes="*${shlib.suffix}*" />
+            </fileset>
+        </copy>
+
+        <make dir="${hy.awt.src.main.native}/jpegdecoder/${hy.os}" />
+        <!-- Copy the built shared libs over to the jre/bin dir -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${hy.awt.src.main.native}/jpegdecoder">
+                <patternset includes="*${shlib.suffix}*" />
+            </fileset>
+        </copy>
+
+        <make dir="${hy.awt.src.main.native}/gl/${hy.os}" />
+        <!-- Copy the built shared libs over to the jre/bin dir -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${hy.awt.src.main.native}/gl">
+                <patternset includes="*${shlib.suffix}*" />
+            </fileset>
+        </copy>
+
+    </target>
+
+    <target name="-build.native.linux" if="is.linux">
+        <make dir="${hy.awt.src.main.native}/x11wrapper/${hy.os}" />
+        <!-- Copy the built shared libs over to the jre/bin dir -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${hy.awt.src.main.native}/x11wrapper">
+                <patternset includes="*${shlib.suffix}*" />
+            </fileset>
+        </copy>
+
+        <make dir="${hy.awt.src.main.native}/linuxfont/${hy.os}" />
+        <!-- Copy the built shared libs over to the jre/bin dir -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${hy.awt.src.main.native}/linuxfont">
+                <patternset includes="*${shlib.suffix}*" />
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="-build.native.windows" if="is.windows">
+        <make dir="${hy.awt.src.main.native}/win32wrapper/${hy.os}" />
+        <!-- Copy the built shared libs over to the jre/bin dir -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${hy.awt.src.main.native}/win32wrapper">
+                <patternset includes="*${shlib.suffix}*" />
+            </fileset>
+        </copy>
+
+        <make dir="${hy.awt.src.main.native}/winfont/${hy.os}" />
+        <!-- Copy the built shared libs over to the jre/bin dir -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${hy.awt.src.main.native}/winfont">
+                <patternset includes="*${shlib.suffix}*" />
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="clean.native"
+            depends="-clean.native.linux,-clean.native.windows"
+            if="with.awt.swing">
+        <make dir="${hy.awt.src.main.native}/lcmm/${hy.os}"
+              target="clean"/>
+        <make dir="${hy.awt.src.main.native}/jpegdecoder/${hy.os}"
+              target="clean"/>
+        <make dir="${hy.awt.src.main.native}/gl/${hy.os}"
+              target="clean"/>
+    </target>
+
+    <target name="-clean.native.linux" if="is.linux">
+        <make dir="${hy.awt.src.main.native}/x11wrapper/${hy.os}"
+              target="clean"/>
+        <make dir="${hy.awt.src.main.native}/linuxfont/${hy.os}"
+              target="clean"/>
+    </target>
+
+    <target name="-clean.native.windows" if="is.windows">
+        <make dir="${hy.awt.src.main.native}/win32wrapper/${hy.os}"
+              target="clean"/>
+        <make dir="${hy.awt.src.main.native}/winfont/${hy.os}"
+              target="clean"/>
+    </target>
+
     <target name="compile.tests">
         <echo message="Compiling AWT tests" />
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml?rev=421913&r1=421912&r2=421913&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml Fri Jul 14 07:28:32 2006
@@ -20,6 +20,7 @@
       <src>
          <main>
             <java location="src/main/java/common" />
+            <native location="src/main/native" />
             <resources location="src/main/resources" />
          </main>
          <test>

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 14 07:28:32 2006
@@ -0,0 +1,4 @@
+*.dll
+*.map
+*.pdb
+*.so

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 14 07:28:32 2006
@@ -0,0 +1 @@
+libpng.a

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/libgl.exp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/libgl.exp?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/libgl.exp (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/libgl.exp Fri Jul 14 07:28:32 2006
@@ -0,0 +1,20 @@
+HYGL_0.1 {
+    global :
+        Java_org_apache_harmony_awt_gl_image_GifDecoder_decode;
+        Java_org_apache_harmony_awt_gl_image_GifDecoder_initIDs;
+        Java_org_apache_harmony_awt_gl_image_GifDecoder_releaseNativeDecoder;
+        Java_org_apache_harmony_awt_gl_image_GifDecoder_toRGB;
+        Java_org_apache_harmony_awt_gl_image_PngDecoder_decode;
+        Java_org_apache_harmony_awt_gl_image_PngDecoder_initIDs;
+        Java_org_apache_harmony_awt_gl_image_PngDecoder_releaseNativeDecoder;
+        Java_org_apache_harmony_awt_gl_ImageSurface_createStructCCM;
+        Java_org_apache_harmony_awt_gl_ImageSurface_createStructDCM;
+        Java_org_apache_harmony_awt_gl_ImageSurface_createStructICM;
+        Java_org_apache_harmony_awt_gl_ImageSurface_dispose;
+        Java_org_apache_harmony_awt_gl_ImageSurface_setImageSize;
+        Java_org_apache_harmony_awt_gl_render_NativeImageBlitter_bltBG;
+        Java_org_apache_harmony_awt_gl_render_NativeImageBlitter_blt;
+        Java_org_apache_harmony_awt_gl_render_NativeImageBlitter_xor;
+        Java_org_apache_harmony_awt_gl_Surface_initIDs;
+    local : *;
+};

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile Fri Jul 14 07:28:32 2006
@@ -0,0 +1,44 @@
+# Copyright 2006 The Apache Software Foundation or its licensors, as
+# applicable
+# 
+# Licensed 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/makefile.include
+
+PNG_DIR=$(HY_HDK)/../depends/libs/build/png
+
+CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include -I$(PNG_DIR) \
+	  -I../../lcmm/shared
+# TOFIX move Exceptions to common?
+
+BUILDFILES = \
+  $(SHAREDSUB)/blitter.o \
+  $(SHAREDSUB)/gifdecoder.o \
+  $(SHAREDSUB)/LUTTables.o \
+  $(SHAREDSUB)/pngdecoder.o \
+  $(SHAREDSUB)/SurfaceDataStructure.o \
+  ../../lcmm/shared/Exceptions.o \
+  libpng.a
+
+MDLLIBFILES = \
+	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+
+SYSLIBFILES = -lstdc++
+
+DLLNAME=../libgl.so
+
+include $(HY_HDK)/build/make/rules.mk
+
+libpng.a: $(PNG_DIR)/libpng.ia32
+	cp $< $@

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/gl.def
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/gl.def?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/gl.def (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/gl.def Fri Jul 14 07:28:32 2006
@@ -0,0 +1,7 @@
+LIBRARY	GL
+
+SECTIONS
+	.data	READ WRITE
+	.text	EXECUTE READ
+
+EXPORTS

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/gl.rc
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/gl.rc?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/gl.rc (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/gl.rc Fri Jul 14 07:28:32 2006
@@ -0,0 +1,47 @@
+;
+; Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+; 
+; Licensed 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 <windows.h>
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,1,0,0
+ PRODUCTVERSION 0,1,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L
+BEGIN
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE "CompanyName", "The Apache Software Foundation.\0"
+			VALUE "FileDescription", "Win32 GL native code\0"
+			VALUE "FileVersion", "0.1\0"
+			VALUE "InternalName", "gl\0"
+			VALUE "LegalCopyright", "(c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable.\0"
+			VALUE "OriginalFilename", "gl.dll\0"
+			VALUE "ProductName", "Apache Harmony\0"
+			VALUE "ProductVersion", "0.1\0"
+		END
+	END
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x0409, 1200
+	END
+END

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile Fri Jul 14 07:28:32 2006
@@ -0,0 +1,61 @@
+# Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+# 
+# Licensed 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\defines.mak>
+
+PNG_DIR=$(HY_HDK)\..\depends\libs\build\png\# avoid continuation
+
+LIBBASE=gl
+DLLNAME=..\$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
+
+# TOFIX: fix warning so we can use default HYCFLAGS
+# That is:
+# HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)include /I$(SHAREDSUB) \
+#            /I$(PNG_DIR) /I..\..\lcmm\shared /Iinclude
+# Need WINVER=0x0500 to get HMONITOR defined.
+HYCFLAGS = \
+  -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
+  -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0500 \
+  $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
+  /I$(SHAREDSUB)include /I$(SHAREDSUB) \
+  /I$(PNG_DIR) /I..\..\lcmm\shared /Iinclude
+
+BUILDFILES = \
+  BitmapSurface.obj \
+  GDIBlitter.obj \
+  WinGDIPGraphics2D.obj \
+  WinGraphicsEnvironment.obj \
+  WinThemeGraphics.obj \
+  $(SHAREDSUB)blitter.obj \
+  $(SHAREDSUB)gifdecoder.obj \
+  $(SHAREDSUB)LUTTables.obj \
+  $(SHAREDSUB)pngdecoder.obj \
+  $(SHAREDSUB)SurfaceDataStructure.obj \
+  ..\..\lcmm\shared\Exceptions.obj
+
+VIRTFILES = $(LIBBASE).res
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib \
+              Msimg32.lib gdiplus.lib User32.lib uxTheme.lib 
+
+MDLLIBFILES = \
+  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
+  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib \
+  $(LIBPATH)hyzlib.lib $(PNG_DIR)libpng.lib
+
+DLLBASE=0x13300000
+COMMENT=/comment:"GL native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."
+
+!include <$(HY_HDK)\build\make\rules.mak>

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 14 07:28:32 2006
@@ -0,0 +1,4 @@
+*.dll
+*.map
+*.pdb
+*.so

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 14 07:28:32 2006
@@ -0,0 +1 @@
+libjpeg.a

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/libjpegdecoder.exp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/libjpegdecoder.exp?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/libjpegdecoder.exp (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/libjpegdecoder.exp Fri Jul 14 07:28:32 2006
@@ -0,0 +1,7 @@
+HYJPEGDECODER_0.1 {
+    global :
+        Java_org_apache_harmony_awt_gl_image_JpegDecoder_decode;
+        Java_org_apache_harmony_awt_gl_image_JpegDecoder_initIDs;
+        Java_org_apache_harmony_awt_gl_image_JpegDecoder_releaseNativeDecoder;
+    local : *;
+};

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile Fri Jul 14 07:28:32 2006
@@ -0,0 +1,43 @@
+# Copyright 2006 The Apache Software Foundation or its licensors, as
+# applicable
+# 
+# Licensed 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/makefile.include
+
+JPEG_DIR=$(HY_HDK)/../depends/libs/build/jpeg/
+
+CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include -I$(JPEG_DIR) \
+	  -I../../lcmm/shared
+# TOFIX move Exceptions to common?
+
+BUILDFILES = \
+  $(SHAREDSUB)/JpegDecoder.o \
+  ../../lcmm/shared/Exceptions.o \
+  libjpeg.a
+
+MDLLIBFILES = \
+	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+
+DLLNAME=../libjpegdecoder.so
+
+include $(HY_HDK)/build/make/rules.mk
+
+$(SHAREDSUB)JpegDecoder.o: jconfig.h
+
+jconfig.h: $(JPEG_DIR)jconfig.lnx
+	cp $< $@
+
+libjpeg.a: $(JPEG_DIR)libjpeg.ia32
+	cp $< $@

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/jpegdecoder.def
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/jpegdecoder.def?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/jpegdecoder.def (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/jpegdecoder.def Fri Jul 14 07:28:32 2006
@@ -0,0 +1,7 @@
+LIBRARY	JPEGDECODER
+
+SECTIONS
+	.data	READ WRITE
+	.text	EXECUTE READ
+
+EXPORTS

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/jpegdecoder.rc
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/jpegdecoder.rc?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/jpegdecoder.rc (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/jpegdecoder.rc Fri Jul 14 07:28:32 2006
@@ -0,0 +1,47 @@
+;
+; Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+; 
+; Licensed 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 <windows.h>
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,1,0,0
+ PRODUCTVERSION 0,1,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L
+BEGIN
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE "CompanyName", "The Apache Software Foundation.\0"
+			VALUE "FileDescription", "JPEG decoder native code\0"
+			VALUE "FileVersion", "0.1\0"
+			VALUE "InternalName", "jpegdecoder\0"
+			VALUE "LegalCopyright", "(c) Copyright 2006 The Apache Software Foundation or its licensors, as applicable.\0"
+			VALUE "OriginalFilename", "jpegdecoder.dll\0"
+			VALUE "ProductName", "Apache Harmony\0"
+			VALUE "ProductVersion", "0.1\0"
+		END
+	END
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x0409, 1200
+	END
+END

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile Fri Jul 14 07:28:32 2006
@@ -0,0 +1,53 @@
+# Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+# 
+# Licensed 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\defines.mak>
+
+JPEG_DIR=$(HY_HDK)\..\depends\libs\build\jpeg\# avoid continuation
+
+LIBBASE=jpegdecoder
+DLLNAME=..\$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
+
+# TOFIX: fix warning so we can use default HYCFLAGS
+# That is:
+# HYCFLAGS = $(HYCFLAGS) -I$(SHAREDSUB)\include \
+#            -I$(JPEG_DIR) -I..\..\lcmm\shared
+HYCFLAGS = \
+  -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
+  -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0400 \
+  $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
+  -I$(SHAREDSUB)\include -I$(JPEG_DIR) -I..\..\lcmm\shared
+
+BUILDFILES = \
+  $(SHAREDSUB)JpegDecoder.obj \
+  ..\..\lcmm\shared\Exceptions.obj
+
+VIRTFILES = $(LIBBASE).res
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib
+
+MDLLIBFILES = \
+  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
+  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib $(JPEG_DIR)libjpeg.lib
+
+DLLBASE=0x13300000
+COMMENT=/comment:"JPEGDECODER native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."
+
+!include <$(HY_HDK)\build\make\rules.mak>
+
+$(SHAREDSUB)JpegDecoder.obj: jconfig.h
+
+jconfig.h: $(JPEG_DIR)jconfig.vc
+	copy $(JPEG_DIR)jconfig.vc $@

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 14 07:28:32 2006
@@ -0,0 +1,4 @@
+*.dll
+*.map
+*.pdb
+*.so

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 14 07:28:32 2006
@@ -0,0 +1 @@
+liblcms.a

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/liblcmm.exp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/liblcmm.exp?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/liblcmm.exp (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/liblcmm.exp Fri Jul 14 07:28:32 2006
@@ -0,0 +1,15 @@
+HYLCMM_0.1 {
+    global :
+        Java_org_apache_harmony_awt_gl_color_NativeCMM_cmmCloseProfile;
+        Java_org_apache_harmony_awt_gl_color_NativeCMM_cmmCreateMultiprofileTransform;
+        Java_org_apache_harmony_awt_gl_color_NativeCMM_cmmDeleteTransform;
+        Java_org_apache_harmony_awt_gl_color_NativeCMM_cmmGetProfile;
+        Java_org_apache_harmony_awt_gl_color_NativeCMM_cmmGetProfileElement;
+        Java_org_apache_harmony_awt_gl_color_NativeCMM_cmmGetProfileElementSize;
+        Java_org_apache_harmony_awt_gl_color_NativeCMM_cmmGetProfileSize;
+        Java_org_apache_harmony_awt_gl_color_NativeCMM_cmmOpenProfile;
+        Java_org_apache_harmony_awt_gl_color_NativeCMM_cmmSetProfileElement;
+        Java_org_apache_harmony_awt_gl_color_NativeCMM_cmmTranslateColors;
+        Java_org_apache_harmony_awt_gl_color_NativeImageFormat_initIDs;
+    local : *;
+};

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile Fri Jul 14 07:28:32 2006
@@ -0,0 +1,41 @@
+# Copyright 2006 The Apache Software Foundation or its licensors, as
+# applicable
+# 
+# Licensed 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/makefile.include
+
+LCMS_DIR=$(HY_HDK)/../depends/libs/build/lcms
+
+CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include -I$(LCMS_DIR)
+
+# TOFIX move Exceptions to common?
+BUILDFILES = \
+  $(SHAREDSUB)/cmmerror.o \
+  $(SHAREDSUB)/cmmio.o \
+  $(SHAREDSUB)/cmmxforms.o \
+  $(SHAREDSUB)/Exceptions.o \
+  $(SHAREDSUB)/NativeCMM.o \
+  $(SHAREDSUB)/NativeImageFormat.o \
+  liblcms.a
+
+MDLLIBFILES = \
+	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+
+DLLNAME=../liblcmm.so
+
+include $(HY_HDK)/build/make/rules.mk
+
+liblcms.a: $(LCMS_DIR)/liblcms.ia32
+	cp $< $@

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/lcmm.def
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/lcmm.def?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/lcmm.def (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/lcmm.def Fri Jul 14 07:28:32 2006
@@ -0,0 +1,7 @@
+LIBRARY	LCMM
+
+SECTIONS
+	.data	READ WRITE
+	.text	EXECUTE READ
+
+EXPORTS

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/lcmm.rc
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/lcmm.rc?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/lcmm.rc (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/lcmm.rc Fri Jul 14 07:28:32 2006
@@ -0,0 +1,47 @@
+;
+; Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+; 
+; Licensed 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 <windows.h>
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,1,0,0
+ PRODUCTVERSION 0,1,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L
+BEGIN
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE "CompanyName", "The Apache Software Foundation.\0"
+			VALUE "FileDescription", "LCMM Wrapper native code\0"
+			VALUE "FileVersion", "0.1\0"
+			VALUE "InternalName", "lcmm\0"
+			VALUE "LegalCopyright", "(c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable.\0"
+			VALUE "OriginalFilename", "lcmm.dll\0"
+			VALUE "ProductName", "Apache Harmony\0"
+			VALUE "ProductVersion", "0.1\0"
+		END
+	END
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x0409, 1200
+	END
+END

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile Fri Jul 14 07:28:32 2006
@@ -0,0 +1,51 @@
+# Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+# 
+# Licensed 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\defines.mak>
+
+LCMS_DIR=$(HY_HDK)\..\depends\libs\build\lcms\# comment to avoid continuation
+
+LIBBASE=lcmm
+DLLNAME=..\$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
+
+# TOFIX: fix warns and use default flags.  That is:
+# HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(LCMS_DIR) /I$(SHAREDSUB)include
+
+HYCFLAGS = \
+  -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
+  -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0400 \
+  $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
+  /I$(SHAREDSUB) /I$(LCMS_DIR) /I$(SHAREDSUB)include
+
+BUILDFILES = \
+  $(SHAREDSUB)cmmerror.obj \
+  $(SHAREDSUB)cmmio.obj \
+  $(SHAREDSUB)cmmxforms.obj \
+  $(SHAREDSUB)Exceptions.obj \
+  $(SHAREDSUB)NativeCMM.obj \
+  $(SHAREDSUB)NativeImageFormat.obj
+
+VIRTFILES = $(LIBBASE).res
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib
+
+MDLLIBFILES = \
+  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
+  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib $(LCMS_DIR)lcms114.lib
+
+DLLBASE=0x13300000
+COMMENT=/comment:"LCMM Wrapper native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."
+
+!include <$(HY_HDK)\build\make\rules.mak>

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 14 07:28:32 2006
@@ -0,0 +1,4 @@
+*.dll
+*.map
+*.pdb
+*.so

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/LinuxNativeFont.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/LinuxNativeFont.c?rev=421913&r1=421213&r2=421913&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/LinuxNativeFont.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/LinuxNativeFont.c Fri Jul 14 07:28:32 2006
@@ -22,10 +22,10 @@
  * 
  */
 #include <X11/Xft/Xft.h>
-#include <tttables.h>
-#include <t1tables.h>
-#include <tttypes.h>
-#include <ftsnames.h>
+#include <freetype/tttables.h>
+#include <freetype/t1tables.h>
+#include <freetype/internal/tttypes.h>
+#include <freetype/ftsnames.h>
 
 #include <stdio.h>
 #include <stdlib.h>

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/liblinuxfont.exp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/liblinuxfont.exp?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/liblinuxfont.exp (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/liblinuxfont.exp Fri Jul 14 07:28:32 2006
@@ -0,0 +1,30 @@
+HYLINUXFONT_0.1 {
+	global :
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_canDisplayCharNative;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_createXftDrawNative;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_drawStringNative;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_embedFontNative;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_freeXftDrawNative;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_getFamilyNative;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_getFontFamiliesNames;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_getFontNameNative;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_getFontPSNameNative;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_getFonts;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_getGlyphCodeNative;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_getGlyphCodesNative;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_getGlyphInfoNative;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_getGlyphOutline;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_getGlyphPxlInfoNative;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_getItalicAngleNative;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_getNativeLineMetrics;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_getNumGlyphsNative;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_initializeFont;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_initializeFontFromFP;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_NativeInitGlyphBitmap;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_NativeInitGlyphImage;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_pFontFree;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_RemoveFontResource;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_XftDrawSetClipRectangles;
+		Java_org_apache_harmony_awt_gl_font_LinuxNativeFont_xftDrawSetSubwindowModeNative;
+	local : *;
+};

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile Fri Jul 14 07:28:32 2006
@@ -0,0 +1,32 @@
+# Copyright 2006 The Apache Software Foundation or its licensors, as
+# applicable
+# 
+# Licensed 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/makefile.include
+
+CFLAGS += -fpic -I$(SHARED)common \
+	  -I/usr/X11R6/include -I/usr/include/freetype2 \
+	  -Iinclude # TOFIX move includes
+
+BUILDFILES = Exceptions.o LinuxNativeFont.o
+
+MDLLIBFILES = \
+	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+
+SYSLIBFILES = -L/usr/X11R6/lib -lX11 -lXft
+
+DLLNAME=../liblinuxfont.so
+
+include $(HY_HDK)/build/make/rules.mk

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 14 07:28:32 2006
@@ -0,0 +1,4 @@
+*.dll
+*.map
+*.pdb
+*.so

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/Win32Wrapper.def
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/Win32Wrapper.def?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/Win32Wrapper.def (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/Win32Wrapper.def Fri Jul 14 07:28:32 2006
@@ -0,0 +1,7 @@
+LIBRARY	WIN32WRAPPER
+
+SECTIONS
+	.data	READ WRITE
+	.text	EXECUTE READ
+
+EXPORTS

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/Win32Wrapper.rc
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/Win32Wrapper.rc?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/Win32Wrapper.rc (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/Win32Wrapper.rc Fri Jul 14 07:28:32 2006
@@ -0,0 +1,47 @@
+;
+; Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+; 
+; Licensed 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 <windows.h>
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,1,0,0
+ PRODUCTVERSION 0,1,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L
+BEGIN
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE "CompanyName", "The Apache Software Foundation.\0"
+			VALUE "FileDescription", "Win32 Wrapper native code\0"
+			VALUE "FileVersion", "0.1\0"
+			VALUE "InternalName", "win32wrapper\0"
+			VALUE "LegalCopyright", "(c) Copyright 2006 The Apache Software Foundation or its licensors, as applicable.\0"
+			VALUE "OriginalFilename", "Win32Wrapper.dll\0"
+			VALUE "ProductName", "Apache Harmony\0"
+			VALUE "ProductVersion", "0.1\0"
+		END
+	END
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x0409, 1200
+	END
+END

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile Fri Jul 14 07:28:32 2006
@@ -0,0 +1,43 @@
+# Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+# 
+# Licensed 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\defines.mak>
+
+LIBBASE=Win32Wrapper
+DLLNAME=..\$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
+
+# TOFIX: fix warning so we can use default HYCFLAGS
+# That is:  HYCFLAGS = $(HYCFLAGS)
+HYCFLAGS = \
+  -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
+  -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0400 \
+  $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I.
+
+BUILDFILES = \
+  Callback.obj \
+  org_apache_harmony_awt_nativebridge_windows_Win32.obj
+
+VIRTFILES = $(LIBBASE).res
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib
+
+MDLLIBFILES = \
+  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
+  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib 
+
+DLLBASE=0x13300000
+COMMENT=/comment:"Win32 Wrapper native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."
+
+!include <$(HY_HDK)\build\make\rules.mak>

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 14 07:28:32 2006
@@ -0,0 +1,4 @@
+*.dll
+*.map
+*.pdb
+*.so

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/fontlib.def
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/fontlib.def?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/fontlib.def (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/fontlib.def Fri Jul 14 07:28:32 2006
@@ -0,0 +1,7 @@
+LIBRARY	FONTLIB
+
+SECTIONS
+	.data	READ WRITE
+	.text	EXECUTE READ
+
+EXPORTS

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/fontlib.rc
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/fontlib.rc?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/fontlib.rc (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/fontlib.rc Fri Jul 14 07:28:32 2006
@@ -0,0 +1,47 @@
+;
+; Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+; 
+; Licensed 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 <windows.h>
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,1,0,0
+ PRODUCTVERSION 0,1,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L
+BEGIN
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE "CompanyName", "The Apache Software Foundation.\0"
+			VALUE "FileDescription", "Win32 Font native code\0"
+			VALUE "FileVersion", "0.1\0"
+			VALUE "InternalName", "fontlib\0"
+			VALUE "LegalCopyright", "(c) Copyright 2006 The Apache Software Foundation or its licensors, as applicable.\0"
+			VALUE "OriginalFilename", "fontlib.dll\0"
+			VALUE "ProductName", "Apache Harmony\0"
+			VALUE "ProductVersion", "0.1\0"
+		END
+	END
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x0409, 1200
+	END
+END

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile Fri Jul 14 07:28:32 2006
@@ -0,0 +1,44 @@
+# Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+# 
+# Licensed 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\defines.mak>
+
+LIBBASE=fontlib
+DLLNAME=..\$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
+
+# TOFIX: fix warning so we can use default HYCFLAGS -WX
+HYCFLAGS = \
+  -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
+  -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0501 -D_WINSOCKAPI_ -DWINVER=0x0400 \
+  $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
+  /Iinclude /I..\..\gl\windows\include \
+  -DUNICODE -D_UNICODE
+
+BUILDFILES = \
+  Exceptions.obj \
+  winFont.obj
+
+VIRTFILES = $(LIBBASE).res
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib gdi32.lib GdiPlus.lib advapi32.lib
+
+MDLLIBFILES = \
+  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
+  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib 
+
+DLLBASE=0x13300000
+COMMENT=/comment:"Win32 Font native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."
+
+!include <$(HY_HDK)\build\make\rules.mak>

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 14 07:28:32 2006
@@ -0,0 +1,4 @@
+*.dll
+*.map
+*.pdb
+*.so

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/libX11Wrapper.exp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/libX11Wrapper.exp?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/libX11Wrapper.exp (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/libX11Wrapper.exp Fri Jul 14 07:28:32 2006
@@ -0,0 +1,134 @@
+HYX11WRAPPER_0.1 {
+	global :
+		Java_org_apache_harmony_awt_nativebridge_linux_ErrorHandler_getInfo;
+		Java_org_apache_harmony_awt_nativebridge_linux_ErrorHandler_isError;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_init;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_proxycall0;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_proxycall1;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_proxycall2;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_proxycall3;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_proxycall4;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_proxycall5;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_proxycall6;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XAllocColor;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XAllocSizeHints;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XAllocWMHints;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XAllPlanes;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XBitmapPad;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XChangeGC;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XChangeProperty;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XChangeWindowAttributes;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XCheckTypedEvent;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XCloseDisplay;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XConvertSelection;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XCopyArea;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XCreateBitmapFromData;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XCreateFontCursor;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XCreateGC;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XCreateImage;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XCreatePixmap;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XCreatePixmapCursor;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XCreateSimpleWindow;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XCreateWindow;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDefaultColormap;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDefaultDepth;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDefaultRootWindow;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDefaultScreen;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDefaultVisual;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDefineCursor;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDeleteProperty;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDestroyImage;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDestroyWindow;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDisplayHeight;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDisplayHeightMM;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDisplayString;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDisplayWidth;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDisplayWidthMM;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDrawArc;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDrawLine;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDrawLines;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XDrawRectangle;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XFillArc;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XFillPolygon;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XFillRectangle;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XFillRectangles;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XFlush;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XFree;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XFreeCursor;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XFreeGC;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XFreePixmap;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XGetAtomName;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XGetGeometry;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XGetImage;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XGetInputFocus;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XGetPointerMapping;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XGetSelectionOwner;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XGetSubImage;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XGetVisualInfo;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XGetWindowAttributes;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XGetWindowProperty;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XGetWMHints;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XGetWMNormalHints;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XGrabPointer;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XGrabServer;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XIconifyWindow;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XImageByteOrder;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XInitImage;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XInternAtom;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XKeycodeToKeysym;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XKeysymToKeycode;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XLookupString;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XLowerWindow;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XMapRaised;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XMapWindow;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XMoveWindow;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XNextEvent;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XOpenDisplay;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XParseColor;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XPending;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XPutImage;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XQueryBestCursor;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XQueryColor;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XQueryColors;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XQueryPointer;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XQueryTree;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XRaiseWindow;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XResizeWindow;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XRestackWindows;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XRootWindow;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XScreenCount;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XScreenOfDisplay;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSelectInput;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSendEvent;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSetClipMask;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSetClipOrigin;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSetClipRectangles;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSetDashes;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSetErrorHandler;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSetFillRule;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSetForeground;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSetFunction;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSetIconName;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSetInputFocus;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSetSelectionOwner;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSetStandardProperties;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSetTransientForHint;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSetWMHints;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSetWMNormalHints;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XSetWMProtocols;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XStoreName;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XTestFakeButtonEvent;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XTestFakeKeyEvent;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XTestFakeMotionEvent;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XTestQueryExtension;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XTranslateCoordinates;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XUngrabPointer;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XUngrabServer;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XVisualIDFromVisual;
+		Java_org_apache_harmony_awt_nativebridge_linux_X11_XWithdrawWindow;
+		Java_org_apache_harmony_awt_nativebridge_linux_Xft_init;
+		Java_org_apache_harmony_awt_nativebridge_linux_Xft_XftDrawDestroy;
+		Java_org_apache_harmony_awt_nativebridge_linux_Xft_XftDrawSetClip;
+		Java_org_apache_harmony_awt_nativebridge_linux_Xft_XftDrawSetClipRectangles;
+	local : *;
+};

Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile?rev=421913&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile Fri Jul 14 07:28:32 2006
@@ -0,0 +1,33 @@
+# Copyright 2006 The Apache Software Foundation or its licensors, as
+# applicable
+# 
+# Licensed 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/makefile.include
+
+CFLAGS += -fpic -I$(SHARED)common -I/usr/X11R6/include
+
+BUILDFILES = \
+  org_apache_harmony_awt_nativebridge_linux_ErrorHandler.o \
+  org_apache_harmony_awt_nativebridge_linux_X11.o \
+  org_apache_harmony_awt_nativebridge_linux_Xft.o
+
+MDLLIBFILES = \
+	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+
+SYSLIBFILES = -lstdc++ -L/usr/X11R6/lib -lX11
+
+DLLNAME=../libX11Wrapper.so
+
+include $(HY_HDK)/build/make/rules.mk



Mime
View raw message