You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2008/09/17 21:50:45 UTC
svn commit: r696414 - in
/harmony/enhanced/classlib/trunk/modules/nio_char/src/main:
java/org/apache/harmony/niochar/ native/niochar/unix/ native/niochar/windows/
Author: tellison
Date: Wed Sep 17 12:50:44 2008
New Revision: 696414
URL: http://svn.apache.org/viewvc?rev=696414&view=rev
Log:
Rename NIO_CHAR natives library (from hycharset to hyniochar) in keeping with other modules naming convention.
Added:
harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/hyniochar.def (props changed)
- copied unchanged from r696262, harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/hycharset.def
Removed:
harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/hycharset.def
Modified:
harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java
harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/unix/makefile
harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/hynio_char.rc
harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/makefile
Modified: harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java?rev=696414&r1=696413&r2=696414&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java Wed Sep 17 12:50:44 2008
@@ -52,7 +52,7 @@
static {
try {
- System.loadLibrary("hycharset"); //$NON-NLS-1$
+ System.loadLibrary("hyniochar"); //$NON-NLS-1$
HAS_LOADED_NATIVES = true;
} catch (UnsatisfiedLinkError e) {
// Ignore - leave as natives unavailable.
Modified: harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/unix/makefile?rev=696414&r1=696413&r2=696414&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/unix/makefile Wed Sep 17 12:50:44 2008
@@ -115,7 +115,7 @@
../shared/additional/x_windows_949.o
-DLLNAME = ../libhycharset.so
+DLLNAME = ../libhyniochar.so
MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
Modified: harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/hynio_char.rc
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/hynio_char.rc?rev=696414&r1=696413&r2=696414&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/hynio_char.rc (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/hynio_char.rc Wed Sep 17 12:50:44 2008
@@ -32,11 +32,11 @@
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "The Apache Software Foundation.\0"
- VALUE "FileDescription", "Charsets native code\0"
+ VALUE "FileDescription", "NIO charsets native code\0"
VALUE "FileVersion", "0.1\0"
VALUE "InternalName", "nio_char\0"
- VALUE "LegalCopyright", "(c) Copyright 1991, 2005 The Apache Software Foundation or its licensors, as applicable.\0"
- VALUE "OriginalFilename", "hycharset.dll\0"
+ VALUE "LegalCopyright", "(c) Copyright 1991, 2008 The Apache Software Foundation or its licensors, as applicable.\0"
+ VALUE "OriginalFilename", "hyniochar.dll\0"
VALUE "ProductName", "Apache Harmony\0"
VALUE "ProductVersion", "0.1\0"
END
Propchange: harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/hyniochar.def
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/makefile?rev=696414&r1=696413&r2=696414&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/makefile Wed Sep 17 12:50:44 2008
@@ -19,7 +19,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
-LIBBASE=hycharset
+LIBBASE=hyniochar
DLLNAME=..\$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I$(SHARED)fdlibm
@@ -121,6 +121,6 @@
DLLBASE=0x13200000
-COMMENT=/comment:"nio_char component native code. (c) Copyright 1991, 2005 The Apache Software Foundation or its licensors, as applicable."
+COMMENT=/comment:"nio_char component native code. (c) Copyright 1991, 2008 The Apache Software Foundation or its licensors, as applicable."
!include <$(HY_HDK)\build\make\rules.mak>