Check out files from various source code systems properly.

6 files changed, 27 insertions, 29 deletions

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 89566b2..57fd1c2 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -176,7 +176,7 @@ def get_DefaultRCSBuilder():
     if DefaultRCSBuilder is None:
         import SCons.Builder
         import SCons.Defaults
-        DefaultRCSBuilder = SCons.Builder.Builder(action = '$RCSCOM',
+        DefaultRCSBuilder = SCons.Builder.Builder(action = '$RCS_COCOM',
                                                   env = SCons.Defaults._default_env)
     return DefaultRCSBuilder
 
diff --git a/src/engine/SCons/Tool/BitKeeper.py b/src/engine/SCons/Tool/BitKeeper.py
index 94e084f..6d81eb0 100644
--- a/src/engine/SCons/Tool/BitKeeper.py
+++ b/src/engine/SCons/Tool/BitKeeper.py
@@ -42,21 +42,16 @@ def generate(env, platform):
     """Add a Builder factory function and construction variables for
     BitKeeper to an Environment."""
 
-    def BitKeeperFactory(repos, module='', env=env):
+    def BitKeeperFactory(env=env):
         """ """
-        # fail if repos is not an absolute path name?
-        if module != '':
-           module = os.path.join(module, '')
-        return SCons.Builder.Builder(action = "$BITKEEPERCOM",
-                                     env = env,
-                                     overrides = {'BKREPOSITORY':repos,
-                                                  'BKMODULE':module})
+        return SCons.Builder.Builder(action = "$BITKEEPERCOM", env = env)
 
     setattr(env, 'BitKeeper', BitKeeperFactory)
 
-    env['BITKEEPER']      = 'bk'
-    env['BITKEEPERFLAGS'] = ''
-    env['BITKEEPERCOM']   = '$BITKEEPER get $BITKEEPERFLAGS -p $BKREPOSITORY/$BKMODULE$TARGET > $TARGET'
+    env['BITKEEPER']         = 'bk'
+    env['BITKEEPERGET']      = '$BITKEEPER get'
+    env['BITKEEPERGETFLAGS'] = ''
+    env['BITKEEPERCOM']      = '$BITKEEPERGET $BITKEEPERGETFLAGS $TARGET'
 
 def exists(env):
     return env.Detect('bk')
diff --git a/src/engine/SCons/Tool/CVS.py b/src/engine/SCons/Tool/CVS.py
index c8b1f68..b8f6968 100644
--- a/src/engine/SCons/Tool/CVS.py
+++ b/src/engine/SCons/Tool/CVS.py
@@ -46,6 +46,7 @@ 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'
         return SCons.Builder.Builder(action = '$CVSCOM',
                                      env = env,
                                      overrides = {'CVSREPOSITORY':repos,
@@ -53,9 +54,10 @@ def generate(env, platform):
 
     setattr(env, 'CVS', CVSFactory)
 
-    env['CVS']      = 'cvs'
-    env['CVSFLAGS'] = ''
-    env['CVSCOM']   = '$CVS $CVSFLAGS -d $CVSREPOSITORY co -p $CVSMODULE$TARGET > $TARGET'
+    env['CVS']        = 'cvs'
+    env['CVSFLAGS']   = '-d $CVSREPOSITORY'
+    env['CVSCOFLAGS'] = ''
+    env['CVSCOM']     = '$CVS $CVSFLAGS co $CVSCOFLAGS $TARGET'
 
 def exists(env):
     return env.Detect('cvs')
diff --git a/src/engine/SCons/Tool/RCS.py b/src/engine/SCons/Tool/RCS.py
index f6276c5..2a7e9e4 100644
--- a/src/engine/SCons/Tool/RCS.py
+++ b/src/engine/SCons/Tool/RCS.py
@@ -41,14 +41,14 @@ def generate(env, platform):
 
     def RCSFactory(env=env):
         """ """
-        return SCons.Builder.Builder(action = '$RCSCOM', env = env)
+        return SCons.Builder.Builder(action = '$RCS_COCOM', env = env)
 
     setattr(env, 'RCS', RCSFactory)
 
-    env['CO']       = 'co'
-    env['RCS']      = 'rcs'
-    env['RCSFLAGS'] = ''
-    env['RCSCOM']   = '$CO $RCSFLAGS $TARGET'
+    env['RCS']          = 'rcs'
+    env['RCS_CO']       = 'co'
+    env['RCS_COFLAGS']  = ''
+    env['RCS_COCOM']    = '$RCS_CO $RCS_COFLAGS $TARGET'
 
 def exists(env):
     return env.Detect('rcs')
diff --git a/src/engine/SCons/Tool/SCCS.py b/src/engine/SCons/Tool/SCCS.py
index 1b5d480..b559fea 100644
--- a/src/engine/SCons/Tool/SCCS.py
+++ b/src/engine/SCons/Tool/SCCS.py
@@ -45,9 +45,10 @@ def generate(env, platform):
 
     setattr(env, 'SCCS', SCCSFactory)
 
-    env['SCCS']      = 'sccs'
-    env['SCCSFLAGS'] = ''
-    env['SCCSCOM']   = '$SCCS $SCCSFLAGS get $TARGET'
+    env['SCCS']         = 'sccs'
+    env['SCCSFLAGS']    = ''
+    env['SCCSGETFLAGS'] = ''
+    env['SCCSCOM']      = '$SCCS $SCCSFLAGS get $SCCSGETFLAGS $TARGET'
 
 def exists(env):
     return env.Detect('sccs')
diff --git a/src/engine/SCons/Tool/Subversion.py b/src/engine/SCons/Tool/Subversion.py
index cec3eaf..195af39 100644
--- a/src/engine/SCons/Tool/Subversion.py
+++ b/src/engine/SCons/Tool/Subversion.py
@@ -46,16 +46,16 @@ def generate(env, platform):
         # fail if repos is not an absolute path name?
         if module != '':
             module = os.path.join(module, '')
-        return SCons.Builder.Builder(action = '$SUBVERSIONCOM',
+        return SCons.Builder.Builder(action = '$SVNCOM',
                                      env = env,
-                                     overrides = {'SUBVERSIONREPOSITORY':repos,
-                                                  'SUBVERSIONMODULE':module})
+                                     overrides = {'SVNREPOSITORY':repos,
+                                                  'SVNMODULE':module})
 
     setattr(env, 'Subversion', SubversionFactory)
 
-    env['SUBVERSION']      = 'svn'
-    env['SUBVERSIONFLAGS'] = ''
-    env['SUBVERSIONCOM']   = '$SUBVERSION $SUBVERSIONFLAGS cat $SUBVERSIONREPOSITORY/$SUBVERSIONMODULE$TARGET > $TARGET'
+    env['SVN']      = 'svn'
+    env['SVNFLAGS'] = ''
+    env['SVNCOM']   = '$SVN $SVNFLAGS cat $SVNREPOSITORY/$SVNMODULE$TARGET > $TARGET'
 
 def exists(env):
     return env.Detect('svn')