Update of /cvsroot/jython/jython/Tools/jythonc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv30887
Modified Files:
javac.py
Log Message:
Renamed the python.jpythonc.* registry entries to python.jythonc.
Index: javac.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/javac.py,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -r2.9 -r2.10
*** javac.py 2000/10/13 18:55:07 2.9
--- javac.py 2000/11/10 15:10:12 2.10
***************
*** 38,45 ****
# Search order for a Java compiler:
# 1. -C/--compiler command line option
! # 2. python.jpythonc.compiler property (see registry)
# 3. guess a path to javac
if javac is None:
! javac = sys.registry.getProperty("python.jpythonc.compiler")
if javac is None:
javac = findDefaultJavac()
--- 38,45 ----
# Search order for a Java compiler:
# 1. -C/--compiler command line option
! # 2. python.jythonc.compiler property (see registry)
# 3. guess a path to javac
if javac is None:
! javac = sys.registry.getProperty("python.jythonc.compiler")
if javac is None:
javac = findDefaultJavac()
***************
*** 47,53 ****
# Extra options
# 1. -J/--compileropts command line option (passed in options)
! # 2. python.jpythonc.compileropts property
if options is None:
! options = sys.registry.getProperty("python.jpythonc.compileropts")
if options:
options = options.split()
--- 47,53 ----
# Extra options
# 1. -J/--compileropts command line option (passed in options)
! # 2. python.jythonc.compileropts property
if options is None:
! options = sys.registry.getProperty("python.jythonc.compileropts")
if options:
options = options.split()
***************
*** 56,63 ****
cmd.extend(options)
# Classpath:
! # 1. python.jpythonc.classpath property
# 2. java.class.path property
if cpath is None:
! cpath = sys.registry.getProperty("python.jpythonc.classpath")
if cpath is None:
cpath = getClasspath()
--- 56,63 ----
cmd.extend(options)
# Classpath:
! # 1. python.jythonc.classpath property
# 2. java.class.path property
if cpath is None:
! cpath = sys.registry.getProperty("python.jythonc.classpath")
if cpath is None:
cpath = getClasspath()
***************
*** 74,78 ****
Consider using the -C/--compiler command line switch, or setting
! the property python.jpythonc.compiler in the registry.''' % e
return 1, '', msg
done = None
--- 74,78 ----
Consider using the -C/--compiler command line switch, or setting
! the property python.jythonc.compiler in the registry.''' % e
return 1, '', msg
done = None
|
