summaryrefslogtreecommitdiffstats
path: root/test/Java
diff options
context:
space:
mode:
Diffstat (limited to 'test/Java')
-rw-r--r--test/Java/JAR.py16
-rw-r--r--test/Java/JARCOM.py4
-rw-r--r--test/Java/JARCOMSTR.py4
-rw-r--r--test/Java/JAVAC.py16
-rw-r--r--test/Java/JAVACCOM.py4
-rw-r--r--test/Java/JAVACCOMSTR.py4
-rw-r--r--test/Java/JAVAH.py12
-rw-r--r--test/Java/JAVAHCOM.py4
-rw-r--r--test/Java/JAVAHCOMSTR.py4
-rw-r--r--test/Java/RMIC.py12
-rw-r--r--test/Java/RMICCOM.py4
-rw-r--r--test/Java/RMICCOMSTR.py4
12 files changed, 44 insertions, 44 deletions
diff --git a/test/Java/JAR.py b/test/Java/JAR.py
index 1344fb1..5342a48 100644
--- a/test/Java/JAR.py
+++ b/test/Java/JAR.py
@@ -30,7 +30,7 @@ import string
import sys
import TestSCons
-python = TestSCons.python
+_python_ = TestSCons._python_
test = TestSCons.TestSCons()
@@ -56,9 +56,9 @@ sys.exit(0)
test.write('SConstruct', """
env = Environment(tools = ['jar'],
- JAR = r'%s myjar.py')
+ JAR = r'%(_python_)s myjar.py')
env.Jar(target = 'test1.jar', source = 'test1.class')
-""" % (python))
+""" % locals())
test.write('test1.class', """\
test1.class
@@ -74,9 +74,9 @@ if os.path.normcase('.class') == os.path.normcase('.CLASS'):
test.write('SConstruct', """
env = Environment(tools = ['jar'],
- JAR = r'%s myjar.py')
+ JAR = r'%(_python_)s myjar.py')
env.Jar(target = 'test2.jar', source = 'test2.CLASS')
-""" % (python))
+""" % locals())
test.write('test2.CLASS', """\
test2.CLASS
@@ -100,13 +100,13 @@ sys.exit(0)
test.write('SConstruct', """
env = Environment(tools = ['jar'],
- JAR = r'%s myjar2.py',
+ JAR = r'%(_python_)s myjar2.py',
JARFLAGS='cvf')
env.Jar(target = 'classes.jar', source = [ 'testdir/bar.class',
'foo.mf' ],
TESTDIR='testdir',
JARCHDIR='$TESTDIR')
-""" % (python))
+""" % locals())
test.subdir('testdir')
test.write([ 'testdir', 'bar.class' ], 'foo')
@@ -150,7 +150,7 @@ foo = Environment(tools = ['javac', 'jar'],
JAVAC = r'%(where_javac)s',
JAR = r'%(where_jar)s')
jar = foo.Dictionary('JAR')
-bar = foo.Copy(JAR = r'%(python)s wrapper.py ' + jar)
+bar = foo.Copy(JAR = r'%(_python_)s wrapper.py ' + jar)
foo.Java(target = 'classes', source = 'com/sub/foo')
bar.Java(target = 'classes', source = 'com/sub/bar')
foo.Jar(target = 'foo', source = 'classes/com/sub/foo')
diff --git a/test/Java/JARCOM.py b/test/Java/JARCOM.py
index 0d7ebba..f03cd9f 100644
--- a/test/Java/JARCOM.py
+++ b/test/Java/JARCOM.py
@@ -30,7 +30,7 @@ Test the ability to configure the $JARCOM construction variable.
import TestSCons
-python = TestSCons.python
+_python_ = TestSCons._python_
test = TestSCons.TestSCons()
@@ -48,7 +48,7 @@ sys.exit(0)
test.write('SConstruct', """
env = Environment(TOOLS = ['default', 'jar'],
- JARCOM = r'%(python)s myjar.py $TARGET $SOURCES')
+ JARCOM = r'%(_python_)s myjar.py $TARGET $SOURCES')
env.Jar(target = 'test1', source = ['file1.in', 'file2.in', 'file3.in'])
""" % locals())
diff --git a/test/Java/JARCOMSTR.py b/test/Java/JARCOMSTR.py
index aa8a6ad..35404ce 100644
--- a/test/Java/JARCOMSTR.py
+++ b/test/Java/JARCOMSTR.py
@@ -31,7 +31,7 @@ the jar output.
import TestSCons
-python = TestSCons.python
+_python_ = TestSCons._python_
test = TestSCons.TestSCons()
@@ -49,7 +49,7 @@ sys.exit(0)
test.write('SConstruct', """
env = Environment(TOOLS = ['default', 'jar'],
- JARCOM = r'%(python)s myjar.py $TARGET $SOURCES',
+ JARCOM = r'%(_python_)s myjar.py $TARGET $SOURCES',
JARCOMSTR = "Jar'ing up $TARGET from $SOURCES")
env.Jar(target = 'test1', source = ['file1.in', 'file2.in', 'file3.in'])
""" % locals())
diff --git a/test/Java/JAVAC.py b/test/Java/JAVAC.py
index 93f0e7b..b5fb3f8 100644
--- a/test/Java/JAVAC.py
+++ b/test/Java/JAVAC.py
@@ -30,7 +30,7 @@ import string
import sys
import TestSCons
-python = TestSCons.python
+_python_ = TestSCons._python_
test = TestSCons.TestSCons()
@@ -59,9 +59,9 @@ sys.exit(0)
test.write('SConstruct', """
env = Environment(tools = ['javac'],
- JAVAC = r'%s myjavac.py')
+ JAVAC = r'%(_python_)s myjavac.py')
env.Java(target = '.', source = '.')
-""" % (python))
+""" % locals())
test.write('test1.java', """\
test1.java
@@ -77,9 +77,9 @@ if os.path.normcase('.java') == os.path.normcase('.JAVA'):
test.write('SConstruct', """\
env = Environment(tools = ['javac'],
- JAVAC = r'%s myjavac.py')
+ JAVAC = r'%(_python_)s myjavac.py')
env.Java(target = '.', source = '.')
-""" % python)
+""" % locals())
test.write('test2.JAVA', """\
test2.JAVA
@@ -114,13 +114,13 @@ os.system(string.join(sys.argv[1:], " "))
test.write('SConstruct', """
foo = Environment(tools = ['javac'],
- JAVAC = r'%s')
+ JAVAC = r'%(where_javac)s')
javac = foo.Dictionary('JAVAC')
-bar = foo.Copy(JAVAC = r'%s wrapper.py ' + javac)
+bar = foo.Copy(JAVAC = r'%(_python_)s wrapper.py ' + javac)
foo.Java(target = 'class1', source = 'com/sub/foo')
bar.Java(target = 'class2', source = 'com/sub/bar')
foo.Java(target = 'class3', source = ['src1', 'src2'])
-""" % (where_javac, python))
+""" % locals())
test.subdir('com',
['com', 'sub'],
diff --git a/test/Java/JAVACCOM.py b/test/Java/JAVACCOM.py
index 171649c..7086a2a 100644
--- a/test/Java/JAVACCOM.py
+++ b/test/Java/JAVACCOM.py
@@ -30,7 +30,7 @@ Test the ability to configure the $JAVACCOM construction variable.
import TestSCons
-python = TestSCons.python
+_python_ = TestSCons._python_
test = TestSCons.TestSCons()
@@ -50,7 +50,7 @@ sys.exit(0)
test.write('SConstruct', """
env = Environment(TOOLS = ['default', 'javac'],
- JAVACCOM = r'%(python)s myjavac.py $TARGET $SOURCES')
+ JAVACCOM = r'%(_python_)s myjavac.py $TARGET $SOURCES')
env.Java(target = 'classes', source = 'src')
""" % locals())
diff --git a/test/Java/JAVACCOMSTR.py b/test/Java/JAVACCOMSTR.py
index 7f59e90..44b1449 100644
--- a/test/Java/JAVACCOMSTR.py
+++ b/test/Java/JAVACCOMSTR.py
@@ -33,7 +33,7 @@ import os.path
import TestSCons
-python = TestSCons.python
+_python_ = TestSCons._python_
test = TestSCons.TestSCons()
@@ -53,7 +53,7 @@ sys.exit(0)
test.write('SConstruct', """
env = Environment(TOOLS = ['default', 'javac'],
- JAVACCOM = r'%(python)s myjavac.py $TARGET $SOURCES',
+ JAVACCOM = r'%(_python_)s myjavac.py $TARGET $SOURCES',
JAVACCOMSTR = "Compiling class(es) $TARGET from $SOURCES")
env.Java(target = 'classes', source = 'src')
""" % locals())
diff --git a/test/Java/JAVAH.py b/test/Java/JAVAH.py
index eb70ac8..9901764 100644
--- a/test/Java/JAVAH.py
+++ b/test/Java/JAVAH.py
@@ -29,7 +29,7 @@ import string
import sys
import TestSCons
-python = TestSCons.python
+_python_ = TestSCons._python_
test = TestSCons.TestSCons()
@@ -61,9 +61,9 @@ sys.exit(0)
test.write('SConstruct', """
env = Environment(tools = ['javah'],
- JAVAH = r'%s myjavah.py')
+ JAVAH = r'%(_python_)s myjavah.py')
env.JavaH(target = File('test1.h'), source = 'test1.java')
-""" % (python))
+""" % locals())
test.write('test1.java', """\
test1.java
@@ -79,9 +79,9 @@ if os.path.normcase('.java') == os.path.normcase('.JAVA'):
test.write('SConstruct', """\
env = Environment(tools = ['javah'],
- JAVAH = r'%s myjavah.py')
+ JAVAH = r'%(_python_)s myjavah.py')
env.JavaH(target = File('test2.h'), source = 'test2.JAVA')
-""" % python)
+""" % locals())
test.write('test2.JAVA', """\
test2.JAVA
@@ -126,7 +126,7 @@ foo = Environment(tools = ['javac', 'javah'],
JAVAC = r'%(where_javac)s',
JAVAH = r'%(where_javah)s')
javah = foo.Dictionary('JAVAH')
-bar = foo.Copy(JAVAH = r'%(python)s wrapper.py ' + javah)
+bar = foo.Copy(JAVAH = r'%(_python_)s wrapper.py ' + javah)
foo.Java(target = 'class1', source = 'com/sub/foo')
bar_classes = bar.Java(target = 'class2', source = 'com/sub/bar')
foo_classes = foo.Java(target = 'class3', source = 'src')
diff --git a/test/Java/JAVAHCOM.py b/test/Java/JAVAHCOM.py
index 1cc4208..73067c6 100644
--- a/test/Java/JAVAHCOM.py
+++ b/test/Java/JAVAHCOM.py
@@ -30,7 +30,7 @@ Test the ability to configure the $JAVAHCOM construction variable.
import TestSCons
-python = TestSCons.python
+_python_ = TestSCons._python_
test = TestSCons.TestSCons()
@@ -48,7 +48,7 @@ sys.exit(0)
test.write('SConstruct', """
env = Environment(TOOLS = ['default', 'javah'],
- JAVAHCOM = r'%(python)s myjavah.py $TARGET $SOURCES')
+ JAVAHCOM = r'%(_python_)s myjavah.py $TARGET $SOURCES')
env.JavaH(target = 'out', source = 'file1.class')
env.JavaH(target = 'out', source = 'file2.class')
env.JavaH(target = 'out', source = 'file3.class')
diff --git a/test/Java/JAVAHCOMSTR.py b/test/Java/JAVAHCOMSTR.py
index 2a14e1c..8ee5767 100644
--- a/test/Java/JAVAHCOMSTR.py
+++ b/test/Java/JAVAHCOMSTR.py
@@ -33,7 +33,7 @@ import os.path
import TestSCons
-python = TestSCons.python
+_python_ = TestSCons._python_
test = TestSCons.TestSCons()
@@ -59,7 +59,7 @@ sys.exit(0)
test.write('SConstruct', """
env = Environment(TOOLS = ['default', 'javah'],
- JAVAHCOM = r'%(python)s myjavah.py $TARGET $SOURCES',
+ JAVAHCOM = r'%(_python_)s myjavah.py $TARGET $SOURCES',
JAVAHCOMSTR = 'Building javah $TARGET from $SOURCES')
env.JavaH(target = 'out', source = 'file1.class')
env.JavaH(target = 'out', source = 'file2.class')
diff --git a/test/Java/RMIC.py b/test/Java/RMIC.py
index 7ef1359..bb098e7 100644
--- a/test/Java/RMIC.py
+++ b/test/Java/RMIC.py
@@ -29,7 +29,7 @@ import string
import sys
import TestSCons
-python = TestSCons.python
+_python_ = TestSCons._python_
test = TestSCons.TestSCons()
@@ -60,9 +60,9 @@ sys.exit(0)
test.write('SConstruct', """
env = Environment(tools = ['rmic'],
- RMIC = r'%s myrmic.py')
+ RMIC = r'%(_python_)s myrmic.py')
env.RMIC(target = 'outdir', source = 'test1.java')
-""" % (python))
+""" % locals())
test.write('test1.java', """\
test1.java
@@ -78,9 +78,9 @@ if os.path.normcase('.java') == os.path.normcase('.JAVA'):
test.write('SConstruct', """\
env = Environment(tools = ['rmic'],
- RMIC = r'%s myrmic.py')
+ RMIC = r'%(_python_)s myrmic.py')
env.RMIC(target = 'outdir', source = 'test2.JAVA')
-""" % python)
+""" % locals())
test.write('test2.JAVA', """\
test2.JAVA
@@ -128,7 +128,7 @@ foo.RMIC(target = 'outdir1',
JAVACLASSDIR = 'class1')
rmic = foo.Dictionary('RMIC')
-bar = foo.Copy(RMIC = r'%(python)s wrapper.py ' + rmic)
+bar = foo.Copy(RMIC = r'%(_python_)s wrapper.py ' + rmic)
bar_classes = bar.Java(target = 'class2', source = 'com/sub/bar')
# XXX This is kind of a Python brute-force way to do what Ant
# does with its "excludes" attribute. We should probably find
diff --git a/test/Java/RMICCOM.py b/test/Java/RMICCOM.py
index 109c22e..ed5e0d6 100644
--- a/test/Java/RMICCOM.py
+++ b/test/Java/RMICCOM.py
@@ -32,7 +32,7 @@ import os.path
import TestSCons
-python = TestSCons.python
+_python_ = TestSCons._python_
test = TestSCons.TestSCons()
@@ -58,7 +58,7 @@ sys.exit(0)
test.write('SConstruct', """
env = Environment(TOOLS = ['default', 'rmic'],
- RMICCOM = r'%(python)s myrmic.py $TARGET $SOURCES')
+ RMICCOM = r'%(_python_)s myrmic.py $TARGET $SOURCES')
env.RMIC(target = 'out', source = 'file1.class')
env.RMIC(target = 'out', source = 'file2.class')
env.RMIC(target = 'out', source = 'file3.class')
diff --git a/test/Java/RMICCOMSTR.py b/test/Java/RMICCOMSTR.py
index 1bcf300..5a451eb 100644
--- a/test/Java/RMICCOMSTR.py
+++ b/test/Java/RMICCOMSTR.py
@@ -33,7 +33,7 @@ import os.path
import TestSCons
-python = TestSCons.python
+_python_ = TestSCons._python_
test = TestSCons.TestSCons()
@@ -59,7 +59,7 @@ sys.exit(0)
test.write('SConstruct', """
env = Environment(TOOLS = ['default', 'rmic'],
- RMICCOM = r'%(python)s myrmic.py $TARGET $SOURCES',
+ RMICCOM = r'%(_python_)s myrmic.py $TARGET $SOURCES',
RMICCOMSTR = 'Building rmic $TARGET from $SOURCES')
env.RMIC(target = 'out', source = 'file1.class')
env.RMIC(target = 'out', source = 'file2.class')
generated by cgit v0.12 at 2024-08-24 00:27:18 (GMT)