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 2008/09/02 16:46:57 UTC
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...
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. <EXTRACT_DIR>/deploy/jdk/jre/bin/libhysig.so) has been built correctly
+(e.g. <EXTRACT_DIR>/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 @@
</not>
</condition>
- <property name="hy.no.sig" value="${hy.no.thr}" />
- <condition property="hy.skip.sig" value="true">
- <not>
- <equals arg1="${hy.no.sig}" arg2="false" />
- </not>
- </condition>
-
<property name="hy.local.zlib" value="false" />
<condition property="hy.skip.zlib" value="true">
<not>
@@ -506,7 +499,6 @@
<env key="HY_ARCH" value="${hy.arch}" />
<env key="HY_OS" value="${hy.os}" />
<env key="HY_PLATFORM" value="${hy.platform}" />
- <env key="HY_NO_SIG" value="${hy.no.sig}" />
<env key="HY_NO_THR" value="${hy.no.thr}" />
<env key="HY_THR_NO_DEPLOY" value="${hy.thr.nodeploy}" />
<env key="HY_LOCAL_ZLIB" value="${hy.local.zlib}" />
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 @@
<include name="gp.h" />
<include name="fdlibm.h" />
<include name="hymagic.h" />
- <include name="jsig.h" />
<include name="vmizip.h"/>
</fileset>
</copy>
@@ -232,7 +231,6 @@
<include name="gp.h" />
<include name="fdlibm.h" />
<include name="hymagic.h" />
- <include name="jsig.h" />
</fileset>
</delete>
<delete failonerror="false">
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 @@
<!-- Build the portlib native components -->
<target name="build-native"
- depends="-build-native,-build-native-sig,-build-native-thread,-build-native-thrstub,-build-native-port" />
+ depends="-build-native,-build-native-thread,-build-native-thrstub,-build-native-port" />
<target name="-build-native">
<!-- Build common lib -->
<make dir="${hy.portlib.src.main.native}/common/${hy.os.family}" />
@@ -104,19 +104,6 @@
<make dir="${hy.portlib.src.main.native}/pool/${hy.os.family}" />
</target>
- <target name="-build-native-sig" unless="hy.skip.sig">
- <!-- Build sig dll -->
- <make dir="${hy.portlib.src.main.native}/sig/${hy.os.family}" />
-
- <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
- <fileset dir="${hy.portlib.src.main.native}/sig">
- <include name="*${shlib.suffix}*" />
- <include name="*${progdb.suffix}*" if="is.windows" />
- <exclude name="*${manifest.suffix}"/>
- </fileset>
- </copy>
- </target>
-
<target name="-build-native-thread" unless="hy.skip.thr">
<!-- Build thread dll -->
<make dir="${hy.portlib.src.main.native}/thread/${hy.os.family}" />
@@ -179,7 +166,6 @@
<!-- Clean natives -->
<target name="clean-native" depends="-clean-native-tests">
- <make dir="${hy.portlib.src.main.native}/sig/${hy.os.family}" target="clean" />
<make dir="${hy.portlib.src.main.native}/thread/${hy.os.family}" target="clean" />
<make dir="${hy.portlib.src.main.native}/thrstub/${hy.os.family}" target="clean" />
<make dir="${hy.portlib.src.main.native}/port/${hy.os.family}" target="clean" />
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 @@
</not>
</condition>
- <property name="hy.no.sig" value="${hy.no.thr}" />
- <condition property="hy.skip.sig" value="true">
- <not>
- <equals arg1="${hy.no.sig}" arg2="false" />
- </not>
- </condition>
-
<property name="hy.local.zlib" value="false" />
<condition property="hy.skip.zlib" value="true">
<not>
@@ -272,7 +265,6 @@
<env key="HY_ARCH" value="${hy.arch}" />
<env key="HY_OS" value="${hy.os}" />
<env key="HY_PLATFORM" value="${hy.platform}" />
- <env key="HY_NO_SIG" value="${hy.no.sig}" />
<env key="HY_NO_THR" value="${hy.no.thr}" />
<env key="HY_THR_NO_DEPLOY" value="${hy.thr.nodeploy}" />
<env key="HY_LOCAL_ZLIB" value="${hy.local.zlib}" />
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 @@
<echo message=" hy.cpp.compiler = ${hy.cpp.compiler}" />
<echo message=" cfg = ${hy.cfg}" />
<echo message=" svn revision = ${svn.revision}" />
- <echo message=" hy.no.sig = ${hy.no.sig}" />
<echo message=" hy.local.zlib = ${hy.local.zlib}" />
<echo message=" common resources = ${common.resources}" />
<echo message=" HDK root = ${hy.hdk}" />
@@ -144,4 +143,4 @@
<property name="is.cpptasks" value="true"/>
</target>
-</project>
\ No newline at end of file
+</project>
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 @@
<compilerarg value="/QxN" if="is.icl"/>
<compilerarg value="/Qip" if="is.icl"/>
- <defineset define="HY_NO_SIG" if="hy.skip.sig"/>
<defineset define="HY_LOCAL_ZLIB" if="hy.skip.zlib"/>
</compiler>
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 @@
<!-- debug or release version -->
<property name="hy.cfg" value="release" />
- <property name="hy.no.sig" value="false" />
<property name="hy.local.zlib" value="false" />
<description>
@@ -390,7 +389,6 @@
<propertyset id="required.props">
<propertyref name="hy.cfg" />
- <propertyref name="hy.no.sig" />
<propertyref name="hy.local.zlib" />
<propertyref name="use.libstdc++6" />
</propertyset>
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