harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r507025 - in /harmony/enhanced/classlib/trunk: depends/build/ make/ modules/archive/src/main/native/archive/unix/ modules/archive/src/main/native/archive/windows/ modules/auth/src/main/native/auth/unix/ modules/auth/src/main/native/auth/win...
Date Tue, 13 Feb 2007 14:35:21 GMT
Author: hindessm
Date: Tue Feb 13 06:35:16 2007
New Revision: 507025

URL: http://svn.apache.org/viewvc?view=rev&rev=507025
Log:
Adding "-Dhy.no.sig=true" flag.  Default is false - build hysig.dll.

Modified:
    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/archive/src/main/native/archive/unix/makefile
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile
    harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile
    harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/jsig.h
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile
    harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile
    harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/build.xml
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/pool/windows/makefile
    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/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/portlib/src/main/native/sig/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/windows/makefile
    harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile
    harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/makefile

Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mak?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mak (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mak Tue Feb 13 06:35:16 2007
@@ -51,4 +51,10 @@
 HYCFLAGS = $(HYRELEASECFLAGS) $(HYCOMMONCFLAGS)
 !ENDIF
   
+MDLLIBFILES = $(LIBPATH)hythr.lib $(LIBPATH)hycommon.lib
   
+!IF "$(HY_NO_SIG)" == "false"
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hysig.lib
+!ELSE  
+HYCFLAGS = $(HYCFLAGS) -DHY_NO_SIG
+!ENDIF

Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mk?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Tue Feb 13 06:35:16 2007
@@ -55,3 +55,11 @@
 else
 OPT += $(HYDEBUGCFLAGS)
 endif
+
+MDLLIBFILES = $(DLLPATH)libhythr.so $(LIBPATH)libhycommon.a
+
+ifeq ($(HY_NO_SIG),false)
+MDLLIBFILES += $(DLLPATH)libhysig.so
+else
+DEFINES += -DHY_NO_SIG
+endif

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Tue Feb 13 06:35:16 2007
@@ -213,6 +213,14 @@
     <property name="interm.exclude.file"
               value="exclude.${hy.platform}.${hy.test.vm.name}.interm" />
 
+    <!-- flags -->
+    <property name="hy.no.sig" value="false" />
+    <condition property="hy.skip.sig" value="true">
+        <not>
+            <equals arg1="${hy.no.sig}" arg2="false" />
+        </not>
+    </condition>
+
     <target name="echo" depends="svn-prop, svn-info"
             description="Display the properties defined by this ant file" >
         <echo>
@@ -351,6 +359,7 @@
                 <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}" />
                 <arg line="${make.arg}" />
                 <arg line="@{target}" />
             </exec>

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile Tue Feb 13 06:35:16 2007
@@ -26,9 +26,9 @@
 	$(SHAREDSUB)zip.o $(SHAREDSUB)adler32.o $(SHAREDSUB)inflater.o \
 	$(SHAREDSUB)jarfile.o $(SHAREDSUB)deflater.o $(SHAREDSUB)archiveglob.o
 
-MDLLIBFILES = \
-	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+MDLLIBFILES += \
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
 
 DLLNAME=../libhyarchive.so
 EXPNAME=HYARCHIVE_0.1

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile Tue Feb 13 06:35:16 2007
@@ -36,10 +36,10 @@
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = \
-	$(LIBPATH)hycommon.lib $(LIBPATH)hysig.lib $(LIBPATH)hyzip.lib \
+MDLLIBFILES = $(MDLLIBFILES) \
+	$(LIBPATH)hyzip.lib \
         $(LIBPATH)hyzlib.lib $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib \
-	$(LIBPATH)hythr.lib $(LIBPATH)vmi.lib
+	$(LIBPATH)vmi.lib
 DLLBASE=0x13100000
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile Tue Feb 13 06:35:16 2007
@@ -21,9 +21,9 @@
 
 CFLAGS += -fpic
 BUILDFILES = $(SHAREDSUB)auth_copyright.o authnix.o
-MDLLIBFILES = \
-        $(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
-        $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+MDLLIBFILES += \
+        $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
+        $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
 
 DLLNAME = ../libhyauth.so
 EXPNAME = HYAUTH_0.1

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile Tue Feb 13 06:35:16 2007
@@ -28,9 +28,9 @@
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(LIBPATH)hycommon.lib $(LIBPATH)hysig.lib $(LIBPATH)hyzip.lib \
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyzip.lib \
 	$(LIBPATH)hyzlib.lib $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib \
-	$(LIBPATH)hythr.lib $(LIBPATH)vmi.lib
+	$(LIBPATH)vmi.lib
 DLLBASE=0x1300000
 COMMENT=/comment:"Auth component native code. (c) Copyright 2005, 2006 The Apache Software Foundation or its licensors, as applicable."
 

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile Tue Feb 13 06:35:16 2007
@@ -28,9 +28,9 @@
   $(SHAREDSUB)/SurfaceDataStructure.o \
   libpng.a
 
-MDLLIBFILES = \
-	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+MDLLIBFILES += \
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
 
 OSLIBS += $(STDCLIBS)
 

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile Tue Feb 13 06:35:16 2007
@@ -42,9 +42,8 @@
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib \
               Msimg32.lib gdiplus.lib User32.lib uxTheme.lib 
 
-MDLLIBFILES = \
-  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
-  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib \
+MDLLIBFILES = $(MDLLIBFILES) \
+  $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib \
   $(LIBPATH)hyzlib.lib $(PNG_DIR)libpng.lib
 
 DLLBASE=0x13300000

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile Tue Feb 13 06:35:16 2007
@@ -24,9 +24,9 @@
   $(SHAREDSUB)JpegDecoder.o \
   libjpeg.a
 
-MDLLIBFILES = \
-	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+MDLLIBFILES += \
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
 
 DLLNAME=../libjpegdecoder.so
 EXPNAME=HYJPEGDECODER_0.1

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile Tue Feb 13 06:35:16 2007
@@ -29,9 +29,8 @@
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = \
-  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
-  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib $(JPEG_DIR)libjpeg.lib
+MDLLIBFILES = $(MDLLIBFILES) \
+  $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib $(JPEG_DIR)libjpeg.lib
 
 DLLBASE=0x13300000
 COMMENT=/comment:"JPEGDECODER native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile Tue Feb 13 06:35:16 2007
@@ -28,9 +28,9 @@
   $(SHAREDSUB)/NativeImageFormat.o \
   liblcms.a
 
-MDLLIBFILES = \
-	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+MDLLIBFILES += \
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
 
 DLLNAME=../liblcmm.so
 EXPNAME=HYLCMM_0.1

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile Tue Feb 13 06:35:16 2007
@@ -34,9 +34,8 @@
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = \
-  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
-  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib $(LCMS_DIR)lcms114.lib
+MDLLIBFILES = $(MDLLIBFILES) \
+  $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib $(LCMS_DIR)lcms114.lib
 
 DLLBASE=0x13300000
 COMMENT=/comment:"LCMM Wrapper native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile Tue Feb 13 06:35:16 2007
@@ -24,9 +24,9 @@
 
 BUILDFILES = LinuxNativeFont.o
 
-MDLLIBFILES = \
-	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+MDLLIBFILES += \
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
 
 OSLIBS += $(XLIBS)
 

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile Tue Feb 13 06:35:16 2007
@@ -21,9 +21,9 @@
 BUILDFILES = \
   $(SHAREDSUB)/org_apache_harmony_awt_gl_opengl_GL.o
 
-MDLLIBFILES = \
-	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+MDLLIBFILES += \
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
 
 OSLIBS += $(STDCLIBS)
 

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/windows/makefile Tue Feb 13 06:35:16 2007
@@ -27,9 +27,7 @@
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = \
-  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
-  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib
 
 DLLBASE=0x13300000
 COMMENT=/comment:"OpenGL Wrapper native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile Tue Feb 13 06:35:16 2007
@@ -31,9 +31,7 @@
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = \
-  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
-  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib 
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib 
 
 DLLBASE=0x13300000
 COMMENT=/comment:"Win32 Wrapper native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile Tue Feb 13 06:35:16 2007
@@ -30,9 +30,7 @@
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib gdi32.lib GdiPlus.lib advapi32.lib
 
-MDLLIBFILES = \
-  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
-  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib 
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib
 
 DLLBASE=0x13300000
 COMMENT=/comment:"Win32 Font native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile Tue Feb 13 06:35:16 2007
@@ -24,9 +24,9 @@
   org_apache_harmony_awt_nativebridge_linux_X11.o \
   org_apache_harmony_awt_nativebridge_linux_Xft.o
 
-MDLLIBFILES = \
-	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+MDLLIBFILES += \
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
 
 OSLIBS += $(STDCLIBS) $(XLIBS)
 

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile Tue Feb 13 06:35:16 2007
@@ -24,9 +24,9 @@
   $(SHAREDSUB)JpegEncoder.o \
   libjpeg.a
 
-MDLLIBFILES = \
-	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+MDLLIBFILES += \
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
 
 DLLNAME=../libjpegencoder.so
 EXPNAME=HYJPEGENCODER_0.1

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile Tue Feb 13 06:35:16 2007
@@ -36,9 +36,8 @@
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = \
-  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
-  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib $(JPEG_DIR)libjpeg.lib
+MDLLIBFILES = $(MDLLIBFILES) \
+  $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib $(JPEG_DIR)libjpeg.lib
 
 DLLBASE=0x13300000
 COMMENT=/comment:"JPEGENCODER native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/jsig.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/jsig.h?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/jsig.h (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/jsig.h Tue Feb 13 06:35:16 2007
@@ -18,6 +18,8 @@
 #if !defined(jsig_h)
 #define jsig_h
 
+#if !defined(HY_NO_SIG)
+
 #if defined(__cplusplus)
 extern "C"
 {
@@ -44,5 +46,7 @@
 
 #define JSIG_RC_DEFAULT_ACTION_REQUIRED 0
 #define JSIG_RC_SIGNAL_HANDLED 1
+
+#endif /* HY_NO_SIG */
 
 #endif /* jsig_h */

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?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- 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 Feb 13 06:35:16 2007
@@ -102,8 +102,11 @@
       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,
@@ -115,6 +118,7 @@
             rc = result;
           }
       }
+#endif /* HY_NO_SIG */
       hyportLibrary.port_shutdown_library (&hyportLibrary);
     }
 

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile Tue Feb 13 06:35:16 2007
@@ -22,8 +22,7 @@
 BUILDFILES = $(SHAREDSUB)main.o $(SHAREDSUB)cmain.o \
 	$(SHAREDSUB)launcher_copyright.o $(SHAREDSUB)strbuf.o \
 	$(SHAREDSUB)libhlp.o  
-MDLLIBFILES = $(LIBPATH)libhycommon.a $(DLLPATH)libhyprt.so \
-	$(DLLPATH)libhythr.so $(DLLPATH)libhysig.so
+MDLLIBFILES += $(DLLPATH)libhyprt.so
 EXENAME = $(EXEPATH)java
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae Tue Feb 13 06:35:16 2007
@@ -25,8 +25,8 @@
 BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)cmain.obj \
         $(SHAREDSUB)main.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
 VIRTFILES = java.res
-MDLLIBFILES = $(LIBPATH)hycommon.lib $(LIBPATH)hyprt.lib $(LIBPATH)hythr.lib 
 EXEFLAGS=$(conlflags) -subsystem:console
 EXEDLLFILES=$(conlibsdll)
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt.lib
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw Tue Feb 13 06:35:16 2007
@@ -23,8 +23,8 @@
 BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)main.obj \
         winmain.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
 VIRTFILES = javaw.res
-MDLLIBFILES =  $(LIBPATH)hycommon.lib $(LIBPATH)hyprt.lib $(LIBPATH)hythr.lib 
 EXEFLAGS=$(guilflags) -subsystem:windows
 EXEDLLFILES=$(guilibsdll)
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt.lib
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile Tue Feb 13 06:35:16 2007
@@ -36,9 +36,9 @@
 	OSMemory.o OSMemoryLinux32.o $(SHAREDSUB)OSNetworkSystem.o \
 	OSNetworkSystemLinux.o hyenv.o
 
-MDLLIBFILES = \
-	$(LIBPATH)libhycommon.a $(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+MDLLIBFILES += \
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
 
 DLLNAME = ../libhyluni.so
 EXPNAME = HYLUNI_0.1

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile Tue Feb 13 06:35:16 2007
@@ -43,9 +43,9 @@
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib Mswsock.lib
 
-MDLLIBFILES = \
-  $(LIBPATH)hycommon.lib $(LIBPATH)hysig.lib $(LIBPATH)hyzip.lib $(LIBPATH)hyzlib.lib \
-  $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib
+MDLLIBFILES = $(MDLLIBFILES) \
+  $(LIBPATH)hyzip.lib $(LIBPATH)hyzlib.lib \
+  $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib $(LIBPATH)vmi.lib
 
 DLLBASE=0x13200000
 COMMENT=/comment:"LUNI component native code. (c) Copyright 1991, 2005 The Apache Software Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile Tue Feb 13 06:35:16 2007
@@ -26,9 +26,9 @@
   $(SHAREDSUB)org_apache_harmony_misc_accessors_StringAccessorImpl.o
 
 
-MDLLIBFILES = \
-	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+MDLLIBFILES += \
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
 
 DLLNAME=../libaccessors.so
 EXPNAME=HYMISC_0.1

Modified: harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile Tue Feb 13 06:35:16 2007
@@ -29,9 +29,8 @@
 VIRTFILES = accessors.res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = \
-  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib \
-  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib
+MDLLIBFILES = $(MDLLIBFILES) \
+  $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib $(LIBPATH)vmi.lib
 
 DLLBASE=0x13300000
 COMMENT=/comment:"Accessors native code. (c) Copyright 2006 The Apache Software Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/build.xml?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/build.xml Tue Feb 13 06:35:16 2007
@@ -70,14 +70,17 @@
     </target>
 
     <!-- Build the portlib native components -->
-    <target name="build-native" >
-
+    <target name="build-native"
+        depends="-build-native,-build-native-sig,-build-native-thread,-build-native-port" />
+    <target name="-build-native">
        <!-- Build common lib -->
         <make dir="${hy.portlib.src.main.native}/common/${hy.os.family}" />
 
         <!-- Build pool lib -->
         <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}" />
 
@@ -86,7 +89,9 @@
                 <patternset includes="*${shlib.suffix}*" />
             </fileset>
         </copy>
+    </target>
 
+    <target name="-build-native-thread">
         <!-- Build thread dll -->
         <make dir="${hy.portlib.src.main.native}/thread/${hy.os.family}" />
 
@@ -95,7 +100,9 @@
                 <patternset includes="*${shlib.suffix}*" />
             </fileset>
         </copy>
+    </target>
 
+    <target name="-build-native-port">
         <!-- Build port dll -->
         <make dir="${hy.portlib.src.main.native}/port/${hy.os.family}" />
 
@@ -108,13 +115,16 @@
     </target>
 
     <!-- Clean natives -->
-    <target name="clean-native">
-        <make dir="${hy.portlib.src.main.native}/sig/${hy.os.family}" target="clean" />
+    <target name="clean-native" depends="-clean-native-sig">
         <make dir="${hy.portlib.src.main.native}/thread/${hy.os.family}" target="clean" />
         <make dir="${hy.portlib.src.main.native}/port/${hy.os.family}" target="clean" />
         <make dir="${hy.portlib.src.main.native}/common/${hy.os.family}" target="clean" />
         <make dir="${hy.portlib.src.main.native}/pool/${hy.os.family}" target="clean" />
 
+    </target>
+
+    <target name="-clean-native-sig" unless="hy.skip.sig">
+        <make dir="${hy.portlib.src.main.native}/sig/${hy.os.family}" target="clean" />
     </target>
 
     <target name="clean">

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/windows/makefile Tue Feb 13 06:35:16 2007
@@ -26,6 +26,7 @@
 	$(SHAREDSUB)exceptions.obj $(SHAREDSUB)strhelp.obj \
 	locklbl.obj lock386.obj \
 	$(SHAREDSUB)utf8decode.obj $(SHAREDSUB)utf8encode.obj
+MDLLIBFILES =
 
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/pool/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/pool/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/pool/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/pool/windows/makefile Tue Feb 13 06:35:16 2007
@@ -21,5 +21,6 @@
 
 LIBNAME=$(LIBPATH)hypool.lib
 BUILDFILES = $(SHAREDSUB)pool.obj $(SHAREDSUB)pool_cap.obj
+MDLLIBFILES =
 
 !include <$(HY_HDK)\build\make\rules.mak>

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?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- 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 Feb 13 06:35:16 2007
@@ -24,8 +24,10 @@
 
 #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.
@@ -54,9 +56,11 @@
 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?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- 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 Feb 13 06:35:16 2007
@@ -73,7 +73,9 @@
 I_32 VMCALL
 hyport_shutdown_library (struct HyPortLibrary * portLibrary)
 {
+#if !defined(HY_NO_SIG)
   portLibrary->sig_shutdown (portLibrary);
+#endif /* HY_NO_SIG */
   portLibrary->shmem_shutdown (portLibrary);
   portLibrary->shsem_shutdown (portLibrary);
 
@@ -328,11 +330,13 @@
       goto cleanup;
     }
 
+#if !defined(HY_NO_SIG)
   rc = portLibrary->sig_startup (portLibrary);
   if (0 != rc)
     {
       goto cleanup;
     }
+#endif /* HY_NO_SIG */
 
   return rc;
 

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?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- 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 Feb 13 06:35:16 2007
@@ -577,6 +577,7 @@
   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
@@ -615,6 +616,7 @@
   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
@@ -1294,6 +1296,7 @@
   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 */
@@ -1303,6 +1306,17 @@
   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 */
+  NULL,            /* sig_can_protect */
+  NULL,       /* sig_set_async_signal_handler */
+  NULL,                   /* sig_info */
+  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?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- 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 Feb 13 06:35:16 2007
@@ -87,7 +87,9 @@
         }
 
       /* 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?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- 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 Feb 13 06:35:16 2007
@@ -30,10 +30,11 @@
 	$(SHAREDSUB)hyport.o $(SHAREDSUB)hyportcontrol.o hyportptb.o \
 	hysharedhelper.o hyshmem.o hyshsem.o hysl.o hysock.o \
 	$(SHAREDSUB)hystr.o $(SHAREDSUB)hystrftime.o $(SHAREDSUB)hystsl.o \
-	hysysinfo.o hytime.o $(SHAREDSUB)hytlshelpers.o hytty.o hyvmem.o \
-	hysignal.o $(HY_PLATFORM)/hysignal_context.o
+	hysysinfo.o hytime.o $(SHAREDSUB)hytlshelpers.o hytty.o hyvmem.o
 
-MDLLIBFILES = $(DLLPATH)libhythr.so $(LIBPATH)libhycommon.a $(DLLPATH)libhysig.so
+ifeq ($(HY_NO_SIG),false)
+BUILDFILES += hysignal.o $(HY_PLATFORM)/hysignal_context.o
+endif
 
 DLLNAME = ../libhyprt.so
 EXPNAME = HYPRT_0.1

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?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- 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 Feb 13 06:35:16 2007
@@ -32,17 +32,19 @@
   $(SHAREDSUB)hygp.obj hyipcmutex.obj hymem.obj hymmap.obj \
   $(SHAREDSUB)hynls.obj hynlshelpers.obj hyosdump.obj $(SHAREDSUB)hyport.obj \
   $(SHAREDSUB)hyportcontrol.obj hyportptb.obj hyshmem.obj hyshsem.obj \
-  hysignal.obj hysl.obj hysock.obj $(SHAREDSUB)hystr.obj \
+  hysl.obj hysock.obj $(SHAREDSUB)hystr.obj \
   $(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
+
 VIRTFILES = hyprt.res
 
 SYSLIBFILES = \
 	Delayimp.lib -delayload:shell32.dll -delayload:Iphlpapi.dll \
 	ws2_32.lib Iphlpapi.lib shell32.lib
-
-MDLLIBFILES = $(LIBPATH)hythr.lib $(LIBPATH)hycommon.lib $(LIBPATH)hysig.lib
 
 DLLBASE=0x11100000
 COMMENT=/comment:"Platform port library. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable."

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/unix/makefile Tue Feb 13 06:35:16 2007
@@ -21,6 +21,7 @@
 
 CFLAGS += -fpic
 BUILDFILES = $(SHAREDSUB)hysig_copyright.o hysiglinux.o hysigunix.o
+MDLLIBFILES =
 DLLNAME = ../libhysig.so
 EXPNAME = HYSIG_0.1
 

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/windows/makefile Tue Feb 13 06:35:16 2007
@@ -24,6 +24,7 @@
 BUILDFILES = $(SHAREDSUB)hysig_copyright.obj hysigwin.obj
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 VIRTFILES = $(LIBBASE).res
+MDLLIBFILES =
 DLLBASE=0x13100000
 COMMENT=/comment:"Signal handling support DLL. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable."
 

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/unix/makefile Tue Feb 13 06:35:16 2007
@@ -20,8 +20,7 @@
 include $(HY_HDK)/build/make/defines.mk
 
 BUILDFILES = $(SHAREDSUB)hyerror.o
-MDLLIBFILES = $(LIBPATH)libhycommon.a $(DLLPATH)libhyprt.so \
-	$(DLLPATH)libhythr.so $(DLLPATH)libhysig.so
+MDLLIBFILES += $(DLLPATH)libhyprt.so
 EXENAME = ../hyerror
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/windows/makefile Tue Feb 13 06:35:16 2007
@@ -23,7 +23,6 @@
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
 BUILDFILES = $(SHAREDSUB)hyerror.obj
-MDLLIBFILES = $(LIBPATH)hycommon.lib $(LIBPATH)hyprt.lib $(LIBPATH)hythr.lib 
 EXEFLAGS=$(conlflags) -subsystem:console
 EXEDLLFILES=$(conlibsdll)
 

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/unix/makefile Tue Feb 13 06:35:16 2007
@@ -20,8 +20,7 @@
 include $(HY_HDK)/build/make/defines.mk
 
 BUILDFILES = $(SHAREDSUB)hyfile.o
-MDLLIBFILES = $(LIBPATH)libhycommon.a $(DLLPATH)libhyprt.so \
-	$(DLLPATH)libhythr.so $(DLLPATH)libhysig.so
+MDLLIBFILES += $(DLLPATH)libhyprt.so
 EXENAME = ../hyfile
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/windows/makefile Tue Feb 13 06:35:16 2007
@@ -23,7 +23,6 @@
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
 BUILDFILES = $(SHAREDSUB)hyfile.obj
-MDLLIBFILES = $(LIBPATH)hycommon.lib $(LIBPATH)hyprt.lib $(LIBPATH)hythr.lib 
 EXEFLAGS=$(conlflags) -subsystem:console
 EXEDLLFILES=$(conlibsdll)
 

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/unix/makefile Tue Feb 13 06:35:16 2007
@@ -20,8 +20,7 @@
 include $(HY_HDK)/build/make/defines.mk
 
 BUILDFILES = $(SHAREDSUB)hytime.o
-MDLLIBFILES = $(LIBPATH)libhycommon.a $(DLLPATH)libhyprt.so \
-	$(DLLPATH)libhythr.so $(DLLPATH)libhysig.so
+MDLLIBFILES += $(DLLPATH)libhyprt.so
 EXENAME = ../hytime
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/windows/makefile Tue Feb 13 06:35:16 2007
@@ -23,7 +23,6 @@
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
 BUILDFILES = $(SHAREDSUB)hytime.obj
-MDLLIBFILES = $(LIBPATH)hycommon.lib $(LIBPATH)hyprt.lib $(LIBPATH)hythr.lib 
 EXEFLAGS=$(conlflags) -subsystem:console
 EXEDLLFILES=$(conlibsdll)
 

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/unix/makefile Tue Feb 13 06:35:16 2007
@@ -20,8 +20,7 @@
 include $(HY_HDK)/build/make/defines.mk
 
 BUILDFILES = $(SHAREDSUB)init.o
-MDLLIBFILES = $(LIBPATH)libhycommon.a $(DLLPATH)libhyprt.so \
-	$(DLLPATH)libhythr.so $(DLLPATH)libhysig.so
+MDLLIBFILES += $(DLLPATH)libhyprt.so
 EXENAME = ../init
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/windows/makefile Tue Feb 13 06:35:16 2007
@@ -23,7 +23,6 @@
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
 BUILDFILES = $(SHAREDSUB)init.obj
-MDLLIBFILES = $(LIBPATH)hycommon.lib $(LIBPATH)hyprt.lib $(LIBPATH)hythr.lib 
 EXEFLAGS=$(conlflags) -subsystem:console
 EXEDLLFILES=$(conlibsdll)
 

Modified: harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile Tue Feb 13 06:35:16 2007
@@ -24,10 +24,10 @@
 
 BUILDFILES = $(SHAREDSUB)text_copyright.o $(SHAREDSUB)BidiWrapper.o
 
-MDLLIBFILES = \
+MDLLIBFILES += \
 	$(DLLPATH)libicuuc.so.34 \
-	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
 
 DLLNAME = ../libhytext.so
 EXPNAME = HYTEXT_0.1

Modified: harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/makefile?view=diff&rev=507025&r1=507024&r2=507025
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/makefile Tue Feb 13 06:35:16 2007
@@ -28,9 +28,9 @@
 VIRTFILES = hytext.res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = \
-  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib \
-  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib $(LIBPATH)icuuc.lib
+MDLLIBFILES = $(MDLLIBFILES) \
+  $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib \
+  $(LIBPATH)vmi.lib $(LIBPATH)icuuc.lib
 
 DLLBASE=0x13300000
 COMMENT=/comment:"Text component native code. (c) Copyright 1991, 2005 The Apache Software Foundation or its licensors, as applicable."



Mime
View raw message