[zorg] r374830 - Redefine API so it would not assume SVN.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Mon Oct 14 15:12:28 2019
New Revision: 374830

URL: http://llvm.org/viewvc/llvm-project?rev=374830&view=rev
Log:
Redefine API so it would not assume SVN.

Modified:
    zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py
    zorg/trunk/zorg/buildbot/process/factory.py

Modified: zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py?rev=374830&r1=374829&r2=374830&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py Mon Oct 14 15:12:28 2019
@@ -46,7 +46,7 @@ def getLLVMBuildFactoryAndPrepareForSour
 
     return f
 
-def getLLVMBuildFactoryAndSVNSteps(
+def getLLVMBuildFactoryAndSourcecodeSteps(
            depends_on_projects = None,
            llvm_srcdir = None,
            obj_dir = None,
@@ -64,10 +64,16 @@ def getLLVMBuildFactoryAndSVNSteps(
             **kwargs) # Pass through all the extra arguments.
 
     # Get the source code.
-    f.addSVNSteps()
+    f.addGetSourcecodeSteps(**kwargs)
 
     return f
 
+# NOTE: getLLVMBuildFactoryAndSVNSteps is deprecated and will be removed.
+# Please use getLLVMBuildFactoryAndSourcecodeSteps instead.
+def getLLVMBuildFactoryAndSVNSteps(**kwargs):
+    f = getgetLLVMBuildFactoryAndSourcecodeSteps(**kwargs) # Pass through all the extra arguments.
+    return f
+
 def addCmakeSteps(
            f,
            cleanBuildRequested,
@@ -207,7 +213,7 @@ def getCmakeBuildFactory(
         # Overwrite pre-set items with the given ones, so user can set anything.
         merged_env.update(env)
 
-    f = getLLVMBuildFactoryAndSVNSteps(
+    f = getgetLLVMBuildFactoryAndSourcecodeSteps
             depends_on_projects=depends_on_projects,
             llvm_srcdir=llvm_srcdir,
             obj_dir=obj_dir,
@@ -303,7 +309,7 @@ def getCmakeWithNinjaWithMSVCBuildFactor
         # We build by Visual Studio 2015, unless otherwise is requested.
         vs=r"""%VS140COMNTOOLS%"""
 
-    f = getLLVMBuildFactoryAndSVNSteps(
+    f = getLLVMBuildFactoryAndSourcecodeSteps(
             depends_on_projects=depends_on_projects,
             llvm_srcdir=llvm_srcdir,
             obj_dir=obj_dir,
@@ -390,7 +396,7 @@ def getCmakeWithNinjaMultistageBuildFact
         stage_objdirs.append("%s/%s" % (obj_dir, s))
         stage_installdirs.append("%s/%s" % (install_dir, s))
 
-    f = getLLVMBuildFactoryAndSVNSteps(
+    f = getLLVMBuildFactoryAndSourcecodeSteps(
             depends_on_projects=depends_on_projects,
             llvm_srcdir=llvm_srcdir,
             obj_dir=obj_dir,

Modified: zorg/trunk/zorg/buildbot/process/factory.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/process/factory.py?rev=374830&r1=374829&r2=374830&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/process/factory.py (original)
+++ zorg/trunk/zorg/buildbot/process/factory.py Mon Oct 14 15:12:28 2019
@@ -4,6 +4,7 @@ from buildbot.process.factory import Bui
 from buildbot.steps.source import SVN
 from buildbot.steps.shell import WithProperties
 
+# NOTE: svn_repos is deprecated and will be removed.
 svn_repos = OrderedDict([
   ('llvm'             , ("%(llvm_srcdir)s",                         '%(vcs_protocol:-http)s://llvm.org/svn/llvm-project/llvm/')),
   ('clang'            , ("%(llvm_srcdir)s/tools/clang",             '%(vcs_protocol:-http)s://llvm.org/svn/llvm-project/cfe/')),
@@ -62,6 +63,7 @@ class LLVMBuildFactory(BuildFactory):
     # mode - SVN checkout mode.
     # defaultBranch - the default branch to checkout.
     # and so on, see the list of the SVN params. 
+    # NOTE: addSVNSteps is deprecated and will be removed. Please use addGetSourcecodeSteps instead.
     def addSVNSteps(self, llvm_srcdir=None, **kwargs):
         if llvm_srcdir is None:
             llvm_srcdir = self.llvm_srcdir
@@ -80,3 +82,6 @@ class LLVMBuildFactory(BuildFactory):
                         workdir=workdir % {'llvm_srcdir' : llvm_srcdir},
                         baseURL=WithProperties(baseURL),
                         **kwargs))
+
+    def addGetSourcecodeSteps(self, **kwargs):
+        self.addSVNSteps(**kwargs)