Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Bug 785392 - Copy mar tools to latest- - r=aki

  • Loading branch information...
commit 8a84ebed1431cc98028ba0af783249b8fda6b215 1 parent 68e6de3
ccooper authored

Showing 1 changed file with 8 additions and 0 deletions. Show diff stats Hide diff stats

  1. 8  stage/post_upload.py
8  stage/post_upload.py
@@ -182,13 +182,21 @@ def ReleaseToLatest(options, upload_dir, files):
182 182
         latestDir += "/%s" % options.builddir
183 183
         latestPath += "/%s" % options.builddir
184 184
 
  185
+    marToolsPath = "%s/mar-tools" % latestPath
  186
+
185 187
     for f in files:
  188
+        filename = os.path.basename(f)
186 189
         if f.endswith('crashreporter-symbols.zip'):
187 190
             continue
188 191
         if PARTIAL_MAR_RE.search(f):
189 192
             continue
190 193
         if options.branch.endswith('l10n') and f.endswith('.xpi'):
191 194
             CopyFileToDir(f, upload_dir, latestPath, preserve_dirs=True)
  195
+        elif filename in ('mar', 'mar.exe', 'mbsdiff', 'mbsdiff.exe'):
  196
+            if options.tinderbox_builds_dir:
  197
+                platform = options.tinderbox_builds_dir.split('-')[-1]
  198
+                if platform in ('win32', 'macosx64', 'linux', 'linux64'):
  199
+                    CopyFileToDir(f, upload_dir, '%s/%s' % (marToolsPath, platform))
192 200
         else:
193 201
             CopyFileToDir(f, upload_dir, latestPath)
194 202
     os.utime(latestPath, None)

0 notes on commit 8a84ebe

Please sign in to comment.
Something went wrong with that request. Please try again.