diff --git a/CHANGES.current b/CHANGES.current index a9b189dc1..613c26851 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -6,6 +6,11 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/ Version 4.0.0 (in progress) =========================== +2017-10-09: olly + Remove GCJ support. It isn't in a good state and doesn't seem to + be used, and GCC7 dropped GCJ. Closes + https://sourceforge.net/p/swig/bugs/823/ + 2017-10-07: olly Fix preprocessor handling of empty macro arguments to match that of C/C++ compilers. Fixes https://github.com/swig/swig/pull/1111 and diff --git a/Examples/perl5/check.list b/Examples/perl5/check.list index dda849311..78d45fc0b 100644 --- a/Examples/perl5/check.list +++ b/Examples/perl5/check.list @@ -6,7 +6,6 @@ constants2 extend funcptr import -java multimap multiple_inheritance pointer diff --git a/Examples/perl5/java/Example.java b/Examples/perl5/java/Example.java deleted file mode 100644 index 91ddb1ac5..000000000 --- a/Examples/perl5/java/Example.java +++ /dev/null @@ -1,29 +0,0 @@ -public class Example { - public int mPublicInt; - - public Example() { - mPublicInt = 0; - } - - public Example(int IntVal) { - mPublicInt = IntVal; - } - - - public int Add(int a, int b) { - return (a+b); - } - - public float Add(float a, float b) { - return (a+b); - } - - public String Add(String a, String b) { - return (a+b); - } - - public Example Add(Example a, Example b) { - return new Example(a.mPublicInt + b.mPublicInt); - } -} - diff --git a/Examples/perl5/java/Makefile b/Examples/perl5/java/Makefile deleted file mode 100644 index 7c133235f..000000000 --- a/Examples/perl5/java/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -TOP = ../.. -SWIGEXE = $(TOP)/../swig -SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib -CXXSRCS = -TARGET = example -INTERFACE = example.i -LIBS = -lm - -check: build - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' perl5_run - -build: Example.class Example.h - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' \ - SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - CXXSHARED="gcj -fpic -shared Example.class" PERL5_CCFLAGS='' PERL5_EXP='' LIBS="-lstdc++" perl5_cpp - -clean: - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' perl5_clean - rm -f *.class Example.h - -Example.class Example.h: $(SRCDIR)Example.java - gcj -d . -fPIC -C -c -g $(SRCDIR)Example.java - gcjh Example.class diff --git a/Examples/perl5/java/example.i b/Examples/perl5/java/example.i deleted file mode 100644 index a82abb267..000000000 --- a/Examples/perl5/java/example.i +++ /dev/null @@ -1,10 +0,0 @@ -%module example - -%include - -%{ -#include "Example.h" -%} - - -%include Example.h diff --git a/Examples/perl5/java/runme.pl b/Examples/perl5/java/runme.pl deleted file mode 100644 index 56ad6e408..000000000 --- a/Examples/perl5/java/runme.pl +++ /dev/null @@ -1,29 +0,0 @@ -use example; - -example::JvCreateJavaVM(undef); -example::JvAttachCurrentThread(undef, undef); - -$e1 = new example::Example(1); -print $e1->{mPublicInt},"\n"; - -$e2 = new example::Example(2); -print $e2->{mPublicInt},"\n"; - -$i = $e1->Add(1,2); -print $i,"\n"; - -$d = $e2->Add(1.0,2.0); -print $d,"\n"; - -$d = $e2->Add("1","2"); -print $d,"\n"; - -$e3 = $e1->Add($e1,$e2); -print $e3->{mPublicInt},"\n"; - - -$s = $e2->Add("a","b"); -print $s,"\n"; - - -example::JvDetachCurrentThread() diff --git a/Examples/python/check.list b/Examples/python/check.list index a43a5fca0..73182025d 100644 --- a/Examples/python/check.list +++ b/Examples/python/check.list @@ -14,7 +14,6 @@ functor import import_template import_packages -java #libffi multimap operator diff --git a/Examples/python/java/Example.java b/Examples/python/java/Example.java deleted file mode 100644 index 91ddb1ac5..000000000 --- a/Examples/python/java/Example.java +++ /dev/null @@ -1,29 +0,0 @@ -public class Example { - public int mPublicInt; - - public Example() { - mPublicInt = 0; - } - - public Example(int IntVal) { - mPublicInt = IntVal; - } - - - public int Add(int a, int b) { - return (a+b); - } - - public float Add(float a, float b) { - return (a+b); - } - - public String Add(String a, String b) { - return (a+b); - } - - public Example Add(Example a, Example b) { - return new Example(a.mPublicInt + b.mPublicInt); - } -} - diff --git a/Examples/python/java/Makefile b/Examples/python/java/Makefile deleted file mode 100644 index 7c75e6b91..000000000 --- a/Examples/python/java/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -TOP = ../.. -SWIGEXE = $(TOP)/../swig -SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib -CXXSRCS = -TARGET = example -INTERFACE = example.i -LIBS = -lm - -check: build - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_run - -build: Example.class Example.h - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' \ - SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - CXXSHARED="gcj -fpic -shared Example.class" DEFS='' LIBS="-lstdc++" python_cpp - -clean: - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_clean - rm -f $(TARGET).py - rm -f *.class Example.h - -Example.class Example.h: $(SRCDIR)Example.java - gcj -d . -fPIC -C -c -g $(SRCDIR)Example.java - gcjh Example.class diff --git a/Examples/python/java/example.i b/Examples/python/java/example.i deleted file mode 100644 index 80e08870f..000000000 --- a/Examples/python/java/example.i +++ /dev/null @@ -1,13 +0,0 @@ -%module example -%include - -%{ -#include "Example.h" -%} - - -%include Example.h - -%extend Example { - ~Example() {} -} diff --git a/Examples/python/java/runme.py b/Examples/python/java/runme.py deleted file mode 100644 index 641ba27dd..000000000 --- a/Examples/python/java/runme.py +++ /dev/null @@ -1,16 +0,0 @@ -from example import * - -JvCreateJavaVM(None) -JvAttachCurrentThread(None, None) - -e1 = Example(1) -e2 = Example(2) - -print e1.Add(1, 2) -print e1.Add(1.0, 2.0) -e3 = e1.Add(e1, e2) -print e3.mPublicInt - -print e1.Add("1", "2") - -JvDetachCurrentThread() diff --git a/Examples/ruby/check.list b/Examples/ruby/check.list index 2e581fb82..bdc2736ad 100644 --- a/Examples/ruby/check.list +++ b/Examples/ruby/check.list @@ -9,7 +9,6 @@ functor hashargs import import_template -java mark_function multimap operator diff --git a/Examples/ruby/java/Example.java b/Examples/ruby/java/Example.java deleted file mode 100644 index 91ddb1ac5..000000000 --- a/Examples/ruby/java/Example.java +++ /dev/null @@ -1,29 +0,0 @@ -public class Example { - public int mPublicInt; - - public Example() { - mPublicInt = 0; - } - - public Example(int IntVal) { - mPublicInt = IntVal; - } - - - public int Add(int a, int b) { - return (a+b); - } - - public float Add(float a, float b) { - return (a+b); - } - - public String Add(String a, String b) { - return (a+b); - } - - public Example Add(Example a, Example b) { - return new Example(a.mPublicInt + b.mPublicInt); - } -} - diff --git a/Examples/ruby/java/Makefile b/Examples/ruby/java/Makefile deleted file mode 100644 index bec5e1844..000000000 --- a/Examples/ruby/java/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -TOP = ../.. -SWIGEXE = $(TOP)/../swig -SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib -CXXSRCS = -TARGET = example -INTERFACE = example.i -LIBS = -lm - -check: build - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' ruby_run - -build: Example.class Example.h - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' \ - SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - CXXSHARED="gcj -fpic -shared Example.class" LIBS="-lstdc++" DEFS='' ruby_cpp - -clean: - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' ruby_clean - rm -f *.class Example.h - -Example.class Example.h: $(SRCDIR)Example.java - gcj -d . -fPIC -C -c -g $(SRCDIR)Example.java - gcjh Example.class diff --git a/Examples/ruby/java/example.i b/Examples/ruby/java/example.i deleted file mode 100644 index 13d5b5e70..000000000 --- a/Examples/ruby/java/example.i +++ /dev/null @@ -1,9 +0,0 @@ -%module example -%include - -%{ -#include "Example.h" -%} - - -%include Example.h diff --git a/Examples/ruby/java/runme.rb b/Examples/ruby/java/runme.rb deleted file mode 100644 index fc018b70c..000000000 --- a/Examples/ruby/java/runme.rb +++ /dev/null @@ -1,18 +0,0 @@ -require 'example' - -Example.JvCreateJavaVM(nil) -Example.JvAttachCurrentThread(nil, nil) - -e1 = Example::Example.new(1) -e2 = Example::Example.new(2) - -print e1.Add(1,2),"\n" -print e1.Add(1.0,2.0),"\n" -e3 = e1.Add(e1,e2) -print e3.mPublicInt,"\n" - - -print e1.Add("1","2"),"\n" - -Example.JvDetachCurrentThread() - diff --git a/Examples/tcl/check.list b/Examples/tcl/check.list index 8e7a8a9d7..31d26261b 100644 --- a/Examples/tcl/check.list +++ b/Examples/tcl/check.list @@ -5,7 +5,6 @@ contract enum funcptr import -java multimap operator pointer diff --git a/Examples/tcl/java/Example.java b/Examples/tcl/java/Example.java deleted file mode 100644 index 91ddb1ac5..000000000 --- a/Examples/tcl/java/Example.java +++ /dev/null @@ -1,29 +0,0 @@ -public class Example { - public int mPublicInt; - - public Example() { - mPublicInt = 0; - } - - public Example(int IntVal) { - mPublicInt = IntVal; - } - - - public int Add(int a, int b) { - return (a+b); - } - - public float Add(float a, float b) { - return (a+b); - } - - public String Add(String a, String b) { - return (a+b); - } - - public Example Add(Example a, Example b) { - return new Example(a.mPublicInt + b.mPublicInt); - } -} - diff --git a/Examples/tcl/java/Makefile b/Examples/tcl/java/Makefile deleted file mode 100644 index e4dfc536b..000000000 --- a/Examples/tcl/java/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -TOP = ../.. -SWIGEXE = $(TOP)/../swig -SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib -CXXSRCS = -TARGET = example -INTERFACE = example.i -LIBS = -lm - -check: build - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' tcl_run - -build: Example.class Example.h - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' \ - SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ - TCLCXXSHARED="gcj -fpic -shared Example.class " LIBS="-lstdc++" DEFS='' tcl_cpp - -clean: - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' tcl_clean - rm -f *.class Example.h - -Example.class Example.h: $(SRCDIR)Example.java - gcj -d . -fPIC -C -c -g $(SRCDIR)Example.java - gcjh Example.class diff --git a/Examples/tcl/java/example.i b/Examples/tcl/java/example.i deleted file mode 100644 index b69d83f8d..000000000 --- a/Examples/tcl/java/example.i +++ /dev/null @@ -1,8 +0,0 @@ -%module example -%include - -%{ -#include "Example.h" -%} - -%include Example.h diff --git a/Examples/tcl/java/runme.tcl b/Examples/tcl/java/runme.tcl deleted file mode 100644 index 6caf0079f..000000000 --- a/Examples/tcl/java/runme.tcl +++ /dev/null @@ -1,15 +0,0 @@ -catch { load ./example[info sharedlibextension] example} - -JvCreateJavaVM NULL -JvAttachCurrentThread NULL NULL -Example e1 1 -Example e2 2 - -puts "[e1 cget -mPublicInt]" -puts "[e2 cget -mPublicInt]" - -puts "[e2 Add 1 2]" -puts "[e2 Add 1.0 2.0]" -puts "[e2 Add '1' '2']" - -JvDetachCurrentThread diff --git a/Lib/gcj/cni.i b/Lib/gcj/cni.i deleted file mode 100644 index fcc56687a..000000000 --- a/Lib/gcj/cni.i +++ /dev/null @@ -1,39 +0,0 @@ -%{ -#include -%} - -%include - -extern void JvInitClass (jclass cls); - -extern jstring JvAllocString (jsize sz); - -extern jstring JvNewString (const jchar *chars, jsize len); - -extern jstring JvNewStringLatin1 (const char *bytes, jsize len); - -extern jstring JvNewStringLatin1 (const char *bytes); - -extern jchar* JvGetStringChars (jstring str); - -extern jsize JvGetStringUTFLength (jstring string); - -extern jsize JvGetStringUTFRegion (jstring str, jsize start, jsize len, char *buf); - -extern jstring JvNewStringUTF (const char *bytes); - -extern void *JvMalloc (jsize size); - -extern void JvFree (void *ptr); - -extern jint JvCreateJavaVM (JvVMInitArgs* vm_args); - -extern java::lang::Thread* JvAttachCurrentThread (jstring name, java::lang::ThreadGroup* group); - -extern java::lang::Thread* JvAttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group); - -extern jint JvDetachCurrentThread (void); - - -%include - diff --git a/Lib/gcj/cni.swg b/Lib/gcj/cni.swg deleted file mode 100644 index 4bd07df06..000000000 --- a/Lib/gcj/cni.swg +++ /dev/null @@ -1,14 +0,0 @@ -/* ----------------------------------------------------------------------------- - * cni.swg - * ----------------------------------------------------------------------------- */ - -#ifdef SWIG - -#define __attribute__(...) -%ignore class$; -#pragma SWIG nowarn=313,402 - -%nodefaultdtor; - -#endif - diff --git a/Lib/gcj/javaprims.i b/Lib/gcj/javaprims.i deleted file mode 100644 index 12c92a793..000000000 --- a/Lib/gcj/javaprims.i +++ /dev/null @@ -1,422 +0,0 @@ -%include - -typedef int8_t jbyte; -typedef int16_t jshort; -typedef int32_t jint; -typedef int64_t jlong; -typedef float jfloat; -typedef double jdouble; -typedef jint jsize; -typedef int8_t jboolean; - -extern "Java" -{ - namespace java - { - namespace io - { - class BufferedInputStream; - class BufferedOutputStream; - class BufferedReader; - class BufferedWriter; - class ByteArrayInputStream; - class ByteArrayOutputStream; - class CharArrayReader; - class CharArrayWriter; - class CharConversionException; - class DataInput; - class DataInputStream; - class DataOutput; - class DataOutputStream; - class EOFException; - class Externalizable; - class File; - class FileDescriptor; - class FileFilter; - class FileInputStream; - class FileNotFoundException; - class FileOutputStream; - class FilePermission; - class FileReader; - class FileWriter; - class FilenameFilter; - class FilterInputStream; - class FilterOutputStream; - class FilterReader; - class FilterWriter; - class IOException; - class InputStream; - class InputStreamReader; - class InterfaceComparator; - class InterruptedIOException; - class InvalidClassException; - class InvalidObjectException; - class LineNumberInputStream; - class LineNumberReader; - class MemberComparator; - class NotActiveException; - class NotSerializableException; - class ObjectInput; - class ObjectInputStream; - class ObjectInputStream$GetField; - class ObjectInputValidation; - class ObjectOutput; - class ObjectOutputStream; - class ObjectOutputStream$PutField; - class ObjectStreamClass; - class ObjectStreamConstants; - class ObjectStreamException; - class ObjectStreamField; - class OptionalDataException; - class OutputStream; - class OutputStreamWriter; - class PipedInputStream; - class PipedOutputStream; - class PipedReader; - class PipedWriter; - class PrintStream; - class PrintWriter; - class PushbackInputStream; - class PushbackReader; - class RandomAccessFile; - class Reader; - class SequenceInputStream; - class Serializable; - class SerializablePermission; - class StreamCorruptedException; - class StreamTokenizer; - class StringBufferInputStream; - class StringReader; - class StringWriter; - class SyncFailedException; - class UTFDataFormatException; - class UnsupportedEncodingException; - class VMObjectStreamClass; - class ValidatorAndPriority; - class WriteAbortedException; - class Writer; - } - - namespace lang - { - class AbstractMethodError; - class ArithmeticException; - class ArrayIndexOutOfBoundsException; - class ArrayStoreException; - class AssertionError; - class Boolean; - class Byte; - class CharSequence; - class Character; - class Character$Subset; - class Character$UnicodeBlock; - class Class; - class ClassCastException; - class ClassCircularityError; - class ClassFormatError; - class ClassLoader; - class ClassNotFoundException; - class CloneNotSupportedException; - class Cloneable; - class Comparable; - class Compiler; - class ConcreteProcess; - class Double; - class Error; - class Exception; - class ExceptionInInitializerError; - class Float; - class IllegalAccessError; - class IllegalAccessException; - class IllegalArgumentException; - class IllegalMonitorStateException; - class IllegalStateException; - class IllegalThreadStateException; - class IncompatibleClassChangeError; - class IndexOutOfBoundsException; - class InheritableThreadLocal; - class InstantiationError; - class InstantiationException; - class Integer; - class InternalError; - class InterruptedException; - class LinkageError; - class Long; - class Math; - class NegativeArraySizeException; - class NoClassDefFoundError; - class NoSuchFieldError; - class NoSuchFieldException; - class NoSuchMethodError; - class NoSuchMethodException; - class NullPointerException; - class Number; - class NumberFormatException; - class Object; - class OutOfMemoryError; - class Package; - class Process; - class Runnable; - class Runtime; - class RuntimeException; - class RuntimePermission; - class SecurityContext; - class SecurityException; - class SecurityManager; - class Short; - class StackOverflowError; - class StackTraceElement; - class StrictMath; - class String; - class String$CaseInsensitiveComparator; - class StringBuffer; - class StringIndexOutOfBoundsException; - class System; - class Thread; - class ThreadDeath; - class ThreadGroup; - class ThreadLocal; - class Throwable; - class UnknownError; - class UnsatisfiedLinkError; - class UnsupportedClassVersionError; - class UnsupportedOperationException; - class VMClassLoader; - class VMSecurityManager; - class VMThrowable; - class VerifyError; - class VirtualMachineError; - class Void; - namespace ref - { - class PhantomReference; - class Reference; - class ReferenceQueue; - class SoftReference; - class WeakReference; - } - - namespace reflect - { - class AccessibleObject; - class Array; - class Constructor; - class Field; - class InvocationHandler; - class InvocationTargetException; - class Member; - class Method; - class Modifier; - class Proxy; - class Proxy$ClassFactory; - class Proxy$ProxyData; - class Proxy$ProxySignature; - class Proxy$ProxyType; - class ReflectPermission; - class UndeclaredThrowableException; - } - } - - namespace util - { - class AbstractCollection; - class AbstractList; - class AbstractMap; - class AbstractMap$BasicMapEntry; - class AbstractSequentialList; - class AbstractSet; - class ArrayList; - class Arrays; - class Arrays$ArrayList; - class BitSet; - class Calendar; - class Collection; - class Collections; - class Collections$CopiesList; - class Collections$EmptyList; - class Collections$EmptyMap; - class Collections$EmptySet; - class Collections$ReverseComparator; - class Collections$SingletonList; - class Collections$SingletonMap; - class Collections$SingletonSet; - class Collections$SynchronizedCollection; - class Collections$SynchronizedIterator; - class Collections$SynchronizedList; - class Collections$SynchronizedListIterator; - class Collections$SynchronizedMap; - class Collections$SynchronizedMapEntry; - class Collections$SynchronizedRandomAccessList; - class Collections$SynchronizedSet; - class Collections$SynchronizedSortedMap; - class Collections$SynchronizedSortedSet; - class Collections$UnmodifiableCollection; - class Collections$UnmodifiableEntrySet; - class Collections$UnmodifiableIterator; - class Collections$UnmodifiableList; - class Collections$UnmodifiableListIterator; - class Collections$UnmodifiableMap; - class Collections$UnmodifiableRandomAccessList; - class Collections$UnmodifiableSet; - class Collections$UnmodifiableSortedMap; - class Collections$UnmodifiableSortedSet; - class Comparator; - class ConcurrentModificationException; - class Currency; - class Date; - class Dictionary; - class EmptyStackException; - class Enumeration; - class EventListener; - class EventListenerProxy; - class EventObject; - class GregorianCalendar; - class HashMap; - class HashMap$HashEntry; - class HashMap$HashIterator; - class HashSet; - class Hashtable; - class Hashtable$Enumerator; - class Hashtable$HashEntry; - class Hashtable$HashIterator; - class IdentityHashMap; - class IdentityHashMap$IdentityEntry; - class IdentityHashMap$IdentityIterator; - class Iterator; - class LinkedHashMap; - class LinkedHashMap$LinkedHashEntry; - class LinkedHashSet; - class LinkedList; - class LinkedList$Entry; - class LinkedList$LinkedListItr; - class List; - class ListIterator; - class ListResourceBundle; - class Locale; - class Map; - class Map$Entry; - class Map$Map; - class MissingResourceException; - class MyResources; - class NoSuchElementException; - class Observable; - class Observer; - class Properties; - class PropertyPermission; - class PropertyPermissionCollection; - class PropertyResourceBundle; - class Random; - class RandomAccess; - class RandomAccessSubList; - class ResourceBundle; - class Set; - class SimpleTimeZone; - class SortedMap; - class SortedSet; - class Stack; - class StringTokenizer; - class SubList; - class TimeZone; - class Timer; - class Timer$Scheduler; - class Timer$TaskQueue; - class TimerTask; - class TooManyListenersException; - class TreeMap; - class TreeMap$Node; - class TreeMap$SubMap; - class TreeMap$TreeIterator; - class TreeSet; - class Vector; - class WeakHashMap; - class WeakHashMap$WeakBucket; - class WeakHashMap$WeakEntry; - class WeakHashMap$WeakEntrySet; - namespace jar - { - class Attributes; - class Attributes$Name; - class JarEntry; - class JarException; - class JarFile; - class JarFile$JarEnumeration; - class JarInputStream; - class JarOutputStream; - class Manifest; - } - - namespace logging - { - class ConsoleHandler; - class ErrorManager; - class FileHandler; - class Filter; - class Formatter; - class Handler; - class Level; - class LogManager; - class LogRecord; - class Logger; - class LoggingPermission; - class MemoryHandler; - class SimpleFormatter; - class SocketHandler; - class StreamHandler; - class XMLFormatter; - } - - namespace prefs - { - class AbstractPreferences; - class BackingStoreException; - class InvalidPreferencesFormatException; - class NodeChangeEvent; - class NodeChangeListener; - class PreferenceChangeEvent; - class PreferenceChangeListener; - class Preferences; - class PreferencesFactory; - } - - namespace regex - { - class Matcher; - class Pattern; - class PatternSyntaxException; - } - - namespace zip - { - class Adler32; - class CRC32; - class CheckedInputStream; - class CheckedOutputStream; - class Checksum; - class DataFormatException; - class Deflater; - class DeflaterOutputStream; - class GZIPInputStream; - class GZIPOutputStream; - class Inflater; - class InflaterInputStream; - class ZipConstants; - class ZipEntry; - class ZipException; - class ZipFile; - class ZipFile$PartialInputStream; - class ZipFile$ZipEntryEnumeration; - class ZipInputStream; - class ZipOutputStream; - } - } - } -} - -typedef class java::lang::Object* jobject; -typedef class java::lang::Class* jclass; -typedef class java::lang::Throwable* jthrowable; -typedef class java::lang::String* jstring; - - -%include - diff --git a/Lib/perl5/cni.i b/Lib/perl5/cni.i deleted file mode 100644 index c4d4eafa8..000000000 --- a/Lib/perl5/cni.i +++ /dev/null @@ -1,12 +0,0 @@ -%warnfilter(SWIGWARN_PARSE_KEYWORD) java::lang::ref; - -%{ -#undef STATIC -%} -%include -%{ -#undef TRUE -#define TRUE 1 -%} - -%include diff --git a/Lib/python/cni.i b/Lib/python/cni.i deleted file mode 100644 index 10a1403a2..000000000 --- a/Lib/python/cni.i +++ /dev/null @@ -1,2 +0,0 @@ -%include -%include diff --git a/Lib/ruby/cni.i b/Lib/ruby/cni.i deleted file mode 100644 index 10a1403a2..000000000 --- a/Lib/ruby/cni.i +++ /dev/null @@ -1,2 +0,0 @@ -%include -%include diff --git a/Lib/tcl/cni.i b/Lib/tcl/cni.i deleted file mode 100644 index 10a1403a2..000000000 --- a/Lib/tcl/cni.i +++ /dev/null @@ -1,2 +0,0 @@ -%include -%include diff --git a/Makefile.in b/Makefile.in index df882ce34..c19e16a97 100644 --- a/Makefile.in +++ b/Makefile.in @@ -86,7 +86,6 @@ skip-d = test -n "@SKIP_D@" skip-javascript = test -n "@SKIP_JAVASCRIPT@" # Additional dependencies for some tests -skip-gcj = test -n "@SKIP_GCJ@" skip-android = test -n "@SKIP_ANDROID@" # Special errors test-case @@ -256,16 +255,6 @@ check-%-examples : @echo $(ACTION)ing Examples/$(LANGUAGE)/$* @(cd Examples/$(LANGUAGE)/$* && $(MAKE) $(FLAGS) $(ACTION) RUNPIPE=$(RUNPIPE)) -# gcj individual example -java.actionexample: - @cd Examples && $(MAKE) Makefile - @if $(skip-gcj); then \ - echo "skipping Examples/$(LANGUAGE)/java $(ACTION) (gcj test)"; \ - else \ - echo $(ACTION)ing Examples/$(LANGUAGE)/java; \ - (cd Examples/$(LANGUAGE)/java && $(MAKE) $(FLAGS) $(ACTION) RUNPIPE=$(RUNPIPE)) \ - fi - # Checks testcases in the test-suite excluding those which are known to be broken check-test-suite: \ check-errors-test-suite \ @@ -510,7 +499,7 @@ install-main: @echo "Installing $(DESTDIR)$(BIN_DIR)/`echo $(TARGET_NOEXE) | sed '$(transform)'`@EXEEXT@" @$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/`echo $(TARGET_NOEXE) | sed '$(transform)'`@EXEEXT@ -lib-languages = gcj typemaps tcl perl5 python guile java mzscheme ruby php php5 ocaml octave \ +lib-languages = typemaps tcl perl5 python guile java mzscheme ruby php php5 ocaml octave \ pike chicken csharp modula3 allegrocl clisp lua cffi uffi r go d javascript javascript/jsc \ javascript/v8 scilab diff --git a/configure.ac b/configure.ac index 48bb1ce81..85b24e701 100644 --- a/configure.ac +++ b/configure.ac @@ -1635,34 +1635,6 @@ AC_SUBST(JSV8ENABLED) AC_SUBST(NODEJS) AC_SUBST(NODEGYP) -#---------------------------------------------------------------- -# Look for gcj -#---------------------------------------------------------------- - -AC_ARG_WITH(gcj, AS_HELP_STRING([--without-gcj], [Disable GCJ]) -AS_HELP_STRING([--with-gcj=path], [Set location of gcj executable]),[GCJBIN="$withval"], [GCJBIN="$alllang_default"]) -AC_ARG_WITH(gcjh, [ --with-gcjh=path Set location of gcjh executable],[GCJHBIN="$withval"], [GCJHBIN=]) - -# First, check for "--without-gcj" or "--with-gcj=no". -if test x"${GCJBIN}" = xno; then - AC_MSG_NOTICE([Disabling GCJ]) -else - if test "x$GCJBIN" = xyes; then - AC_CHECK_PROGS(GCJ, gcj) - else - GCJ="$GCJBIN" - fi - - if test -z "$GCJCBIN"; then - AC_CHECK_PROGS(GCJH, gcjh) - else - GCJH="$GCJHBIN" - fi -fi - -AC_SUBST(GCJ) -AC_SUBST(GCJH) - #---------------------------------------------------------------- # Look for Android #---------------------------------------------------------------- @@ -2958,16 +2930,6 @@ AC_SUBST(SKIP_D) #---------------------------------------------------------------- # Additional language dependencies #---------------------------------------------------------------- -SKIP_GCJ= -if test -z "$GCJ" || test -z "$GCJH" ; then - SKIP_GCJ="1" -else - if test "$GCC" != yes; then - SKIP_GCJ="1" - fi -fi -AC_SUBST(SKIP_GCJ) - SKIP_ANDROID= if test -z "$ANDROID" || test -z "$ADB" || test -z "$ANT" || test -z "$NDKBUILD" ; then