diff options
author | Steven Knight <knight@baldmt.com> | 2003-04-09 14:54:03 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2003-04-09 14:54:03 (GMT) |
commit | 357e981118ba9f2528a2a5f3f60a3f928046558b (patch) | |
tree | 9729558c032bad479e9e69e9c25daecd85bc357a /src/engine/SCons/Tool/CVS.py | |
parent | 393e4ca7e9d1308803da49bee667f1a874c612db (diff) | |
download | SCons-357e981118ba9f2528a2a5f3f60a3f928046558b.zip SCons-357e981118ba9f2528a2a5f3f60a3f928046558b.tar.gz SCons-357e981118ba9f2528a2a5f3f60a3f928046558b.tar.bz2 |
Set the SYSTEMROOT environment variable on Windows, use POSIX (forward-slash) paths when checking things out of CVS.
Diffstat (limited to 'src/engine/SCons/Tool/CVS.py')
-rw-r--r-- | src/engine/SCons/Tool/CVS.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/CVS.py b/src/engine/SCons/Tool/CVS.py index b8f6968..9c5dc60 100644 --- a/src/engine/SCons/Tool/CVS.py +++ b/src/engine/SCons/Tool/CVS.py @@ -45,8 +45,10 @@ def generate(env, platform): """ """ # fail if repos is not an absolute path name? if module != '': - module = os.path.join(module, '') - env['CVSCOM'] = '$CVS $CVSFLAGS co $CVSCOFLAGS -p $CVSMODULE$TARGET > $TARGET' + # Don't use os.path.join() because the name we fetch might + # be across a network and must use POSIX slashes as separators. + module = module + '/' + env['CVSCOM'] = '$CVS $CVSFLAGS co $CVSCOFLAGS -p $CVSMODULE${TARGET.posix} > $TARGET' return SCons.Builder.Builder(action = '$CVSCOM', env = env, overrides = {'CVSREPOSITORY':repos, @@ -57,7 +59,7 @@ def generate(env, platform): env['CVS'] = 'cvs' env['CVSFLAGS'] = '-d $CVSREPOSITORY' env['CVSCOFLAGS'] = '' - env['CVSCOM'] = '$CVS $CVSFLAGS co $CVSCOFLAGS $TARGET' + env['CVSCOM'] = '$CVS $CVSFLAGS co $CVSCOFLAGS ${TARGET.posix}' def exists(env): return env.Detect('cvs') |