From commits-return-55915-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org Tue Sep 02 14:47:53 2008 Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 50440 invoked from network); 2 Sep 2008 14:47:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Sep 2008 14:47:52 -0000 Received: (qmail 94082 invoked by uid 500); 2 Sep 2008 14:47:51 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 94058 invoked by uid 500); 2 Sep 2008 14:47:51 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 94049 invoked by uid 99); 2 Sep 2008 14:47:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 07:47:50 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 14:47:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 73C2B2388892; Tue, 2 Sep 2008 07:47:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691267 - in /harmony/enhanced: classlib/trunk/ classlib/trunk/depends/build/ classlib/trunk/make/ classlib/trunk/modules/luni/ classlib/trunk/modules/luni/src/main/native/include/shared/ classlib/trunk/modules/luni/src/main/native/launcher... Date: Tue, 02 Sep 2008 14:46:57 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080902144701.73C2B2388892@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hindessm Date: Tue Sep 2 07:46:55 2008 New Revision: 691267 URL: http://svn.apache.org/viewvc?rev=691267&view=rev Log: Remove the hy.no.sig option and make it the default. Removed: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/jsig.h harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/hysignal.h harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/freebsd.x86/hysignal_context.c harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/freebsd.x86/hysignal_context.h harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hysignal.c harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/linux.ia64/hysignal_context.c harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/linux.ia64/hysignal_context.h harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/linux.x86/hysignal_context.c harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/linux.x86/hysignal_context.h harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/linux.x86_64/hysignal_context.c harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/linux.x86_64/hysignal_context.h harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/hysignal.c harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/ Modified: harmony/enhanced/classlib/trunk/README.txt harmony/enhanced/classlib/trunk/depends/build/defines.mak harmony/enhanced/classlib/trunk/depends/build/defines.mk harmony/enhanced/classlib/trunk/make/properties.xml harmony/enhanced/classlib/trunk/modules/luni/build.xml harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/harmonyglob.h harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c harmony/enhanced/classlib/trunk/modules/portlib/build.xml harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyexit.c harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyport.c harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyportcontrol.c harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/portpriv.h harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyosdump.c harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/makefile harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile harmony/enhanced/common_resources/trunk/make/properties.xml harmony/enhanced/drlvm/trunk/make/properties.xml harmony/enhanced/drlvm/trunk/make/vm/common-vm.xml harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp harmony/enhanced/trunk/build.xml harmony/enhanced/trunk/debian/rules Modified: harmony/enhanced/classlib/trunk/README.txt URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/README.txt?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/README.txt (original) +++ harmony/enhanced/classlib/trunk/README.txt Tue Sep 2 07:46:55 2008 @@ -252,11 +252,11 @@ variable if they see the following error message when attempting to run a Java application with the built class library components on a compatible VM : -error while loading shared libraries: libhysig.so: cannot open shared +error while loading shared libraries: libhyprt.so: cannot open shared object file: No such file or directory On some systems this error can occur even when the shared library -(e.g. /deploy/jdk/jre/bin/libhysig.so) has been built correctly +(e.g. /deploy/jdk/jre/bin/libhyprt.so) has been built correctly and is present in the correct location. This is not a problem with the built shared library but instead is dependent on how the operating system locates and loads dynamically linked libraries at runtime. Updating the LD_LIBRARY_PATH Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mak URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mak?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/depends/build/defines.mak (original) +++ harmony/enhanced/classlib/trunk/depends/build/defines.mak Tue Sep 2 07:46:55 2008 @@ -69,12 +69,6 @@ HYCFLAGS = $(HYCFLAGS) -DHY_NO_THR !ENDIF -!IF "$(HY_NO_SIG)" == "false" -MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hysig.lib -!ELSE -HYCFLAGS = $(HYCFLAGS) -DHY_NO_SIG -!ENDIF - !IF "$(HY_ZIP_API)" == "true" HYCFLAGS = $(HYCFLAGS) -DHY_ZIP_API !ENDIF Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mk URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mk?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original) +++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Tue Sep 2 07:46:55 2008 @@ -94,12 +94,6 @@ DEFINES += -DHY_NO_THR endif -ifeq ($(HY_NO_SIG),false) -MDLLIBFILES += $(DLLPATH)libhysig$(HY_LINKLIB_SUFFIX) -else -DEFINES += -DHY_NO_SIG -endif - ifeq ($(HY_ZIP_API),true) DEFINES += -DHY_ZIP_API endif Modified: harmony/enhanced/classlib/trunk/make/properties.xml URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/make/properties.xml (original) +++ harmony/enhanced/classlib/trunk/make/properties.xml Tue Sep 2 07:46:55 2008 @@ -291,13 +291,6 @@ - - - - - - - @@ -506,7 +499,6 @@ - Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original) +++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Tue Sep 2 07:46:55 2008 @@ -57,7 +57,6 @@ - @@ -232,7 +231,6 @@ - Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c Tue Sep 2 07:46:55 2008 @@ -100,9 +100,6 @@ HyPortLibraryVersion portLibraryVersion; struct haCmdlineOptions options; int rc = 257; -#if !defined(HY_NO_SIG) - UDATA result; -#endif /* HY_NO_SIG */ #ifdef HY_NO_THR UDATA portLibDescriptor; hyport_init_library_type port_init_library_func; @@ -140,23 +137,7 @@ options.envp = envp; options.portLibrary = &hyportLibrary; -#if !defined(HY_NO_SIG) - if (hyportLibrary.sysinfo_get_env(&hyportLibrary, "HARMONY_INSTALL_SIG_HANDLER", NULL, 0) == -1) { -#endif /* HY_NO_SIG */ - rc = gpProtectedMain (&options); -#if !defined(HY_NO_SIG) - } else { - if (hyportLibrary.sig_protect (&hyportLibrary, - signalProtectedMain, - &options, - genericSignalHandler, - NULL, - HYPORT_SIG_FLAG_SIGALLSYNC, - &result) == 0) { - rc = result; - } - } -#endif /* HY_NO_SIG */ + rc = gpProtectedMain (&options); hyportLibrary.port_shutdown_library (&hyportLibrary); } else { fprintf( stderr, Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/harmonyglob.h URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/harmonyglob.h?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/harmonyglob.h (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/harmonyglob.h Tue Sep 2 07:46:55 2008 @@ -80,8 +80,5 @@ #define JniIDCache LUNIJniIDCache /* Now that the module-specific defines are in place, include the shared file */ #include "libglob.h" -/* all UNIX platforms */ -#if defined(LINUX) -#include "hysignal.h" -#endif /* UNIX */ + #endif /* harmonyglob_h */ Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c Tue Sep 2 07:46:55 2008 @@ -28,7 +28,6 @@ #include "harmonyglob.h" #include "hyport.h" #include "strhelp.h" -#include "jsig.h" #include "hycomp.h" static UDATA keyInitCount = 0; @@ -55,12 +54,6 @@ char *propVal = NULL; vmiError propRes; -#if defined(LINUX) && !defined(HY_NO_SIG) - /* all UNIX platforms */ - HySignalHandler previousGpHandler; - HySigSet (SIGPIPE, SIG_IGN, previousGpHandler); -#endif - /* Query the VM interface */ vmInterface = VMI_GetVMIFromJavaVM (vm); if (!vmInterface) Modified: harmony/enhanced/classlib/trunk/modules/portlib/build.xml URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/build.xml?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/portlib/build.xml (original) +++ harmony/enhanced/classlib/trunk/modules/portlib/build.xml Tue Sep 2 07:46:55 2008 @@ -95,7 +95,7 @@ + depends="-build-native,-build-native-thread,-build-native-thrstub,-build-native-port" /> @@ -104,19 +104,6 @@ - - - - - - - - - - - - - @@ -179,7 +166,6 @@ - Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyexit.c URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyexit.c?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyexit.c (original) +++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyexit.c Tue Sep 2 07:46:55 2008 @@ -24,11 +24,6 @@ #include "hyport.h" -#if !defined(HY_NO_SIG) -extern void VMCALL hysig_chain_at_shutdown_and_exit (struct HyPortLibrary - *portLibrary); -#endif /* HY_NO_SIG */ - /** * Block until the portlibary has been exited and return the error code. * @@ -55,14 +50,6 @@ void VMCALL hyexit_shutdown_and_exit (struct HyPortLibrary *portLibrary, I_32 exitCode) { - -#if !defined(HY_NO_SIG) -#if !defined(WIN32) - hysig_chain_at_shutdown_and_exit (portLibrary); -#endif -#endif /* HY_NO_SIG */ - - exit ((int) exitCode); } Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyport.c URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyport.c?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyport.c (original) +++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyport.c Tue Sep 2 07:46:55 2008 @@ -77,9 +77,6 @@ THREAD_ACCESS_FROM_PORT(portLibrary); #endif /* HY_NO_THR */ -#if !defined(HY_NO_SIG) - portLibrary->sig_shutdown (portLibrary); -#endif /* HY_NO_SIG */ portLibrary->shmem_shutdown (portLibrary); portLibrary->shsem_shutdown (portLibrary); @@ -361,14 +358,6 @@ goto cleanup; } -#if !defined(HY_NO_SIG) - rc = portLibrary->sig_startup (portLibrary); - if (0 != rc) - { - goto cleanup; - } -#endif /* HY_NO_SIG */ - return rc; cleanup: Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyportcontrol.c URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyportcontrol.c?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyportcontrol.c (original) +++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hyportcontrol.c Tue Sep 2 07:46:55 2008 @@ -52,22 +52,5 @@ return 0; } -#if defined(WIN32) && !defined(HY_NO_SIG) - if (!strcmp ("SIG_INTERNAL_HANDLER", key)) - { - /* used by optimized code to implement fast signal handling on Windows */ - extern int structuredExceptionHandler (struct HyPortLibrary - *portLibrary, - hysig_handler_fn handler, - void *handler_arg, U_32 flags, - EXCEPTION_POINTERS * - exceptionInfo); - *(int (**) - (struct HyPortLibrary *, hysig_handler_fn, void *, U_32, - EXCEPTION_POINTERS *)) value = structuredExceptionHandler; - return 0; - } -#endif - return 1; } Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/portpriv.h URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/portpriv.h?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/portpriv.h (original) +++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/portpriv.h Tue Sep 2 07:46:55 2008 @@ -583,46 +583,6 @@ hysysinfo_get_env PROTOTYPE ((struct HyPortLibrary * portLibrary, char *envVar, char *infoString, UDATA bufSize)); -#if !defined(HY_NO_SIG) -/* HySourceHySignal*/ -struct HyPortLibrary; -extern HY_CFUNC I_32 VMCALL - hysig_startup PROTOTYPE ((struct HyPortLibrary * portLibrary)); -struct HyPortLibrary; -extern HY_CFUNC U_32 VMCALL - hysig_get_options PROTOTYPE ((struct HyPortLibrary * portLibrary)); -struct HyPortLibrary; -extern HY_CFUNC I_32 VMCALL - hysig_can_protect -PROTOTYPE ((struct HyPortLibrary * portLibrary, U_32 flags)); -struct HyPortLibrary; -extern HY_CFUNC void VMCALL - hysig_shutdown PROTOTYPE ((struct HyPortLibrary * portLibrary)); -struct HyPortLibrary; -extern HY_CFUNC U_32 VMCALL - hysig_info_count -PROTOTYPE ((struct HyPortLibrary * portLibrary, void *info, U_32 category)); -struct HyPortLibrary; -extern HY_CFUNC I_32 VMCALL - hysig_set_options -PROTOTYPE ((struct HyPortLibrary * portLibrary, U_32 options)); -struct HyPortLibrary; -extern HY_CFUNC I_32 VMCALL - hysig_protect -PROTOTYPE ((struct HyPortLibrary * portLibrary, hysig_protected_fn fn, - void *fn_arg, hysig_handler_fn handler, void *handler_arg, - U_32 flags, UDATA * result)); -struct HyPortLibrary; -extern HY_CFUNC U_32 VMCALL - hysig_set_async_signal_handler -PROTOTYPE ((struct HyPortLibrary * portLibrary, hysig_handler_fn handler, - void *handler_arg, U_32 flags)); -struct HyPortLibrary; -extern HY_CFUNC U_32 VMCALL - hysig_info -PROTOTYPE ((struct HyPortLibrary * portLibrary, void *info, U_32 category, - I_32 index, const char **name, void **value)); -#endif /* HY_NO_SIG */ /* HySourceHySL*/ struct HyPortLibrary; extern HY_CFUNC UDATA VMCALL @@ -1307,17 +1267,6 @@ hyipcmutex_acquire, /* ipcmutex_acquire */ hyipcmutex_release, /* ipcmutex_release */ hyport_control, /* port_control */ -#if !defined(HY_NO_SIG) - hysig_startup, /* sig_startup */ - hysig_shutdown, /* sig_shutdown */ - hysig_protect, /* sig_protect */ - hysig_can_protect, /* sig_can_protect */ - hysig_set_async_signal_handler, /* sig_set_async_signal_handler */ - hysig_info, /* sig_info */ - hysig_info_count, /* sig_info_count */ - hysig_set_options, /* sig_set_options */ - hysig_get_options, /* sig_get_options */ -#else NULL, /* sig_startup */ NULL, /* sig_shutdown */ NULL, /* sig_protect */ @@ -1327,7 +1276,6 @@ NULL, /* sig_info_count */ NULL, /* sig_set_options */ NULL, /* sig_get_options */ -#endif /* HY_NO_SIG */ NULL, /* attached_thread */ hysysinfo_DLPAR_enabled, /* sysinfo_DLPAR_enabled */ hysysinfo_DLPAR_max_CPUs, /* sysinfo_DLPAR_max_CPUs */ Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyosdump.c URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyosdump.c?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyosdump.c (original) +++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyosdump.c Tue Sep 2 07:46:55 2008 @@ -87,9 +87,6 @@ } /* Ensure we get default action (core) - reset primary&app handlers */ -#if !defined(HY_NO_SIG) - HYJSIG_SIGNAL (SIGABRT, SIG_DFL); -#endif /* HY_NO_SIG */ signal (SIGABRT, SIG_DFL); #if defined(LINUX) Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile (original) +++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile Tue Sep 2 07:46:55 2008 @@ -31,10 +31,6 @@ $(SHAREDSUB)hystr.o $(SHAREDSUB)hystrftime.o $(SHAREDSUB)hystsl.o \ hysysinfo.o hytime.o $(SHAREDSUB)hytlshelpers.o hytty.o -ifeq ($(HY_NO_SIG),false) -BUILDFILES += hysignal.o $(HY_PLATFORM)/hysignal_context.o -endif - ifeq ($(HY_PORTLIB_STUBS),true) BUILDFILES += stubs/hycpu.o stubs/hyipcmutex.o stubs/hyshmem.o \ stubs/hyshsem.o stubs/hyvmem.o Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/makefile URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/makefile?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/makefile (original) +++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/makefile Tue Sep 2 07:46:55 2008 @@ -36,10 +36,6 @@ $(SHAREDSUB)hystrftime.obj $(SHAREDSUB)hystsl.obj hysysinfo.obj hytime.obj \ $(SHAREDSUB)hytlshelpers.obj hytty.obj hyvmem.obj -!IF "$(HY_NO_SIG)" == "false" -BUILDFILES = $(BUILDFILES) hysignal.obj -!ENDIF - MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hythr$(HY_LINKLIB_SUFFIX) VIRTFILES = hyprt.res Modified: harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile (original) +++ harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile Tue Sep 2 07:46:55 2008 @@ -38,7 +38,7 @@ SYSLIBFILES = ws2_32.lib Iphlpapi.lib MDLLIBFILES = #\ -# $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \ +# $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \ # $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib $(JPEG_DIR)libjpeg.lib DLLBASE=0x13300000 Modified: harmony/enhanced/common_resources/trunk/make/properties.xml URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/trunk/make/properties.xml?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/common_resources/trunk/make/properties.xml (original) +++ harmony/enhanced/common_resources/trunk/make/properties.xml Tue Sep 2 07:46:55 2008 @@ -120,13 +120,6 @@ - - - - - - - @@ -272,7 +265,6 @@ - Modified: harmony/enhanced/drlvm/trunk/make/properties.xml URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/properties.xml?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/make/properties.xml (original) +++ harmony/enhanced/drlvm/trunk/make/properties.xml Tue Sep 2 07:46:55 2008 @@ -107,7 +107,6 @@ - @@ -144,4 +143,4 @@ - \ No newline at end of file + Modified: harmony/enhanced/drlvm/trunk/make/vm/common-vm.xml URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/common-vm.xml?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/make/vm/common-vm.xml (original) +++ harmony/enhanced/drlvm/trunk/make/vm/common-vm.xml Tue Sep 2 07:46:55 2008 @@ -100,7 +100,6 @@ - Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp Tue Sep 2 07:46:55 2008 @@ -50,9 +50,6 @@ { "harmonyvm", "hythr", -#if !defined(HY_NO_SIG) - "hysig", -#endif "hyprt", #if defined(HY_LOCAL_ZLIB) "z", Modified: harmony/enhanced/trunk/build.xml URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/trunk/build.xml (original) +++ harmony/enhanced/trunk/build.xml Tue Sep 2 07:46:55 2008 @@ -29,7 +29,6 @@ - @@ -390,7 +389,6 @@ - Modified: harmony/enhanced/trunk/debian/rules URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/rules?rev=691267&r1=691266&r2=691267&view=diff ============================================================================== --- harmony/enhanced/trunk/debian/rules (original) +++ harmony/enhanced/trunk/debian/rules Tue Sep 2 07:46:55 2008 @@ -12,7 +12,7 @@ # -lib /usr/share/java ensures that ant finds ecj.jar, etc ANT_FLAGS = -lib /usr/share/java \ - -Dhy.no.sig=true -Duse.libstdc++6=true -Dhy.local.zlib=true \ + -Duse.libstdc++6=true -Dhy.local.zlib=true \ -Dhy.zip.api=false -Dhy.no.thr=false -Dauto.fetch=true JREDIR=$(CURDIR)/debian/harmony-5.0-jre JDKDIR=$(CURDIR)/debian/harmony-5.0-jdk