harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r451199 - in /incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native: gl/windows/ jpegdecoder/windows/ lcmm/windows/ linuxfont/linux/ win32wrapper/windows/ winfont/windows/ x11wrapper/linux/
Date Fri, 29 Sep 2006 09:40:43 GMT
Author: hindessm
Date: Fri Sep 29 02:40:43 2006
New Revision: 451199

URL: http://svn.apache.org/viewvc?view=rev&rev=451199
Log:
Fixed eol style so that I the re-licensing script can work.

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/gl.rc   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/jpegdecoder.rc   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/lcmm.rc   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/Win32Wrapper.rc   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/fontlib.rc   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile   (contents, props changed)

Modified: 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?view=diff&rev=451199&r1=451198&r2=451199
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/gl.rc (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/gl.rc Fri Sep 29 02:40:43 2006
@@ -1,47 +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
+;
+; 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

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/gl.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 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?view=diff&rev=451199&r1=451198&r2=451199
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile Fri Sep 29 02:40:43 2006
@@ -1,60 +1,60 @@
-# 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) /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) /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 \
-
-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>
+# 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) /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) /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 \
+
+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/gl/windows/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 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?view=diff&rev=451199&r1=451198&r2=451199
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/jpegdecoder.rc (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/jpegdecoder.rc Fri Sep 29 02:40:43 2006
@@ -1,47 +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
+;
+; 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

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/jpegdecoder.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 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?view=diff&rev=451199&r1=451198&r2=451199
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile Fri Sep 29 02:40:43 2006
@@ -1,50 +1,50 @@
-# 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)
-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)
-
-BUILDFILES = $(SHAREDSUB)JpegDecoder.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 $@
+# 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)
+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)
+
+BUILDFILES = $(SHAREDSUB)JpegDecoder.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/jpegdecoder/windows/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 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?view=diff&rev=451199&r1=451198&r2=451199
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/lcmm.rc (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/lcmm.rc Fri Sep 29 02:40:43 2006
@@ -1,47 +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
+;
+; 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

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/lcmm.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 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?view=diff&rev=451199&r1=451198&r2=451199
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile Fri Sep 29 02:40:43 2006
@@ -1,50 +1,50 @@
-# 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)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>
+# 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)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/lcmm/windows/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 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?view=diff&rev=451199&r1=451198&r2=451199
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile Fri Sep 29 02:40:43 2006
@@ -1,37 +1,37 @@
-# 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 = 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
-
-ifeq ($(HY_ARCH),x86_64)
- SYSLIBFILES = -L/usr/X11R6/lib64 -lX11 -lXft
-endif
-ifeq ($(HY_ARCH),x86)
- SYSLIBFILES = -L/usr/X11R6/lib -lX11 -lXft
-endif
-
-DLLNAME=../liblinuxfont.so
-
-include $(HY_HDK)/build/make/rules.mk
+# 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 = 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
+
+ifeq ($(HY_ARCH),x86_64)
+ SYSLIBFILES = -L/usr/X11R6/lib64 -lX11 -lXft
+endif
+ifeq ($(HY_ARCH),x86)
+ SYSLIBFILES = -L/usr/X11R6/lib -lX11 -lXft
+endif
+
+DLLNAME=../liblinuxfont.so
+
+include $(HY_HDK)/build/make/rules.mk

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 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?view=diff&rev=451199&r1=451198&r2=451199
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/Win32Wrapper.rc (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/Win32Wrapper.rc Fri Sep 29 02:40:43 2006
@@ -1,47 +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
+;
+; 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

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/Win32Wrapper.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 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?view=diff&rev=451199&r1=451198&r2=451199
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile Fri Sep 29 02:40:43 2006
@@ -1,45 +1,45 @@
-# 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 \
-  WinDataTransfer.obj \
-  WinManagement.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>
+# 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 \
+  WinDataTransfer.obj \
+  WinManagement.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/win32wrapper/windows/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 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?view=diff&rev=451199&r1=451198&r2=451199
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/fontlib.rc (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/fontlib.rc Fri Sep 29 02:40:43 2006
@@ -1,47 +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
+;
+; 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

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/fontlib.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 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?view=diff&rev=451199&r1=451198&r2=451199
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile Fri Sep 29 02:40:43 2006
@@ -1,42 +1,42 @@
-# 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 = 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>
+# 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 = 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/winfont/windows/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 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?view=diff&rev=451199&r1=451198&r2=451199
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile Fri Sep 29 02:40:43 2006
@@ -1,39 +1,39 @@
-# 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_GLX.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
-
-ifeq ($(HY_ARCH),x86_64)
- SYSLIBFILES = -lstdc++ -L/usr/X11R6/lib64 -lX11
-endif
-ifeq ($(HY_ARCH),x86)
- SYSLIBFILES = -lstdc++ -L/usr/X11R6/lib -lX11
-endif
-
-DLLNAME=../libX11Wrapper.so
-
-include $(HY_HDK)/build/make/rules.mk
+# 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_GLX.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
+
+ifeq ($(HY_ARCH),x86_64)
+ SYSLIBFILES = -lstdc++ -L/usr/X11R6/lib64 -lX11
+endif
+ifeq ($(HY_ARCH),x86)
+ SYSLIBFILES = -lstdc++ -L/usr/X11R6/lib -lX11
+endif
+
+DLLNAME=../libX11Wrapper.so
+
+include $(HY_HDK)/build/make/rules.mk

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message