Changeset 4198Tweet

Timestamp:

Dec 24, 2009, 1:02:16 AM (13 years ago)

Author:

Sam Hocevar

Message:

Build Java examples and add wrapper scripts to run them.

Location:

libcaca/trunk/java

Files:

• .gitignore (modified) (1 diff)
• Makefile.am (modified) (3 diffs)
• examples/Driver (added)
• examples/Driver.java (modified) (1 diff)
• examples/TrueColor (added)
• org/zoy/caca/Caca.java (modified) (1 diff)

libcaca/trunk/java/.gitignore

@@ -1 +1 @@
 libjava.jar
+examples/*.class
 org_zoy_caca_*.h
 org/zoy/caca/*.class

libcaca/trunk/java/Makefile.am

@@ -5 +5 @@
 if USE_JAVA
 jni_LTLIBRARIES = libcaca-java.la
+noinst_DATA = examples/Driver.class examples/TrueColor.class
 endif
 
@@ -75 +76 @@
         @touch org_zoy_caca_Font.h
 
-CLEANFILES = org/zoy/caca/*.class org_zoy_caca_[A-Z]*.h $(java_jar)
+CLEANFILES = $(noinst_DATA) $(java_jar) \
+             org/zoy/caca/*.class org_zoy_caca_[A-Z]*.h
 EXTRA_DIST = README
 
 if USE_JAVA
 BUILT_SOURCES = $(java_jni_headers) $(java_jni_classes)
+endif
 
 libcaca_java_la_CPPFLAGS = $(JAVA_CFLAGS)
@@ -92 +95 @@
 libcaca_java_ladir = $(datadir)/java
 libcaca_java_la_DATA = $(java_jar)
-endif
+
+examples/Driver.class: examples/Driver.java
+        $(JAVAC) $^
+
+examples/TrueColor.class: examples/TrueColor.java
+        $(JAVAC) $^
+

libcaca/trunk/java/examples/Driver.java

@@ -27 +27 @@
     int i, cur = 0;
     while(true) {
-      cv.put(1, 0, "Availabl driver");
+      cv.put(1, 0, "Available drivers");
       driver = dp.getDriver();
       Display.Driver[] list = Display.getDriverList();

libcaca/trunk/java/org/zoy/caca/Caca.java

@@ -24 +24 @@
   synchronized public static void load() {
     if (!alreadyLoaded) {
-      System.loadLibrary("java");
+      System.loadLibrary("caca-java");
       alreadyLoaded = true;
     }