diff options
| author | Russel Winder <russel@winder.org.uk> | 2016-04-10 09:41:00 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2016-04-10 09:41:00 (GMT) |
| commit | 6a37189174372c9c98c63ada58ab4352adf650e8 (patch) | |
| tree | 521ddb1071569fa90100e11d7f03af13d5689aaf /test/Deprecated/SourceCode/Perforce | |
| parent | 14924bcc1713c5bd7dcf4db5b420204407048889 (diff) | |
| parent | 3e0a831c7fcd60384266e14641a3a15f2cba1ced (diff) | |
| download | SCons-6a37189174372c9c98c63ada58ab4352adf650e8.zip SCons-6a37189174372c9c98c63ada58ab4352adf650e8.tar.gz SCons-6a37189174372c9c98c63ada58ab4352adf650e8.tar.bz2 | |
Commit resolved conflicted merge.
Diffstat (limited to 'test/Deprecated/SourceCode/Perforce')
| -rw-r--r-- | test/Deprecated/SourceCode/Perforce/P4COM.py | 2 | ||||
| -rw-r--r-- | test/Deprecated/SourceCode/Perforce/P4COMSTR.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/Deprecated/SourceCode/Perforce/P4COM.py b/test/Deprecated/SourceCode/Perforce/P4COM.py index 9b9bab1..e58cb60 100644 --- a/test/Deprecated/SourceCode/Perforce/P4COM.py +++ b/test/Deprecated/SourceCode/Perforce/P4COM.py @@ -74,7 +74,7 @@ def cat(env, source, target): f.close() env = Environment(TOOLS = ['default', 'Perforce'], BUILDERS={'Cat':Builder(action=cat)}, - P4COM='%(_python_)s my-p4.py $TARGET') + P4COM=r'%(_python_)s my-p4.py $TARGET') env.Cat('aaa.out', 'aaa.in') env.Cat('bbb.out', 'bbb.in') env.Cat('ccc.out', 'ccc.in') diff --git a/test/Deprecated/SourceCode/Perforce/P4COMSTR.py b/test/Deprecated/SourceCode/Perforce/P4COMSTR.py index 7a24021..7b2fbba 100644 --- a/test/Deprecated/SourceCode/Perforce/P4COMSTR.py +++ b/test/Deprecated/SourceCode/Perforce/P4COMSTR.py @@ -75,7 +75,7 @@ def cat(env, source, target): f.close() env = Environment(TOOLS = ['default', 'Perforce'], BUILDERS={'Cat':Builder(action=cat)}, - P4COM='%(_python_)s my-p4.py $TARGET', + P4COM=r'%(_python_)s my-p4.py $TARGET', P4COMSTR='Checking out $TARGET from our fake Perforce') env.Cat('aaa.out', 'aaa.in') env.Cat('bbb.out', 'bbb.in') |