diff options
| -rw-r--r-- | ChangeLog | 24 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | native/gnu.java.awt.image/.cvsignore | 8 | ||||
| -rw-r--r-- | native/gnu.java.awt.image/Makefile.am | 20 | ||||
| -rw-r--r-- | native/gnu.java.awt.image/gdkpixbufdecoder.c | 252 | ||||
| -rw-r--r-- | resource/Makefile.am | 6 | ||||
| -rw-r--r-- | resource/gnu/.cvsignore | 2 | ||||
| -rw-r--r-- | resource/gnu/Makefile.am | 4 | ||||
| -rw-r--r-- | resource/gnu/java/.cvsignore | 2 | ||||
| -rw-r--r-- | resource/gnu/java/Makefile.am | 4 | ||||
| -rw-r--r-- | resource/gnu/java/awt/.cvsignore | 2 | ||||
| -rw-r--r-- | resource/gnu/java/awt/Makefile.am | 4 | ||||
| -rw-r--r-- | resource/gnu/java/awt/peer/.cvsignore | 2 | ||||
| -rw-r--r-- | resource/gnu/java/awt/peer/Makefile.am | 4 | ||||
| -rw-r--r-- | resource/gnu/java/awt/peer/gtk/.cvsignore | 2 | ||||
| -rw-r--r-- | resource/gnu/java/awt/peer/gtk/Makefile.am | 8 | ||||
| -rw-r--r-- | resource/java/util/Makefile.am | 2 |
18 files changed, 75 insertions, 285 deletions
@@ -1,3 +1,27 @@ +2002-02-07 C. Brian Jones <cbj@gnu.org> + + * configure.in: fixed broken make dist by moving some of the checks + out of an if statement wrapping functionality needed only for + compiling JNI libraries, so unfortunately yes you probably must + have a C compiler even if just compiling the Java source + * Makefile.am: dist-hook to use $(distdir) instead of $(top_distdir) + * native/gnu.java.awt.image: removed directory, needed file was + already part of native/jni/gtk-peer/ directory and library. + * resource/java/util/Makefile.am: updated properties files to + include in distribution + * resource/Makefile.am: include gnu in SUBDIRS + * resource/gnu/Makefile.am: new file + * resource/gnu/.cvsignore: ditto + * resource/gnu/java/Makefile.am: ditto + * resource/gnu/java/.cvsignore: ditto + * resource/gnu/java/awt/Makefile.am: ditto + * resource/gnu/java/awt/.cvsignore: ditto + * resource/gnu/java/awt/peer/Makefile.am: ditto + * resource/gnu/java/awt/peer/.cvsignore: ditto + * resource/gnu/java/awt/peer/gtk/Makefile.am: ditto + * resource/gnu/java/awt/peer/gtk/.cvsignore: ditto + * configure.in: added above Makefiles to output + 2002-02-07 Mark Wielaard <mark@klomp.org> * doc/www.gnu.org/announce/20020208.wml: new file, 0.03 announcement. diff --git a/Makefile.am b/Makefile.am index f358b79ff..292f5fccd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,10 +4,12 @@ SUBDIRS = lib native doc resource com gnu java vm javax native: lib -EXTRA_DIST = HACKING BUGS THANKYOU +EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath dist-hook: - cp -R $(top_srcdir)/include $(top_distdir) + -mkdir $(distdir)/include + cp $(top_srcdir)/include/*.in $(distdir)/include + cp $(top_srcdir)/include/*.h $(distdir)/include ChangeLog: cvs2cl.pl -b --gmt --log-opts "-d'1998-06-30< now'" --window 7200 --usermap ChangeLog.usermap --ignore ChangeLog --fsf diff --git a/configure.in b/configure.in index f5d54ea2d..95997bec8 100644 --- a/configure.in +++ b/configure.in @@ -63,7 +63,6 @@ AC_PROG_LN_S AC_PROG_INSTALL dnl Checks for programs. -if test "${COMPILE_JNI}" = "yes"; then AC_PREREQ(2.52) dnl AC_PROG_CXX @@ -73,6 +72,8 @@ if test "${COMPILE_JNI}" = "yes"; then dnl AC_PROG_AWK AC_PROG_CC AC_PROG_CPP + +if test "${COMPILE_JNI}" = "yes"; then AC_HEADER_STDC AC_CHECK_HEADERS(unistd.h sys/types.h sys/config.h inttypes.h stdint.h) AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED)) @@ -314,6 +315,11 @@ native/jni/java-net/Makefile native/jni/java-util/Makefile native/jni/gtk-peer/Makefile resource/Makefile +resource/gnu/Makefile +resource/gnu/java/Makefile +resource/gnu/java/awt/Makefile +resource/gnu/java/awt/peer/Makefile +resource/gnu/java/awt/peer/gtk/Makefile resource/java/Makefile resource/java/util/Makefile resource/java/security/Makefile diff --git a/native/gnu.java.awt.image/.cvsignore b/native/gnu.java.awt.image/.cvsignore deleted file mode 100644 index e9f2658a6..000000000 --- a/native/gnu.java.awt.image/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -*.o -*.a -*.lo -*.la -.libs -.deps -Makefile -Makefile.in diff --git a/native/gnu.java.awt.image/Makefile.am b/native/gnu.java.awt.image/Makefile.am deleted file mode 100644 index 62b24314b..000000000 --- a/native/gnu.java.awt.image/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -pkglib_LTLIBRARIES = libcpgdkpixbuf.la - -libcpgdkpixbuf_la_SOURCES = \ -gdkpixbufdecoder.c - -libcpgdkpixbuf_la_LDFLAGS = -version-info @LIBVERSION@ $(top_builddir)/native/gnu.java.awt.peer.gtk/libgtkpeer.la @GTK_LIBS@ @GLIB_LIBS@ @LIBART_LIBS@ -lgdk_pixbuf - -INCLUDES += @EXTRA_INCLUDES@ \ - @GTK_CFLAGS@ \ - @LIBART_CFLAGS@ \ - -I$(top_srcdir)/include - -if JAPHAR -install-data-local : - -cd $(pkglibdir) && ln -s libcpgdkpixbuf.so libjaphar_cpgdkpixbuf.so -endif - -clean-local: - -rm -rf .deps - diff --git a/native/gnu.java.awt.image/gdkpixbufdecoder.c b/native/gnu.java.awt.image/gdkpixbufdecoder.c deleted file mode 100644 index a09f499a7..000000000 --- a/native/gnu.java.awt.image/gdkpixbufdecoder.c +++ /dev/null @@ -1,252 +0,0 @@ -/* gdkpixbufdecoder.c - Copyright (C) 1999 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - -#include <gtk/gtk.h> -#include <gdk-pixbuf/gdk-pixbuf.h> -#include <gdk-pixbuf/gdk-pixbuf-loader.h> -#include <libart_lgpl/art_misc.h> -#include <libart_lgpl/art_pixbuf.h> -#include "gnu_java_awt_image_GdkPixbufDecoder.h" - -#define BUFSIZE 4096 - -jmethodID areaPreparedID; -jmethodID areaUpdatedID; -jfieldID getFDID; - -extern JNIEnv *gdk_env; - -#define SWAPU32(w) \ - (((w) << 24) | (((w) & 0xff00) << 8) | (((w) >> 8) & 0xff00) | ((w) >> 24)) - -struct loader_vector -{ - jobject *loader; - jobject *vector; -}; - -JNIEXPORT void JNICALL -Java_gnu_java_awt_image_GdkPixbufDecoder_initState (JNIEnv *env, jclass clazz) -{ - jclass filedescriptor; - - areaPreparedID = (*env)->GetMethodID (env, clazz, - "areaPrepared", - "(Ljava/util/Vector;II)V"); - - areaUpdatedID = (*env)->GetMethodID (env, clazz, - "areaUpdated", - "(Ljava/util/Vector;IIII[II)V"); - - filedescriptor = (*env)->FindClass (env, "java/io/FileDescriptor"); - getFDID = (*env)->GetFieldID (env, filedescriptor, "fd", "I"); -} - -void -area_prepared (GdkPixbufLoader *loader, struct loader_vector *lv) -{ - ArtPixBuf *pixbuf; - - pixbuf = gdk_pixbuf_loader_get_pixbuf (loader)->art_pixbuf; - - printf ("AREA PREPARED\n"); - - return; - - gdk_threads_leave (); - (*gdk_env)->CallVoidMethod (gdk_env, - *(lv->loader), - areaPreparedID, - *(lv->vector), - (jint) pixbuf->width, - (jint) pixbuf->height); - gdk_threads_enter (); -} - -void -area_updated (GdkPixbufLoader *loader, - gint x, gint y, - gint width, gint height, - struct loader_vector *lv) -{ - ArtPixBuf *pixbuf; - jintArray jpixels; - jint *pixels, scansize, num_pixels; - - printf ("AREA UPDATED\n"); - - pixbuf = gdk_pixbuf_loader_get_pixbuf (loader)->art_pixbuf; - - g_return_if_fail (pixbuf->format == ART_PIX_RGB); - g_return_if_fail (pixbuf->bits_per_sample == 8); - g_return_if_fail (pixbuf->n_channels == 3 + (pixbuf->has_alpha != 0)); - - scansize = pixbuf->rowstride / pixbuf->n_channels; - num_pixels = height * scansize; - jpixels = (*gdk_env)->NewIntArray (gdk_env, num_pixels); - pixels = (*gdk_env)->GetIntArrayElements (gdk_env, jpixels, NULL); - - if (pixbuf->has_alpha) - { - memcpy (pixels, pixbuf->pixels + - (y * pixbuf->rowstride + (x << 2)), - height * pixbuf->rowstride); - } - else /* add in alpha data */ - { - int i; - art_u8 *src, *dest; - - src = pixbuf->pixels + (y * pixbuf->rowstride + x * 3); - dest = (art_u8 *) pixels; - - for (i = 0; i < num_pixels; i++) - { - *dest++ = *src++; /* red */ - *dest++ = *src++; /* green */ - *dest++ = *src++; /* blue */ - *dest++ = 0xff; /* alpha */ - } - } - - gdk_threads_leave (); - -#ifndef WORDS_BIGENDIAN - { - int i; - for (i = 0; i < num_pixels; i++) - pixels[i] = SWAPU32 ((unsigned)pixels[i]); - } -#endif - - (*gdk_env)->ReleaseIntArrayElements (gdk_env, jpixels, pixels, 0); - - (*gdk_env)->CallVoidMethod (gdk_env, - *(lv->loader), - areaUpdatedID, - *(lv->vector), - (jint) x, (jint) y, - (jint) width, (jint) height, - jpixels, - scansize); - gdk_threads_enter (); -} - -void -closed (GdkPixbufLoader *loader, struct loader_vector *lv) -{ - printf ("IN CLOSED CALLBACK\n"); - - gdk_threads_leave (); - - (*gdk_env)->DeleteGlobalRef (gdk_env, *(lv->loader)); - (*gdk_env)->DeleteGlobalRef (gdk_env, *(lv->vector)); - - free (lv->loader); - free (lv->vector); - free (lv); - - gdk_threads_enter (); -} - -JNIEXPORT void JNICALL Java_gnu_java_awt_image_GdkPixbufDecoder_loaderWrite - (JNIEnv *env, jobject obj, jobject vector, jobject fd_obj) -{ - jint fd; - GdkPixbufLoader *loader; - guchar buf[BUFSIZE]; - ssize_t num_read; - struct loader_vector *lv; - ArtPixBuf *pixbuf; - - fd = (*env)->GetIntField (env, fd_obj, getFDID) - 1; - - lv = (struct loader_vector *) malloc (sizeof (struct loader_vector)); - - lv->loader = (jobject *) malloc (sizeof (jobject)); - *(lv->loader) = (*env)->NewGlobalRef (env, obj); - - lv->vector = (jobject *) malloc (sizeof (jobject)); - *(lv->vector) = (*env)->NewGlobalRef (env, vector); - - gdk_threads_enter (); - loader = gdk_pixbuf_loader_new (); - - gtk_signal_connect (GTK_OBJECT (loader), - "area_prepared", - GTK_SIGNAL_FUNC (area_prepared), - lv); - - gtk_signal_connect (GTK_OBJECT (loader), - "area_updated", - GTK_SIGNAL_FUNC (area_updated), - lv); - - gtk_signal_connect (GTK_OBJECT (loader), - "closed", - GTK_SIGNAL_FUNC (closed), - lv); - gdk_threads_leave (); - - do - { - num_read = read (fd, buf, BUFSIZE); - - /* we should throw an exception here */ - if (num_read < 0) - perror ("error while reading fd"); - - gdk_threads_enter (); - gdk_pixbuf_loader_write (loader, buf, num_read); - gdk_threads_leave (); - - } while (num_read > 0); - -/* gdk_threads_enter (); */ -/* pixbuf = gdk_pixbuf_loader_get_pixbuf (loader)->art_pixbuf; */ - -/* gtk_signal_emit_by_name (GTK_OBJECT (loader), "area_updated", 0, 0, */ -/* pixbuf->width, pixbuf->height, NULL); */ -/* gdk_threads_leave (); */ - -/* printf ("READY TO CLOSE!\n"); */ - -/* gdk_threads_enter (); */ -/* gdk_pixbuf_loader_close (loader); */ -/* gtk_object_destroy (GTK_OBJECT (loader)); */ -/* gdk_threads_leave (); */ -} diff --git a/resource/Makefile.am b/resource/Makefile.am index 13cccf6f0..446718878 100644 --- a/resource/Makefile.am +++ b/resource/Makefile.am @@ -1,5 +1,7 @@ ## used by automake to generate Makefile.in -SUBDIRS = java +SUBDIRS = gnu java -EXTRA_DIST=japhar-0.09.patch.1 +EXTRA_DIST = \ + orp-1.0.8.patch \ + orp-1.0.9.patch diff --git a/resource/gnu/.cvsignore b/resource/gnu/.cvsignore new file mode 100644 index 000000000..282522db0 --- /dev/null +++ b/resource/gnu/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/resource/gnu/Makefile.am b/resource/gnu/Makefile.am new file mode 100644 index 000000000..8b1b73918 --- /dev/null +++ b/resource/gnu/Makefile.am @@ -0,0 +1,4 @@ +## used by automake to generate Makefile.in + +SUBDIRS = java + diff --git a/resource/gnu/java/.cvsignore b/resource/gnu/java/.cvsignore new file mode 100644 index 000000000..282522db0 --- /dev/null +++ b/resource/gnu/java/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/resource/gnu/java/Makefile.am b/resource/gnu/java/Makefile.am new file mode 100644 index 000000000..1b2f4fba3 --- /dev/null +++ b/resource/gnu/java/Makefile.am @@ -0,0 +1,4 @@ +## used by automake to generate Makefile.in + +SUBDIRS = awt + diff --git a/resource/gnu/java/awt/.cvsignore b/resource/gnu/java/awt/.cvsignore new file mode 100644 index 000000000..282522db0 --- /dev/null +++ b/resource/gnu/java/awt/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/resource/gnu/java/awt/Makefile.am b/resource/gnu/java/awt/Makefile.am new file mode 100644 index 000000000..1f7e25964 --- /dev/null +++ b/resource/gnu/java/awt/Makefile.am @@ -0,0 +1,4 @@ +## used by automake to generate Makefile.in + +SUBDIRS = peer + diff --git a/resource/gnu/java/awt/peer/.cvsignore b/resource/gnu/java/awt/peer/.cvsignore new file mode 100644 index 000000000..282522db0 --- /dev/null +++ b/resource/gnu/java/awt/peer/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/resource/gnu/java/awt/peer/Makefile.am b/resource/gnu/java/awt/peer/Makefile.am new file mode 100644 index 000000000..5ce6bc44c --- /dev/null +++ b/resource/gnu/java/awt/peer/Makefile.am @@ -0,0 +1,4 @@ +## used by automake to generate Makefile.in + +SUBDIRS = gtk + diff --git a/resource/gnu/java/awt/peer/gtk/.cvsignore b/resource/gnu/java/awt/peer/gtk/.cvsignore new file mode 100644 index 000000000..282522db0 --- /dev/null +++ b/resource/gnu/java/awt/peer/gtk/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/resource/gnu/java/awt/peer/gtk/Makefile.am b/resource/gnu/java/awt/peer/gtk/Makefile.am new file mode 100644 index 000000000..0f749e85e --- /dev/null +++ b/resource/gnu/java/awt/peer/gtk/Makefile.am @@ -0,0 +1,8 @@ +## used by automake to generate Makefile.in + +EXTRA_DIST = \ + font.properties + +install-data-local: + $(mkinstalldirs) $(DESTDIR)$(libdir)/awt + $(INSTALL_DATA) $(srcdir)/font.properties $(DESTDIR)$(libdir)/awt/font.properties diff --git a/resource/java/util/Makefile.am b/resource/java/util/Makefile.am index edfe7bdb6..8a1742d43 100644 --- a/resource/java/util/Makefile.am +++ b/resource/java/util/Makefile.am @@ -2,9 +2,11 @@ EXTRA_DIST = \ iso3166-a3.properties \ +iso3166_de.properties \ iso3166.properties \ iso639-a2-old.properties \ iso639-a3.properties \ +iso639_de.properties \ iso639.properties \ iso639_fr.properties \ iso639_ga.properties |