[Gzz-commits] libvob org/nongnu/libvob/gl/PaperMill.java test...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/10 10:00:19

Modified files:
        org/nongnu/libvob/gl: PaperMill.java 
        test           : testutil.py 
Added files:
        vob            : __init__.py 
        vob/buoy       : __init__.py buoymanager.py 
        vob/color      : __init__.py spaces.py 
        vob/demo       : __init__.py fisheye.py fpfont.py irregu.py 
        vob/demo/gl    : __init__.py glinfo.py 
        vob/demo/paper : __init__.py basis.py combinerflow.py 
                         combiners.py combinerutil.py multipaper.py 
                         singlepaper.py util.py 
        vob/gl         : __init__.py 
        vob/paper      : __init__.py colors.py papermill.py params.py 
                         texcache.py texcomb_GL1_1.py texcomb_NV1X.py 
                         texcomb_NV2X.py texcoords.py texops_NV2X.py 
                         texops_STD.py textures.py 
        vob/putil      : __init__.py dbg.py demo.py demokeys.py 
                         demowindow.py effects.py misc.py nvcode.py 
                         reloader.py saveanim.py texture.py 
        vob/util       : __init__.py dbg.py saveimage.py 
        vob/vobs       : __init__.py 
Removed files:
        org            : __init__.py 
        org/nongnu     : __init__.py 
        org/nongnu/libvob: __init__.py 
        org/nongnu/libvob/buoy: __init__.py buoymanager.py 
        org/nongnu/libvob/color: __init__.py spaces.py 
        org/nongnu/libvob/demo: __init__.py fisheye.py fpfont.py 
                                irregu.py 
        org/nongnu/libvob/demo/gl: __init__.py glinfo.py 
        org/nongnu/libvob/demo/paper: __init__.py basis.py 
                                      combinerflow.py combiners.py 
                                      combinerutil.py multipaper.py 
                                      singlepaper.py util.py 
        org/nongnu/libvob/gl: __init__.py 
        org/nongnu/libvob/paper: __init__.py colors.py papermill.py 
                                 params.py texcache.py texcomb_GL1_1.py 
                                 texcomb_NV1X.py texcomb_NV2X.py 
                                 texcoords.py texops_NV2X.py 
                                 texops_STD.py textures.py 
        org/nongnu/libvob/putil: __init__.py dbg.py demo.py demokeys.py 
                                 demowindow.py effects.py misc.py 
                                 nvcode.py reloader.py saveanim.py 
                                 texture.py 
        org/nongnu/libvob/util: __init__.py dbg.py saveimage.py 

Log message:
        Move jython code to module vob. Should take care of package problems...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/gl/PaperMill.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/testutil.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/buoy/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/buoy/buoymanager.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/color/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/color/spaces.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/fisheye.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/fpfont.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/irregu.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/gl/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/gl/glinfo.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/paper/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/paper/basis.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/paper/combinerflow.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/paper/combiners.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/paper/combinerutil.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/paper/multipaper.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/paper/singlepaper.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/paper/util.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/gl/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/paper/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/paper/colors.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/paper/papermill.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/paper/params.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/paper/texcache.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/paper/texcomb_GL1_1.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/paper/texcomb_NV1X.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/paper/texcomb_NV2X.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/paper/texcoords.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/paper/texops_NV2X.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/paper/texops_STD.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/paper/textures.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/dbg.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/demo.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/demokeys.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/demowindow.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/effects.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/misc.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/nvcode.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/reloader.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/saveanim.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/texture.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/util/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/util/dbg.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/util/saveimage.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/vobs/__init__.py?rev=1.1

Patches:
Index: libvob/org/nongnu/libvob/gl/PaperMill.java
diff -u libvob/org/nongnu/libvob/gl/PaperMill.java:1.2 
libvob/org/nongnu/libvob/gl/PaperMill.java:1.3
--- libvob/org/nongnu/libvob/gl/PaperMill.java:1.2      Wed Mar 26 14:34:07 2003
+++ libvob/org/nongnu/libvob/gl/PaperMill.java  Thu Apr 10 10:00:17 2003
@@ -55,7 +55,7 @@
     static public PaperMill getInstance() {
        if(instance == null) {
            PythonInterpreter jython = new PythonInterpreter();
-           jython.exec("from org.nongnu.libvob.paper.papermill import 
ThePaperMill\n" +
+           jython.exec("from vob.paper.papermill import ThePaperMill\n" +
                        "papermillInstance = ThePaperMill()\n");
            instance = (PaperMill)(jython.get("papermillInstance",
                                        PaperMill.class));
Index: libvob/test/testutil.py
diff -u libvob/test/testutil.py:1.4 libvob/test/testutil.py:1.5
--- libvob/test/testutil.py:1.4 Tue Mar 11 08:57:54 2003
+++ libvob/test/testutil.py     Thu Apr 10 10:00:18 2003
@@ -34,14 +34,21 @@
 
 NOTE: testutil.py itself runs all tests in test/ when run as main.
 """
+
 import sys
-import traceback
 sys.path.insert(0, ".")
+import vob
+
+import traceback
 import unittest, os.path, fnmatch, string, imp
 import java
-from org.nongnu import libvob as vob
 import re
 import test.tools.tools as tools
+
+print vob
+print dir(vob)
+print vob.util
+print dir(vob.util)
 
 true = 1
 false = 0