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

[Tuukka Hastrup]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuukka Hastrup <address@hidden> 02/08/26 15:07:15

Modified files:
        .              : Makefile 
        gzz/control    : Main.java 

Log message:
        Now 'make jar' seems to correctly build an executable snapshot, run 
with 'java -jar jarname -t

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.143&tr2=1.144&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/control/Main.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/Makefile
diff -c gzz/Makefile:1.143 gzz/Makefile:1.144
*** gzz/Makefile:1.143  Mon Aug 26 14:25:29 2002
--- gzz/Makefile        Mon Aug 26 15:07:15 2002
***************
*** 140,146 ****
  # For jar builds:
  JARARCHES=""
  JARMODULES=""
! JARNAME=gzigzag.jar
  MODULESUPPORT=no
  
  # Location of the depends/ CVS module:
--- 140,146 ----
  # For jar builds:
  JARARCHES=""
  JARMODULES=""
! JARNAME=gzz-$(VERSION).jar
  MODULESUPPORT=no
  
  # Location of the depends/ CVS module:
***************
*** 371,377 ****
        cp -a $(CLASSDIR)/* $(jardir)
        find gzz -name "*.py" | while read file ; do mkdir -p 
$(jardir)/`dirname $$file` && cp $$file $(jardir)/$$file ; done
        cp Gzz.py $(jardir)
!       cp LICENSE.lgpl LICENSE.xpl $(jardir)
        cp README $(jardir)
        (cd $(jardir) && jar cvfm $(JARNAME) manifest *)
        mv $(jardir)/$(JARNAME) .
--- 371,377 ----
        cp -a $(CLASSDIR)/* $(jardir)
        find gzz -name "*.py" | while read file ; do mkdir -p 
$(jardir)/`dirname $$file` && cp $$file $(jardir)/$$file ; done
        cp Gzz.py $(jardir)
!       cp LICENSE.lgpl LICENSE.xpl $(GZZ_DEPENDS)/{jython,python,yaml}.license 
$(jardir)
        cp README $(jardir)
        (cd $(jardir) && jar cvfm $(JARNAME) manifest *)
        mv $(jardir)/$(JARNAME) .
Index: gzz/gzz/control/Main.java
diff -c gzz/gzz/control/Main.java:1.2 gzz/gzz/control/Main.java:1.3
*** gzz/gzz/control/Main.java:1.2       Mon Aug 26 14:02:26 2002
--- gzz/gzz/control/Main.java   Mon Aug 26 15:07:15 2002
***************
*** 5,15 ****
  import org.python.core.*; 
  
  public class Main {
!       public static void main(String[] args) throws PyException {
!               System.setProperty("python.path", "gzigzag.jar");
!               System.out.println(args[0].toString());
!               PythonInterpreter.initialize(System.getProperties(), null, 
args);
!               PythonInterpreter interp = new PythonInterpreter();
!               interp.exec("import Gzz");
!       }
  }
--- 5,18 ----
  import org.python.core.*; 
  
  public class Main {
!     public static void main(String[] args) throws PyException {
!       String[] pyargs = new String[args.length+1];
!       System.arraycopy(args, 0, pyargs, 1, args.length);
!       pyargs[0] = "Gzz.py";
!       System.setProperty("python.path", 
!                          System.getProperty("java.class.path"));
!       PythonInterpreter.initialize(System.getProperties(), null, pyargs);
!       PythonInterpreter interp = new PythonInterpreter();
!       interp.exec("import Gzz");
!     }
  }