diff options
| author | Steven Knight <knight@baldmt.com> | 2006-11-04 05:31:24 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2006-11-04 05:31:24 (GMT) |
| commit | c36a10f28f1c38541757cbbe96d67cd87a2096e7 (patch) | |
| tree | 6631963b4e4521d9a9a643edc1269409083e4651 /test/Java | |
| parent | 6fcc7d78858a5ca068e3deea183d35295b7dd88e (diff) | |
| download | SCons-c36a10f28f1c38541757cbbe96d67cd87a2096e7.zip SCons-c36a10f28f1c38541757cbbe96d67cd87a2096e7.tar.gz SCons-c36a10f28f1c38541757cbbe96d67cd87a2096e7.tar.bz2 | |
Merged revisions 1667-1674 via svnmerge from
http://scons.tigris.org/svn/scons/branches/core
........
r1672 | stevenknight | 2006-11-03 23:11:52 -0600 (Fri, 03 Nov 2006) | 1 line
0.96.D480 - Don't use UNIX logic to detect an executable qmtest.py on Windows.
........
r1673 | stevenknight | 2006-11-03 23:18:59 -0600 (Fri, 03 Nov 2006) | 1 line
0.96.D481 - Remove the print statement from the previous checkin.
........
r1674 | stevenknight | 2006-11-03 23:25:43 -0600 (Fri, 03 Nov 2006) | 1 line
0.96.D482 - Create a env.Clone() method and encourage its use in favor of env.Copy().
........
Diffstat (limited to 'test/Java')
| -rw-r--r-- | test/Java/JAR.py | 2 | ||||
| -rw-r--r-- | test/Java/JAVAC.py | 2 | ||||
| -rw-r--r-- | test/Java/JAVAH.py | 2 | ||||
| -rw-r--r-- | test/Java/RMIC.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/Java/JAR.py b/test/Java/JAR.py index 5342a48..f0951c6 100644 --- a/test/Java/JAR.py +++ b/test/Java/JAR.py @@ -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.Clone(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/JAVAC.py b/test/Java/JAVAC.py index b5fb3f8..7c06324 100644 --- a/test/Java/JAVAC.py +++ b/test/Java/JAVAC.py @@ -116,7 +116,7 @@ test.write('SConstruct', """ foo = Environment(tools = ['javac'], JAVAC = r'%(where_javac)s') javac = foo.Dictionary('JAVAC') -bar = foo.Copy(JAVAC = r'%(_python_)s wrapper.py ' + javac) +bar = foo.Clone(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']) diff --git a/test/Java/JAVAH.py b/test/Java/JAVAH.py index 9901764..15adf34 100644 --- a/test/Java/JAVAH.py +++ b/test/Java/JAVAH.py @@ -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.Clone(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/RMIC.py b/test/Java/RMIC.py index bb098e7..a66f885 100644 --- a/test/Java/RMIC.py +++ b/test/Java/RMIC.py @@ -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.Clone(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 |