You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/11/10 16:49:33 UTC
svn commit: r1033539 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/modules/nio_char/src/main/native/niochar/unix/makefile classlib/modules/nio_char/src/main/native/niochar/windows/makefile drlvm/ jdktools/

Author: hindessm
Date: Wed Nov 10 15:49:32 2010
New Revision: 1033539

URL: http://svn.apache.org/viewvc?rev=1033539&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@1029853:

  r1029853 | hindessm | 2010-11-01 21:40:37 +0000 (Mon, 01 Nov 2010) | 3 lines
  
  Adding native code that for some reason has been missing since the code
  was contributed.
  

Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/modules/nio_char/src/main/native/niochar/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/nio_char/src/main/native/niochar/windows/makefile
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 15:49:32 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-1029636,1029773
+/harmony/enhanced/java/trunk:929253-1029636,1029773,1029853
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 15:49:32 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-1029636,1029773
+/harmony/enhanced/java/trunk/classlib:929253-1029636,1029773,1029853
 /harmony/enhanced/trunk/classlib:476395-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/classlib:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 15:49:32 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-1029636,1029773
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-1029636,1029773,1029853
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/modules/nio_char/src/main/native/niochar/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/nio_char/src/main/native/niochar/unix/makefile?rev=1033539&r1=1033538&r2=1033539&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/nio_char/src/main/native/niochar/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/nio_char/src/main/native/niochar/unix/makefile Wed Nov 10 15:49:32 2010
@@ -40,7 +40,7 @@ BUILDFILES += IBM00858.o IBM01140.o IBM0
   x_IBM1123.o x_IBM1124.o x_IBM737.o x_IBM856.o x_IBM874.o x_IBM875.o \
   x_IBM922.o x_MacCyrillic.o x_MacGreek.o x_MacTurkish.o Big5.o Big5_HKSCS.o \
   EUC_KR.o GB2312.o GBK.o GB18030.o windows_31j.o x_MS950_HKSCS.o \
-  x_windows_949.o
+  x_windows_949.o TIS_620.o JIS_X0201.o
 
 DLLNAME = $(DLLPATH)libhyniochar$(HY_SHLIB_SUFFIX)
 MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)

Modified: harmony/enhanced/java/branches/java6/classlib/modules/nio_char/src/main/native/niochar/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/nio_char/src/main/native/niochar/windows/makefile?rev=1033539&r1=1033538&r2=1033539&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/nio_char/src/main/native/niochar/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/nio_char/src/main/native/niochar/windows/makefile Wed Nov 10 15:49:32 2010
@@ -116,7 +116,9 @@ BUILDFILES = \
   $(HY_BIN)GB18030.obj \
   $(HY_BIN)windows_31j.obj \
   $(HY_BIN)x_MS950_HKSCS.obj \
-  $(HY_BIN)x_windows_949.obj 
+  $(HY_BIN)x_windows_949.obj \
+  $(HY_BIN)TIS_620.obj \
+  $(HY_BIN)JIS_X0201.obj
 
 VIRTFILES = hynio_char.res
 

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 15:49:32 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-1029636,1029773
+/harmony/enhanced/java/trunk/drlvm:929253-1029636,1029773,1029853
 /harmony/enhanced/trunk/drlvm:476395-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/drlvm:292550-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 15:49:32 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-1029636,1029773
+/harmony/enhanced/java/trunk/jdktools:929253-1029636,1029773,1029853
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147