fix cacao/gennativetable to not crash on zipfile input, whole classpath in cacaodev...

diff --git a/Makefile.am b/Makefile.am
index 85c73ace61fdab0883f6f3f8e7d0cd002fd2dbab..01d032c11c780bc51deceddc3a7ff163f482bc83 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Process this file with automake to produce Makefile.in
 

-# $Id: Makefile.am 1262 2004-07-01 11:10:43Z jowenn $
+# $Id: Makefile.am 1264 2004-07-01 14:21:05Z jowenn $

 
 @SET_MAKE@
 
 MAINTAINERCLEANFILES = Makefile.in configure
 ALLSUBDIRS = mm toolbox threads jit nat tst doc jvmtst
 
 @SET_MAKE@
 
 MAINTAINERCLEANFILES = Makefile.in configure
 ALLSUBDIRS = mm toolbox threads jit nat tst doc jvmtst

-SUBDIRS = gnuclasspathnat $(ALLSUBDIRS)
+SUBDIRS = classpath $(ALLSUBDIRS)

 DIST_SUBDIRS = $(ALLSUBDIRS)
 
 EXTRA_DIST = \
 DIST_SUBDIRS = $(ALLSUBDIRS)
 
 EXTRA_DIST = \


@@ -60,12 +60,12 @@ cacao_LDADD = \
        $(BOEHM_LIBS) \
        @THREAD_OBJ@ \
        toolbox/libtoolbox.a \
        $(BOEHM_LIBS) \
        @THREAD_OBJ@ \
        toolbox/libtoolbox.a \

-       gnuclasspathnat/native/jni/java-io/.libs/libjavaio.a \
-       gnuclasspathnat/native/jni/java-nio/.libs/libjavanio.a \
-       gnuclasspathnat/native/jni/java-net/.libs/libjavanet.a \
-       gnuclasspathnat/native/jni/java-util/.libs/libjavautil.a \
-       gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
-       gnuclasspathnat/native/jni/java-lang/.libs/libjavalangreflect.a \
+       classpath/native/jni/java-io/.libs/libjavaio.a \
+       classpath/native/jni/java-nio/.libs/libjavanio.a \
+       classpath/native/jni/java-net/.libs/libjavanet.a \
+       classpath/native/jni/java-util/.libs/libjavautil.a \
+       classpath/native/jni/java-lang/.libs/libjavalang.a \
+       classpath/native/jni/java-lang/.libs/libjavalangreflect.a \

        @AWT_OBJS@ \
        @ZIP_LIBS@ \
        @THREAD_LIB@
        @AWT_OBJS@ \
        @ZIP_LIBS@ \
        @THREAD_LIB@


@@ -79,12 +79,12 @@ cacao_DEPENDENCIES = \
        $(BOEHM_LIBS) \
        @THREAD_OBJ@ \
        toolbox/libtoolbox.a \
        $(BOEHM_LIBS) \
        @THREAD_OBJ@ \
        toolbox/libtoolbox.a \

-       gnuclasspathnat/native/jni/java-io/.libs/libjavaio.a \
-       gnuclasspathnat/native/jni/java-nio/.libs/libjavanio.a \
-       gnuclasspathnat/native/jni/java-net/.libs/libjavanet.a \
-       gnuclasspathnat/native/jni/java-util/.libs/libjavautil.a \
-       gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
-       gnuclasspathnat/native/jni/java-lang/.libs/libjavalangreflect.a \
+       classpath/native/jni/java-io/.libs/libjavaio.a \
+       classpath/native/jni/java-nio/.libs/libjavanio.a \
+       classpath/native/jni/java-net/.libs/libjavanet.a \
+       classpath/native/jni/java-util/.libs/libjavautil.a \
+       classpath/native/jni/java-lang/.libs/libjavalang.a \
+       classpath/native/jni/java-lang/.libs/libjavalangreflect.a \

        nativetable.inc \
        @AWT_OBJS@ \
        @ZIP_LIBS@
        nativetable.inc \
        @AWT_OBJS@ \
        @ZIP_LIBS@


@@ -101,7 +101,7 @@ cacaoh_SOURCES = \
 
 cacaoh_LDADD = \
        $(BOEHM_LIBS) \
 
 cacaoh_LDADD = \
        $(BOEHM_LIBS) \

-       gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
+       classpath/native/jni/java-lang/.libs/libjavalang.a \

        @THREAD_OBJ@ \
        @ZIP_LIBS@ \
        toolbox/libtoolbox.a \
        @THREAD_OBJ@ \
        @ZIP_LIBS@ \
        toolbox/libtoolbox.a \


@@ -109,7 +109,7 @@ cacaoh_LDADD = \
 
 cacaoh_DEPENDENCIES = \
        $(BOEHM_LIBS) \
 
 cacaoh_DEPENDENCIES = \
        $(BOEHM_LIBS) \

-       gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
+       classpath/native/jni/java-lang/.libs/libjavalang.a \

        @THREAD_OBJ@ \
        @ZIP_LIBS@ \
        toolbox/libtoolbox.a
        @THREAD_OBJ@ \
        @ZIP_LIBS@ \
        toolbox/libtoolbox.a


@@ -126,17 +126,17 @@ gennativetable_SOURCES = \
 
 gennativetable_LDADD = \
        $(BOEHM_LIBS) \
 
 gennativetable_LDADD = \
        $(BOEHM_LIBS) \

-       gnuclasspathnat/native/jni/java-lang/.libs/libjavalang.a \
+       classpath/native/jni/java-lang/.libs/libjavalang.a \

        @THREAD_OBJ@ \
        @ZIP_LIBS@ \
        toolbox/libtoolbox.a \
        @THREAD_LIB@
 
 natheaders: cacaoh
        @THREAD_OBJ@ \
        @ZIP_LIBS@ \
        toolbox/libtoolbox.a \
        @THREAD_LIB@
 
 natheaders: cacaoh

-       CLASSPATH=$(top_srcdir)/gnuclassfiles ./cacaoh $(CLASSES)
+       CLASSPATH=$(top_srcdir)/classpath/lib/glibj.zip ./cacaoh $(CLASSES)

 
 nativetable.inc: gennativetable
 
 nativetable.inc: gennativetable

-       CLASSPATH=$(top_srcdir)/gnuclassfiles $(top_srcdir)/gennativetable $(CLASSES) > nativetable.inc
+       CLASSPATH=$(top_srcdir)/classpath/lib/glibj.zip $(top_srcdir)/gennativetable $(CLASSES) > nativetable.inc

 
 CLASSES= \
        java.lang.String \
 
 CLASSES= \
        java.lang.String \

diff --git a/autogen.sh b/autogen.sh
index 34506388a3baeb3bf1455a287779272d7e6b1b96..d8c57353bbdd1af6b7be5ff99b336c8741edf94a 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,5 +6,5 @@ automake --add-missing --include-deps
 autoconf
 
 cd mm/boehm-gc && ./autogen.sh && cd ../..
 autoconf
 
 cd mm/boehm-gc && ./autogen.sh && cd ../..

-cd gnuclasspathnat && ./autogen.sh && cd ../..
+cd classpath && rm -f configure configure_int &&./autogen.sh && mv configure configure_int && cp cacaoconfigure configure && cd ../..

 
 

diff --git a/cacaoh.c b/cacaoh.c
index ca6f688ba956d1e85c17c0efb6ef373714f0e398..a99a948261d27a563e29f65bf6de2a15ad6b9ed0 100644 (file)
--- a/cacaoh.c
+++ b/cacaoh.c
@@ -30,7 +30,7 @@
             Philipp Tomsich
             Christian Thalinger
 
             Philipp Tomsich
             Christian Thalinger
 

-   $Id: cacaoh.c 1242 2004-06-30 20:11:49Z twisti $
+   $Id: cacaoh.c 1264 2004-07-01 14:21:05Z jowenn $

 
 */
 
 
 */
 


@@ -91,9 +91,10 @@ int main(int argc, char **argv)
        /* initialize the garbage collector */
        gc_init(heapmaxsize, heapstartsize);
 
        /* initialize the garbage collector */
        gc_init(heapmaxsize, heapstartsize);
 

+       tables_init();
+

        suck_init(classpath);
    
        suck_init(classpath);
    

-       tables_init();

 
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
        initThreadsEarly();
 
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
        initThreadsEarly();

diff --git a/configure.in b/configure.in
index 7e7135b016ea1d8780a7eb771ed47d02fcd59bb7..1019ce830ff11f52f6f2f5cc775255f8729944f6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -258,7 +258,7 @@ if test x"$enable_gtk_peer" = "xyes"; then
                gnu.java.awt.peer.gtk.GtkCheckboxMenuItemPeer \
                gnu.java.awt.peer.gtk.GtkClipboard \
                gnu.java.awt.peer.gtk.GtkWindowPeer"
                gnu.java.awt.peer.gtk.GtkCheckboxMenuItemPeer \
                gnu.java.awt.peer.gtk.GtkClipboard \
                gnu.java.awt.peer.gtk.GtkWindowPeer"

-               AWT_OBJS="gnuclasspathnat/native/jni/gtk-peer/.libs/libgtkpeer.a \
+               AWT_OBJS="classpath/native/jni/gtk-peer/.libs/libgtkpeer.a \

                        -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 \
                        -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 \
                        -lgthread-2.0 -lart_lgpl_2"
                        -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 \
                        -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 \
                        -lgthread-2.0 -lart_lgpl_2"


@@ -281,7 +281,7 @@ fi
 dnl now configure boehm gc and gnu classpath
 dnl the export is not my favorite (is there another way?)
 export CFLAGS
 dnl now configure boehm gc and gnu classpath
 dnl the export is not my favorite (is there another way?)
 export CFLAGS

-AC_CONFIG_SUBDIRS(mm/boehm-gc gnuclasspathnat)
+AC_CONFIG_SUBDIRS(mm/boehm-gc classpath)

 
 AC_OUTPUT(Makefile \
           mm/Makefile \
 
 AC_OUTPUT(Makefile \
           mm/Makefile \

diff --git a/gennativetable.c b/gennativetable.c
index 736dca0c57b1a7a765200cb7d28a5023d42f6e23..dc51e83b07514939c2289c3e1265896b3a129698 100644 (file)
--- a/gennativetable.c
+++ b/gennativetable.c
@@ -28,7 +28,7 @@
 
    Changes:
 
 
    Changes:
 

-   $Id: gennativetable.c 1260 2004-06-30 22:26:21Z stefan $
+   $Id: gennativetable.c 1264 2004-07-01 14:21:05Z jowenn $

 
 */
 
 
 */
 


@@ -78,9 +78,10 @@ int main(int argc, char **argv)
        /* initialize the garbage collector */
        gc_init(heapmaxsize, heapstartsize);
 
        /* initialize the garbage collector */
        gc_init(heapmaxsize, heapstartsize);
 

+       tables_init();
+

        suck_init(classpath);
    
        suck_init(classpath);
    

-       tables_init();

 
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
        initThreadsEarly();
 
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
        initThreadsEarly();

diff --git a/src/cacaoh/cacaoh.c b/src/cacaoh/cacaoh.c
index ca6f688ba956d1e85c17c0efb6ef373714f0e398..a99a948261d27a563e29f65bf6de2a15ad6b9ed0 100644 (file)
--- a/src/cacaoh/cacaoh.c
+++ b/src/cacaoh/cacaoh.c
@@ -30,7 +30,7 @@
             Philipp Tomsich
             Christian Thalinger
 
             Philipp Tomsich
             Christian Thalinger
 

-   $Id: cacaoh.c 1242 2004-06-30 20:11:49Z twisti $
+   $Id: cacaoh.c 1264 2004-07-01 14:21:05Z jowenn $

 
 */
 
 
 */
 


@@ -91,9 +91,10 @@ int main(int argc, char **argv)
        /* initialize the garbage collector */
        gc_init(heapmaxsize, heapstartsize);
 
        /* initialize the garbage collector */
        gc_init(heapmaxsize, heapstartsize);
 

+       tables_init();
+

        suck_init(classpath);
    
        suck_init(classpath);
    

-       tables_init();

 
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
        initThreadsEarly();
 
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
        initThreadsEarly();

diff --git a/src/native/tools/gennativetable.c b/src/native/tools/gennativetable.c
index 736dca0c57b1a7a765200cb7d28a5023d42f6e23..dc51e83b07514939c2289c3e1265896b3a129698 100644 (file)
--- a/src/native/tools/gennativetable.c
+++ b/src/native/tools/gennativetable.c
@@ -28,7 +28,7 @@
 
    Changes:
 
 
    Changes:
 

-   $Id: gennativetable.c 1260 2004-06-30 22:26:21Z stefan $
+   $Id: gennativetable.c 1264 2004-07-01 14:21:05Z jowenn $

 
 */
 
 
 */
 


@@ -78,9 +78,10 @@ int main(int argc, char **argv)
        /* initialize the garbage collector */
        gc_init(heapmaxsize, heapstartsize);
 
        /* initialize the garbage collector */
        gc_init(heapmaxsize, heapstartsize);
 

+       tables_init();
+

        suck_init(classpath);
    
        suck_init(classpath);
    

-       tables_init();

 
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
        initThreadsEarly();
 
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
        initThreadsEarly();

diff --git a/src/vm/unzip.c b/src/vm/unzip.c
index efe73c94c0ee323737bf92443e533b3ed77cae30..9741848f318b9d1e5890351a570db04bba5c3d04 100644 (file)
--- a/src/vm/unzip.c
+++ b/src/vm/unzip.c
@@ -748,7 +748,7 @@ void cacao_create_directoryList(unzFile file)
                if (c) *c='\0';
                ent->name=utf_new_char(filename);
        };
                if (c) *c='\0';
                ent->name=utf_new_char(filename);
        };

-       printf("Archive contains %d files\n",i);
+       /*printf("Archive contains %d files\n",i);*/

 }
 
 
 }
 
 

diff --git a/unzip.c b/unzip.c
index efe73c94c0ee323737bf92443e533b3ed77cae30..9741848f318b9d1e5890351a570db04bba5c3d04 100644 (file)
--- a/unzip.c
+++ b/unzip.c
@@ -748,7 +748,7 @@ void cacao_create_directoryList(unzFile file)
                if (c) *c='\0';
                ent->name=utf_new_char(filename);
        };
                if (c) *c='\0';
                ent->name=utf_new_char(filename);
        };

-       printf("Archive contains %d files\n",i);
+       /*printf("Archive contains %d files\n",i);*/

 }
 
 
 }