[Gzz-commits] gzz ./Gzz.py gzz/control/Main.java

[Vesa Kaihlavirta]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Vesa Kaihlavirta <address@hidden>       02/09/30 05:26:58

Modified files:
        .              : Gzz.py 
        gzz/control    : Main.java 

Log message:
        Now "make jar" is functional.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Gzz.py.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/control/Main.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gzz/Gzz.py
diff -c gzz/Gzz.py:1.34 gzz/Gzz.py:1.35
*** gzz/Gzz.py:1.34     Sun Sep 29 12:38:56 2002
--- gzz/Gzz.py  Mon Sep 30 05:26:58 2002
***************
*** 128,141 ****
          except TypeError, t:
              print t
  
!     def __init__(self):
!         self.opts, self.args = getopt.getopt(sys.argv[1:], 
"Ct"+gzz.util.dbg.short,
!             ["--commander"]+gzz.util.dbg.long)
          self.parse_params()
          self.set_defaults()
  
! if __name__ == '__main__':
!     g = Gzz()
      if java.lang.System.getProperty("gzzclient") == "gl":
          print "Running GL..."
          g.graphicsAPI.startUpdateManager(g)
--- 128,142 ----
          except TypeError, t:
              print t
  
!     def __init__(self, opts, args):
!         self.opts, self.args = opts, args
          self.parse_params()
          self.set_defaults()
  
! def run():
!     opts, args = getopt.getopt(sys.argv[1:], "Ct"+gzz.util.dbg.short,
!             ["--commander"]+gzz.util.dbg.long)
!     g = Gzz(opts, args)
      if java.lang.System.getProperty("gzzclient") == "gl":
          print "Running GL..."
          g.graphicsAPI.startUpdateManager(g)
***************
*** 143,145 ****
--- 144,149 ----
          print "Running AWT..."
          g.graphicsAPI.startUpdateManager(None)
          g.run()
+ 
+ if __name__ == '__main__':
+     run()
Index: gzz/gzz/control/Main.java
diff -c gzz/gzz/control/Main.java:1.5 gzz/gzz/control/Main.java:1.6
*** gzz/gzz/control/Main.java:1.5       Wed Aug 28 13:00:28 2002
--- gzz/gzz/control/Main.java   Mon Sep 30 05:26:58 2002
***************
*** 40,44 ****
--- 40,45 ----
        PythonInterpreter.initialize(System.getProperties(), null, pyargs);
        PythonInterpreter interp = new PythonInterpreter();
        interp.exec("import Gzz");
+         interp.exec("Gzz.run()");
      }
  }