harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r430036 - in /incubator/harmony/enhanced/classlib/trunk: depends/build/ make/ modules/archive/src/main/native/zip/linux/ modules/awt/src/main/native/linuxfont/linux/ modules/awt/src/main/native/x11wrapper/linux/ modules/luni/src/main/native...
Date Wed, 09 Aug 2006 12:04:03 GMT
Author: mloenko
Date: Wed Aug  9 05:04:02 2006
New Revision: 430036

URL: http://svn.apache.org/viewvc?rev=430036&view=rev
Log:
Roll back 430015: (patch for HARMONY-1005)

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/linux/thrhelp.s
      - copied unchanged from r430014, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/linux/thrhelp.s
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/linux/thrspinlock.s
      - copied unchanged from r430014, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/linux/thrspinlock.s
Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/linux/x86/
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/linux/x86_64/
Modified:
    incubator/harmony/enhanced/classlib/trunk/depends/build/makefile.include
    incubator/harmony/enhanced/classlib/trunk/make/properties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hycomp.h
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/OSFileSystemLinux32.c
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/OSMemoryLinux32.c
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/linux/hysignal.c
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/linux/hyvmem.c
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/depends/build/makefile.include
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/depends/build/makefile.include?rev=430036&r1=430035&r2=430036&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/depends/build/makefile.include (original)
+++ incubator/harmony/enhanced/classlib/trunk/depends/build/makefile.include Wed Aug  9 05:04:02
2006
@@ -28,5 +28,5 @@
 DLLPATH=$(HY_HDK)/jdk/jre/bin/
 SHAREDSUB=../shared/
 
-CFLAGS = -O1 -fpic -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT \
-         -D$(HY_ARCH_DEFINE) $(VMDEBUG) -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
+CFLAGS = -O1 -march=pentium3 -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT \
+         -DHYX86 $(VMDEBUG) -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)

Modified: incubator/harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?rev=430036&r1=430035&r2=430036&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Wed Aug  9 05:04:02 2006
@@ -55,7 +55,7 @@
 
     <!-- Conditions for different architectures -->
     <condition property="is.x86_64">
-        <equals arg1="x86_64" arg2="${os.arch}"/>
+        <os arch="x86_64"/>
     </condition>
     <condition property="is.x86">
         <or>
@@ -69,13 +69,13 @@
     <condition property="is.64bit">
         <or>
             <os arch="ia64" />
-            <equals arg1="x86_64" arg2="${os.arch}"/>
+            <os arch="x86_64"/>
         </or>
     </condition>
     <condition property="is.32bit">
         <or>
             <os arch="x86"/>
-            <equals arg1="i386" arg2="${os.arch}"/>
+            <os arch="i386"/>
         </or>
     </condition>
     <condition property="hy.bits" value="32">
@@ -85,19 +85,10 @@
 
     <!-- Normalized architecture name -->
     <condition property="hy.arch" value="x86">
-        <and>
-            <isset property="is.x86" />
-            <isset property="is.32bit" />
-        </and>
+        <isset property="is.x86" />
     </condition>
     <property name="hy.arch" value="${os.arch}" />
-	
-    <condition property="hy.arch.define" value="HYX86">
-        <equals arg1="${hy.arch}" arg2="x86"/>
-    </condition>
-    <condition property="hy.arch.define" value="HYX86_64">
-        <equals arg1="${hy.arch}" arg2="x86_64"/>
-    </condition>
+
     <!-- Normalized platform name -->
     <property name="hy.platform" value="${hy.os}.${hy.arch}"/>
     <property name="hy.platform.path" value="${hy.os}/${hy.arch}"/>
@@ -232,8 +223,6 @@
                   executable="${make.command}"
                   dir="@{dir}">
                 <env key="HY_HDK" value="${hy.hdk}" />
-                <env key="HY_ARCH" value="${hy.arch}" />
-                <env key="HY_ARCH_DEFINE" value="${hy.arch.define}" />
                 <arg line="@{target}" />
             </exec>
         </sequential>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/makefile?rev=430036&r1=430035&r2=430036&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/makefile
Wed Aug  9 05:04:02 2006
@@ -18,7 +18,7 @@
 
 include $(HY_HDK)/build/make/makefile.include
 
-CFLAGS += -fpic -I../../zlib_dist
+CFLAGS += -I../../zlib_dist
 BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \
 	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o
 LIBNAME = $(LIBPATH)libhyzip.a

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?rev=430036&r1=430035&r2=430036&view=diff
==============================================================================
--- 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
Wed Aug  9 05:04:02 2006
@@ -25,12 +25,7 @@
 	$(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
+SYSLIBFILES = -L/usr/X11R6/lib -lX11 -lXft
 
 DLLNAME=../liblinuxfont.so
 

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?rev=430036&r1=430035&r2=430036&view=diff
==============================================================================
--- 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
Wed Aug  9 05:04:02 2006
@@ -26,12 +26,7 @@
 	$(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
+SYSLIBFILES = -lstdc++ -L/usr/X11R6/lib -lX11
 
 DLLNAME=../libX11Wrapper.so
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile?rev=430036&r1=430035&r2=430036&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile
Wed Aug  9 05:04:02 2006
@@ -44,7 +44,7 @@
 	$(FDLIBM_DIST)w_scalb.o $(FDLIBM_DIST)w_sinh.o $(FDLIBM_DIST)w_sqrt.o
 
 # CFLAGS are overriden not just appended to
-CFLAGS= -O0 -fpic -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -DHYX86 -D_IEEE_LIBM \
+CFLAGS= -O0 -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -DHYX86 -D_IEEE_LIBM \
         -DHY_PLATFORM_DOUBLE_ORDER \
 	-I. -I$(SHAREDSUB) -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include \
 	-ffloat-store $(VMDEBUG)

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hycomp.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hycomp.h?rev=430036&r1=430035&r2=430036&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hycomp.h
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/hycomp.h
Wed Aug  9 05:04:02 2006
@@ -46,7 +46,7 @@
 #define HY_PLATFORM_DOUBLE_ORDER
 #if defined(LINUX)
 /* NOTE: Linux supports different processors -- do not assume 386 */
-#if defined(HYX86_64)
+#if defined(LINUXPPC64)
 #define DATA_TYPES_DEFINED
 typedef unsigned long int UDATA;        /* 64bits */
 typedef unsigned long int U_64;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/OSFileSystemLinux32.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/OSFileSystemLinux32.c?rev=430036&r1=430035&r2=430036&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/OSFileSystemLinux32.c
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/OSFileSystemLinux32.c
Wed Aug  9 05:04:02 2006
@@ -23,13 +23,10 @@
 #include <errno.h>
 #include <sys/sendfile.h>
 #include "vmi.h"
-#include "iohelp.h"
 
 #include "IFileSystem.h"
 #include "OSFileSystem.h"
 
-void *getJavaIoFileDescriptorContentsAsPointer (JNIEnv * env, jobject fd);
-
 typedef int OSSOCKET;   
 typedef struct hysocket_struct
 {
@@ -226,7 +223,7 @@
   (JNIEnv *env, jobject thiz, jlong fd, jobject sd, jlong offset, jlong count)
 {
   PORT_ACCESS_FROM_ENV (env);
-  OSSOCKET socket;
+  int socket;
   //TODO IPV6
   hysocket_t hysocketP =
     (hysocket_t)getJavaIoFileDescriptorContentsAsPointer (env,sd);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/OSMemoryLinux32.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/OSMemoryLinux32.c?rev=430036&r1=430035&r2=430036&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/OSMemoryLinux32.c
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/OSMemoryLinux32.c
Wed Aug  9 05:04:02 2006
@@ -34,7 +34,7 @@
 
 JNIEXPORT jint JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getPointerSizeImpl
(JNIEnv * env, jclass clazz)
 {
-   return sizeof(void *);
+  return 4;
 }
 
 JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getAddress
@@ -76,7 +76,7 @@
   (JNIEnv * env, jobject thiz, jlong addr, jlong size){
 	  PORT_ACCESS_FROM_ENV (env);
   	  jboolean result = 0;
-  	  IDATA m_addr = (IDATA)addr;
+  	  int m_addr = (int)addr;
 	  int PAGE_SIZE = getPageSize();
 	  char* vec = NULL;
 	  int page_count = 0;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/linux/hysignal.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/linux/hysignal.c?rev=430036&r1=430035&r2=430036&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/linux/hysignal.c
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/linux/hysignal.c
Wed Aug  9 05:04:02 2006
@@ -624,77 +624,35 @@
   switch (index)
     {
     case HYPORT_SIG_GPR_X86_EDI:
-	case HYPORT_SIG_GPR_AMD64_RDI:
     case 0:
-#ifdef HYX86_64
-      *name = "RDI";
-      *value = &info->sigContext->rdi;
-#endif
-#ifdef HYX86
       *name = "EDI";
       *value = &info->sigContext->edi;
-#endif
-	  return HYPORT_SIG_VALUE_ADDRESS;
+      return HYPORT_SIG_VALUE_ADDRESS;
     case HYPORT_SIG_GPR_X86_ESI:
-	case HYPORT_SIG_GPR_AMD64_RSI:
     case 1:
-#ifdef HYX86
       *name = "ESI";
       *value = &info->sigContext->esi;
-#endif
-#ifdef HYX86_64
-      *name = "RSI";
-      *value = &info->sigContext->rsi;
-#endif
       return HYPORT_SIG_VALUE_ADDRESS;
     case HYPORT_SIG_GPR_X86_EAX:
-    case HYPORT_SIG_GPR_AMD64_RAX:
     case 2:
-#ifdef HYX86
       *name = "EAX";
       *value = &info->sigContext->eax;
-#endif
-#ifdef HYX86_64
-      *name = "RAX";
-      *value = &info->sigContext->rax;
-#endif
-	  return HYPORT_SIG_VALUE_ADDRESS;
+      return HYPORT_SIG_VALUE_ADDRESS;
     case HYPORT_SIG_GPR_X86_EBX:
-    case HYPORT_SIG_GPR_AMD64_RBX:
     case 3:
-#ifdef HYX86
       *name = "EBX";
       *value = &info->sigContext->ebx;
-#endif
-#ifdef HYX86_64
-      *name = "RBX";
-      *value = &info->sigContext->rbx;
-#endif
-	  return HYPORT_SIG_VALUE_ADDRESS;
+      return HYPORT_SIG_VALUE_ADDRESS;
     case HYPORT_SIG_GPR_X86_ECX:
-    case HYPORT_SIG_GPR_AMD64_RCX:
     case 4:
-#ifdef HYX86
       *name = "ECX";
       *value = &info->sigContext->ecx;
-#endif
-#ifdef HYX86_64
-      *name = "RCX";
-      *value = &info->sigContext->rcx;
-#endif
-	  return HYPORT_SIG_VALUE_ADDRESS;
+      return HYPORT_SIG_VALUE_ADDRESS;
     case HYPORT_SIG_GPR_X86_EDX:
-    case HYPORT_SIG_GPR_AMD64_RDX:
     case 5:
-#ifdef HYX86
       *name = "EDX";
       *value = &info->sigContext->edx;
-#endif
-#ifdef HYX86_64
-      *name = "RDX";
-      *value = &info->sigContext->rdx;
-#endif
-	  return HYPORT_SIG_VALUE_ADDRESS;
+      return HYPORT_SIG_VALUE_ADDRESS;
     default:
       return HYPORT_SIG_VALUE_UNDEFINED;
     }
@@ -717,16 +675,9 @@
     {
     case HYPORT_SIG_CONTROL_PC:
     case 0:
-#ifdef HYX86
       *name = "EIP";
       *value = (void *) &(info->sigContext->eip);
-#endif
-#ifdef HYX86_64
-      *name = "RIP";
-      *value = (void *) &(info->sigContext->rip);
-#endif
-	  return HYPORT_SIG_VALUE_ADDRESS;
-#ifdef HYX86
+      return HYPORT_SIG_VALUE_ADDRESS;
     case 1:
       *name = "ES";
       *value = (void *) &(info->sigContext->es);
@@ -735,17 +686,10 @@
       *name = "DS";
       *value = (void *) &(info->sigContext->ds);
       return HYPORT_SIG_VALUE_ADDRESS;
-#endif
     case HYPORT_SIG_CONTROL_SP:
     case 3:
-#ifdef HYX86
       *name = "ESP";
       *value = (void *) &(info->sigContext->esp);
-#endif
-#ifdef HYX86_64
-      *name = "RSP";
-      *value = (void *) &(info->sigContext->rsp);
-#endif
       return HYPORT_SIG_VALUE_ADDRESS;
     case 4:
       *name = "EFlags";
@@ -755,23 +699,15 @@
       *name = "CS";
       *value = (void *) &(info->sigContext->cs);
       return HYPORT_SIG_VALUE_ADDRESS;
-#ifdef HYX86
     case 6:
       *name = "SS";
       *value = (void *) &(info->sigContext->ss);
       return HYPORT_SIG_VALUE_ADDRESS;
-#endif
-	case HYPORT_SIG_CONTROL_BP:
+    case HYPORT_SIG_CONTROL_BP:
     case 7:
-#ifdef HYX86
       *name = "EBP";
       *value = &info->sigContext->ebp;
-#endif
-#ifdef HYX86_64
-      *name = "RBP";
-      *value = &info->sigContext->rbp;
-#endif
-	  return HYPORT_SIG_VALUE_ADDRESS;
+      return HYPORT_SIG_VALUE_ADDRESS;
     default:
       return HYPORT_SIG_VALUE_UNDEFINED;
     }
@@ -790,14 +726,8 @@
   Dl_info *dl_info = &(info->dl_info);
   *name = "";
 
-#ifdef HYX86
   address = (void *) info->sigContext->eip;
   int dl_result = dladdr ((void *) info->sigContext->eip, dl_info);
-#endif
-#ifdef HYX86_64
-  address = (void *) info->sigContext->rip;
-  int dl_result = dladdr ((void *) info->sigContext->rip, dl_info);
-#endif
 
   switch (index)
     {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/linux/hyvmem.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/linux/hyvmem.c?rev=430036&r1=430035&r2=430036&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/linux/hyvmem.c
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/port/linux/hyvmem.c
Wed Aug  9 05:04:02 2006
@@ -343,7 +343,7 @@
     }
 
   /* Update identifier and commit memory if required, else return reserved memory */
-  update_vmemIdentifier (identifier, baseAddress, baseAddress,
+  update_vmemIdentifier (identifier, baseAddress, (void *) addressKey,
                          byteAmount, mode, largePageSize);
   if (0 != (HYPORT_VMEM_MEMORY_MODE_COMMIT & mode))
     {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/linux/makefile?rev=430036&r1=430035&r2=430036&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/thread/linux/makefile
Wed Aug  9 05:04:02 2006
@@ -21,7 +21,7 @@
 CFLAGS += -fpic
 
 BUILDFILES = \
-	$(SHAREDSUB)thread_copyright.o $(HY_ARCH)/thrhelp.o $(HY_ARCH)/thrspinlock.o hythread.o
\
+	$(SHAREDSUB)thread_copyright.o thrhelp.o thrspinlock.o hythread.o \
 	$(SHAREDSUB)hythreadinspect.o linuxonexit.o priority.o rasthrsup.o \
 	$(SHAREDSUB)rwmutex.o thrcreate.o thrdsup.o $(SHAREDSUB)thrprof.o
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml?rev=430036&r1=430035&r2=430036&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml Wed Aug  9 05:04:02 2006
@@ -45,13 +45,8 @@
 	<mkdir dir="${hy.text.src.main.native}/icu4c/unicode" />
 	<unzip src="${iculib.zip}" dest="${hy.text.src.main.native}/icu4c/unicode" />
 	<chmod dir="${hy.text.src.main.native}/icu4c/unicode" perm="ugo+r" />
-	<antcall target="copy.libs" inheritall="true" />
-    </target>
-	<target name="copy.libs" if="is.x86_64">
-	    <copy todir="${hy.text.src.main.native}/icu4c/unicode" overwrite="yes">
-	            <fileset dir="${depends.libs}" includes="*${shlib.suffix}*" />
-	    </copy>
     </target>
+	
     <target name="clean-overlay-oss">
 	<delete dir="${hy.text.src.main.native}/icu4c" quiet="true" />
     </target>



Mime
View raw message