Changeset 4197Tweet

Timestamp:

Dec 23, 2009, 12:34:49 PM (8 years ago)

Author:

Sam Hocevar

Message:

Java bindings, courtesy of Adrien Grand <​jpountz@dinauz.org>.

Location:

libcaca/trunk

Files:

• AUTHORS (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• java (added)
• java/.gitignore (added)
• java/Makefile.am (added)
• java/README (added)
• java/caca_java_common.c (added)
• java/caca_java_common.h (added)
• java/examples (added)
• java/examples/Driver.java (added)
• java/examples/TrueColor.java (added)
• java/org (added)
• java/org/zoy (added)
• java/org/zoy/caca (added)
• java/org/zoy/caca/Attribute.java (added)
• java/org/zoy/caca/Caca.java (added)
• java/org/zoy/caca/CacaException.java (added)
• java/org/zoy/caca/CacaObject.java (added)
• java/org/zoy/caca/Canvas.java (added)
• java/org/zoy/caca/Color.java (added)
• java/org/zoy/caca/Display.java (added)
• java/org/zoy/caca/Dither.java (added)
• java/org/zoy/caca/Event.java (added)
• java/org/zoy/caca/Font.java (added)
• java/org/zoy/caca/NativeObject.java (added)
• java/org/zoy/caca/TimeoutException.java (added)
• java/org_zoy_caca_Attribute.c (added)
• java/org_zoy_caca_Caca.c (added)
• java/org_zoy_caca_Canvas.c (added)
• java/org_zoy_caca_Display.c (added)
• java/org_zoy_caca_Dither.c (added)
• java/org_zoy_caca_Event.c (added)
• java/org_zoy_caca_Font.c (added)

libcaca/trunk/AUTHORS

@@ -27 +27 @@
  - PHP bindings
 
+Adrien Grand <jpountz@dinauz.org>
+ - Java bindings
+
 */

libcaca/trunk/Makefile.am

@@ -1 +1 @@
 # $Id$
 
-SUBDIRS = kernel caca src examples tools caca-sharp cxx python ruby doc test
+SUBDIRS = kernel caca src examples tools \
+          cxx caca-sharp python ruby java \
+          doc test
 DIST_SUBDIRS = $(SUBDIRS) win32
 

libcaca/trunk/configure.ac

@@ -79 +79 @@
 AC_ARG_ENABLE(csharp,
   [  --enable-csharp         C# bindings (autodetected)])
+AC_ARG_ENABLE(java,
+  [  --enable-java           Java bindings (autodetected)])
 AC_ARG_ENABLE(cxx,
   [  --enable-cxx            C++ bindings (autodetected)])
@@ -409 +411 @@
 AM_CONDITIONAL(USE_CSHARP, test "${ac_cv_my_have_csharp}" = "yes")
 
+# Build the Java bindings?
+ac_cv_my_have_java="no"
+if test "${enable_java}" != "no"; then
+  AC_PATH_PROG(JAVAC, javac, no)
+  AC_PATH_PROG(JAVAH, javah, no)
+  AC_PATH_PROG(JAR, jar, no)
+  if test "${JAVAC}" != "no" -a "${JAVAH}" != "no" -a "${JAR}" != "no"; then
+    if test "$JAVA_HOME" = ""; then
+      # Try to resolve JAVA_HOME
+      JAVAC_EXE="$JAVAC"
+      # Follow symlinks
+      while test -h "$JAVAC_EXE"; do
+        ls=`ls -ld "$JAVAC_EXE"`
+        link=`expr "$ls" : '.*-> \(.*\)$'`
+        if expr "$link" : '/.*' > /dev/null; then
+          JAVAC_EXE="$link"
+        else
+          JAVAC_EXE="`dirname "$JAVAC_EXE"`/$link"
+        fi
+      done
+      JAVA_HOME="`dirname $JAVAC_EXE`/.."
+    fi
+    # Include path to jni.h
+    JAVA_CFLAGS="${JAVA_CFLAGS} -I$JAVA_HOME/include"
+    # Add the OS specific include path
+    for dir in $JAVA_HOME/include/*; do
+      if test -f "$dir/jni_md.h"; then
+        JAVA_CFLAGS="${JAVA_CFLAGS} -I$dir"
+      fi
+    done
+    AC_SUBST(JAVA_CFLAGS)
+    AC_SUBST(JAVA_LIBS)
+    AC_LANG_PUSH(C)
+    CPPFLAGS="${CPPFLAGS} ${JAVA_CFLAGS}"
+    AC_CHECK_HEADERS([jni.h],
+     [ac_cv_my_have_java="yes"
+      CACA_BINDINGS="${CACA_BINDINGS} Java"])
+    AC_LANG_POP(C)
+  fi
+fi
+AM_CONDITIONAL(USE_JAVA, test "${ac_cv_my_have_java}" = "yes")
+
 # Build the Ruby bindings?
 ac_cv_my_have_ruby="no"
@@ -507 +551 @@
   test/Makefile
   tools/Makefile
+  java/Makefile
   caca-sharp/Makefile
   cxx/Makefile