[Gzz-commits] gzz ./README gfx/librenderables/Makefile-javaonly

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/11/17 19:08:59

Modified files:
        .              : README 
        gfx/librenderables: Makefile-javaonly 

Log message:
        Get rid of Python dependency to compile AWT client (by using Jython 
instead).

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/README.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/Makefile-javaonly.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/README
diff -u gzz/README:1.30 gzz/README:1.31
--- gzz/README:1.30     Wed Oct 23 05:29:49 2002
+++ gzz/README  Sun Nov 17 19:08:58 2002
@@ -86,17 +86,11 @@
 -------------------------------------------------------------------------
 GNU Make                                     make
 
-To compile, test and run the AWT client from CVS, you'll need the above
-and:
-Software name                                Corresponding Debian package
--------------------------------------------------------------------------
-Perl                                         perl
-Python 2.2                                   python2.2
-
 To compile, test and run the OpenGL client and other demos, you'll need
 all of the above and additionally
 Software name                                Corresponding Debian package
 -------------------------------------------------------------------------
+Python 2.2                                   python2.2
 GNU C++ compiler version 3                   g++-3.0
 GNU stdc++ library                           libstdc++3-dev
 Boost.org C++ library                        libboost-dev   >= 1.28.0
Index: gzz/gfx/librenderables/Makefile-javaonly
diff -u gzz/gfx/librenderables/Makefile-javaonly:1.2 
gzz/gfx/librenderables/Makefile-javaonly:1.3
--- gzz/gfx/librenderables/Makefile-javaonly:1.2        Mon Sep 23 04:24:25 2002
+++ gzz/gfx/librenderables/Makefile-javaonly    Sun Nov 17 19:08:59 2002
@@ -1,4 +1,28 @@
 
+ifeq (,$(JAVA))
+       JAVA=java
+endif
+
+# Location of the depends/ CVS module:
+ifeq (,$(GZZ_DEPENDS))
+  GZZ_DEPENDS=$(wildcard ../../depends)
+  ifeq (,$(GZZ_DEPENDS))
+    GZZ_DEPENDS=../../../depends
+  endif
+endif
+
+CLASSDIR=CLASSES/
+CLASSPATH 
=$(CLASSDIR):$(GZZ_DEPENDS)/HTTPClient.zip:$(GZZ_DEPENDS)/junit.jar:$(GZZ_DEPENDS)/jython.jar:$(shell
 echo $$CLASSPATH)
+export CLASSPATH
+
+ifeq (,$(JYTHONPATH))
+ 
JYTHONPATH=$(GZZ_DEPENDS)/jythonlib.jar:$(GZZ_DEPENDS)/pythonlib.jar:$(GZZ_DEPENDS)/yaml.jar:$(GZZ_DEPENDS)/docutils.jar
+endif
+ifeq (,$(JYTHON))
+# python.verbose can be: "error", "warning", "message", "comment", "debug"
+ JYTHON=$(JAVA) $(JVMFLAGS) -Dpython.path=$(JYTHONPATH) 
-Dpython.verbose=message $(EDITOR_OPTION) org.python.util.jython
+endif
+
 ../../gzz/gfx/gl/GLRen.java RealRenderables.hxx RealRenderables-jni.hxx: 
renderables.py
-       python2.2 renderables.py
+       $(JYTHON) renderables.py