[llvm-commits] [zorg] r171874 - /zorg/trunk/zorg/buildbot/Artifacts.py

[David Dean]

Author: ddean
Date: Tue Jan  8 11:54:22 2013
New Revision: 171874

URL: http://llvm.org/viewvc/llvm-project?rev=171874&view=rev
Log:
Add missing function which determines which upstream compiler to use. (Need a better solution later)

Modified:
    zorg/trunk/zorg/buildbot/Artifacts.py

Modified: zorg/trunk/zorg/buildbot/Artifacts.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/Artifacts.py?rev=171874&r1=171873&r2=171874&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/Artifacts.py (original)
+++ zorg/trunk/zorg/buildbot/Artifacts.py Tue Jan  8 11:54:22 2013
@@ -82,6 +82,28 @@
     
     return compiler_path
 
+def _determine_bootstrap_url(props):
+    if props.has_key('scheduler'):
+        name= ''
+        if props['scheduler'].startswith('phase2'):
+            # always use phase1 compiler for phase2
+            # TODO: this shouldn't be hard coded
+            name = 'clang-x86_64-darwin11-nobootstrap-RA'
+        else:
+            # always use phase2 compiler for phase3 & phase4 compiler builds
+            # TODO: this shouldn't be hard coded
+            name = 'clang-x86_64-darwin11-RA'
+        curl = download_url + '/' + name + '/clang-' + props['phase_id']
+        curl += '.tar.gz'
+        return curl
+    else:
+        # if we get this far, we can assume that someone clicked 'rebuild'
+        # (otherwise it would have a scheduler, or not have a phase_id)
+        # we'll fall back to the phase1 build for this compiler
+        curl = download_url + '/clang-x86_64-darwin11-nobootstrap-RA/'
+        curl += props['buildername'] + '.tar.gz'
+        return curl
+
 def GetCompilerRoot(f):
     # The following steps are used to retrieve a compiler archive
     # clean out any existing archives
@@ -146,7 +168,7 @@
 def determine_url(props):
     if props.has_key('phase_id') and props.has_key('category'):
         if props['category'].startswith('build-'):
-            return determine_bootstrap_url(props)
+            return _determine_bootstrap_url(props)
         project = project_from_name(props['buildername'])
         name = props['use_builder']
         curl = download_url + '/' + name + '/' + project_from_name(name)