[Octave-cvsupdate] SF.net SVN: octave:[6130] trunk/octave-forge/extra

[<gof...@us...>]

Revision: 6130
          http://octave.svn.sourceforge.net/octave/?rev=6130&view=rev
Author:   goffioul
Date:     2009-08-22 19:00:07 +0000 (Sat, 22 Aug 2009)

Log Message:
-----------
Fix compilation issues with MinGW.

Modified Paths:
--------------
    trunk/octave-forge/extra/java/src/Makefile
    trunk/octave-forge/extra/java/src/configure.base
    trunk/octave-forge/extra/jhandles/src/Makefile
    trunk/octave-forge/extra/jhandles/src/configure.base

Modified: trunk/octave-forge/extra/java/src/Makefile
===================================================================
--- trunk/octave-forge/extra/java/src/Makefile	2009-08-22 18:56:04 UTC (rev 6129)
+++ trunk/octave-forge/extra/java/src/Makefile	2009-08-22 19:00:07 UTC (rev 6130)
@@ -1,7 +1,7 @@
 sinclude ./Makeconf
 export LFLAGS
 
-LIBS = __java__.lib
+IMPORT_LIBS = __java__.lib
 PROGS = __java__.oct __java__.h octave.jar
 
 
@@ -20,7 +20,7 @@
 	for _f in $(PROGS); do \
 	  echo $$_f >> FILES; \
 	done; \
-	for _f in $(LIBS); do \
+	for _f in $(IMPORT_LIBS); do \
 	  if [ -e $$_f ]; then \
 	    echo $$_f >> FILES; \
 	  fi; \

Modified: trunk/octave-forge/extra/java/src/configure.base
===================================================================
--- trunk/octave-forge/extra/java/src/configure.base	2009-08-22 18:56:04 UTC (rev 6129)
+++ trunk/octave-forge/extra/java/src/configure.base	2009-08-22 19:00:07 UTC (rev 6130)
@@ -310,9 +310,15 @@
 AC_SUBST(JAVA_LIBS)
 AC_SUBST(HAVE_JAVA)
 
-AC_CHECK_PROG(JAVA, java, java)
-AC_CHECK_PROG(JAVAC, javac, javac)
-AC_CHECK_PROG(JAR, jar, jar)
+if test -z "$JAVA_HOME"; then
+  AC_CHECK_PROG(JAVA, java, java)
+  AC_CHECK_PROG(JAVAC, javac, javac)
+  AC_CHECK_PROG(JAR, jar, jar)
+else
+  AC_PATH_PROG(JAVA, java, [], [$JAVA_HOME/bin$PATH_SEPARATOR$PATH])
+  AC_PATH_PROG(JAVAC, javac, [], [$JAVA_HOME/bin$PATH_SEPARATOR$PATH])
+  AC_PATH_PROG(JAR, jar, [], [$JAVA_HOME/bin$PATH_SEPARATOR$PATH])
+fi
 HAVE_JAVA="Java Development Kit not found"
 if test -n "$JAVAC" -a -n "$JAR"; then
   AC_MSG_CHECKING([for Java version])
@@ -322,7 +328,7 @@
   java_minor=[`echo -n $java_version | sed -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\2/'`]
   if test $java_major -ge 1 -a $java_minor -ge 5; then
     case "$canonical_host_type" in
-      *-cygwin* | *-mingw* | *-msdosmsvc*)
+      *-msdosmsvc*)
         HAVE_JAVA=yes
         JAVA_LIBS=-ladvapi32
         ;;
@@ -364,7 +370,15 @@
           fi
           if test -n "$JAVA_ARCH"; then
             HAVE_JAVA=yes
-            JAVA_INCS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux"
+            case "$canonical_host_type" in
+              *-mingw* | *-cygwin*)
+                JAVA_LIBS=-ladvapi32
+                JAVA_INCS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32"
+                ;;
+              *)
+                JAVA_INCS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux"
+                ;;
+            esac
           fi
         fi
         ;;

Modified: trunk/octave-forge/extra/jhandles/src/Makefile
===================================================================
--- trunk/octave-forge/extra/jhandles/src/Makefile	2009-08-22 18:56:04 UTC (rev 6129)
+++ trunk/octave-forge/extra/jhandles/src/Makefile	2009-08-22 19:00:07 UTC (rev 6130)
@@ -23,7 +23,7 @@
 test:
 	@echo $(JAVA_SOURCES)
 
-%.jar: $(JAVA_SOURCES)
+jhandles.jar: $(JAVA_SOURCES)
 	-rm -f $@
 	$(JAVAC) -cp '$(CLASSPATH)' -source 1.3 -target 1.3 $(JAVA_SOURCES)
 	$(JAR) cf $@ $(JAVA_DIR)/*.class $(JAVA_DIR)/images/*
@@ -37,5 +37,17 @@
 %.o: %.c
 	$(MKOCTFILE) -v -I. $(JAVA_INCS) -c $<
 
+JH_DIR = org/octave/jhandles
+JH_SOURCES = $(wildcard $(addprefix $(JH_DIR)/, *.java))
+JH_OBJECTS = graphics-renderer.o gl-graphics-renderer.o glaxescanvas.o
+
+jh.jar: $(JH_SOURCES) jh.dll
+	-rm -f $@
+	$(JAVAC) -cp '$(CLASSPATH)' -source 1.3 -target 1.3 $(JH_SOURCES)
+	$(JAR) cf $@ $(JH_DIR)/*.class
+
+jh.dll: $(JH_OBJECTS)
+	$(MKOCTFILE) -o $@ $(JH_OBJECTS) $(OPENGL_LIBS)
+
 __jhandles__.oct: __jhandles__.cc
 	$(MKOCTFILE) '-I$(OCTAVE_JAVA_DIR)' $^ '-L$(OCTAVE_JAVAOCT_DIR)' -l__java__

Modified: trunk/octave-forge/extra/jhandles/src/configure.base
===================================================================
--- trunk/octave-forge/extra/jhandles/src/configure.base	2009-08-22 18:56:04 UTC (rev 6129)
+++ trunk/octave-forge/extra/jhandles/src/configure.base	2009-08-22 19:00:07 UTC (rev 6130)
@@ -321,9 +321,15 @@
 AC_SUBST(OPENGL_LIBS)
 AC_SUBST(OPENGL_INCS)
 
-AC_CHECK_PROG(JAVA, java, java)
-AC_CHECK_PROG(JAVAC, javac, javac)
-AC_CHECK_PROG(JAR, jar, jar)
+if test -z "$JAVA_HOME"; then
+  AC_CHECK_PROG(JAVA, java, java)
+  AC_CHECK_PROG(JAVAC, javac, javac)
+  AC_CHECK_PROG(JAR, jar, jar)
+else
+  AC_PATH_PROG(JAVA, java, [], [$JAVA_HOME/bin$PATH_SEPARATOR$PATH])
+  AC_PATH_PROG(JAVAC, javac, [], [$JAVA_HOME/bin$PATH_SEPARATOR$PATH])
+  AC_PATH_PROG(JAR, jar, [], [$JAVA_HOME/bin$PATH_SEPARATOR$PATH])
+fi
 HAVE_JAVA="Java Development Kit not found"
 if test -n "$JAVAC" -a -n "$JAR"; then
     AC_MSG_CHECKING([for Java version])
@@ -333,12 +339,19 @@
     java_minor=[`echo -n $java_version | sed -e 's/^\([0-9]\+\)\.\([0-9]\+\)\..\+$/\2/'`]
     if test $java_major -ge 1 -a $java_minor -ge 5; then
       case "$canonical_host_type" in
-        *-cygwin* | *-mingw* | *-msdosmsvc*)
+        *-cygwin* | *-mingw*)
           HAVE_JAVA=yes
           JAVA_LIBS=-ladvapi32
           OPENGL_LIBS=-lopengl32
-		  LIBPRE=
+          LIBPRE=
+          JAVA_INCS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32"
           ;;
+        *-msdosmsvc*)
+          HAVE_JAVA=yes
+          JAVA_LIBS=-ladvapi32
+          OPENGL_LIBS=-lopengl32
+          LIBPRE=
+          ;;
         *)
           if test -z "$JAVA_HOME"; then
             JAVA_HOME=/usr/lib/jvm


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.