Merge viewer64 and completely comment out the new VMP trampoline circus stunts for Mac

autobuild.xml

@@ -3524,9 +3524,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>fc3291e515f11e8324407949fb53cb53</string>
+              <string>92235fabdca2d3865014f7ec630e2688</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11161/62517/viewer_manager-1.0.511006-darwin64-511006.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11444/64857/viewer_manager-1.0.511221-darwin64-511221.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -3548,9 +3548,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>93421dfd7486517350c434cf568d0914</string>
+              <string>bfea9c61d0b29d741081c0c8a315d364</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11163/62529/viewer_manager-1.0.511006-windows-511006.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11446/64863/viewer_manager-1.0.511221-windows-511221.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -3561,7 +3561,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>source_type</key>
         <string>hg</string>
         <key>version</key>
-        <string>1.0.511006</string>
+        <string>1.0.511221</string>
       </map>
       <key>vlc-bin</key>
       <map>

indra/lib/python/indra/util/llmanifest.py

@@ -527,6 +527,20 @@ class LLManifest(object):
         return path
 
     def run_command(self, command):
+        """ 
+        Runs an external command.  
+        Raises ManifestError exception if the command returns a nonzero status.
+        """
+        print "Running command:", command
+        sys.stdout.flush()
+        try:
+            subprocess.check_call(command)
+        except subprocess.CalledProcessError as err:
+            raise ManifestError( "Command %s returned non-zero status (%s)"
+                                % (command, err.returncode) )
+
+    # <FS:Ansariel> Added for compatibility reasons
+    def run_command_shell(self, command):
         """ 
         Runs an external command.  
         Raises ManifestError exception if the command returns a nonzero status.
@@ -538,6 +552,7 @@ class LLManifest(object):
         except subprocess.CalledProcessError as err:
             raise ManifestError( "Command %s returned non-zero status (%s)"
                                 % (command, err.returncode) )
+    # </FS:Ansariel>
 
     def created_path(self, path):
         """ Declare that you've created a path in order to
@@ -550,6 +565,7 @@ class LLManifest(object):
     def put_in_file(self, contents, dst, src=None):
         # write contents as dst
         dst_path = self.dst_path_of(dst)
+        self.cmakedirs(os.path.dirname(dst_path))
         f = open(dst_path, "wb")
         try:
             f.write(contents)

indra/newview/fs_viewer_manifest.py

@@ -96,12 +96,12 @@ class FSViewerManifest:
         if not os.path.exists( debugDir ):
             os.makedirs( debugDir )
 
-        self.run_command( "objcopy %s %s" % (fileSource, debugFile) )
+        self.run_command_shell( "objcopy %s %s" % (fileSource, debugFile) )
 
-        self.run_command( "gdb -batch -ex \"save gdb-index %s\" %s" % (debugDir, debugFile ) )
-        self.run_command( "objcopy --add-section .gdb_index=%s --set-section-flags .gdb_index=readonly %s %s" % (debugIndexFile, debugFile, debugFile) )
+        self.run_command_shell( "gdb -batch -ex \"save gdb-index %s\" %s" % (debugDir, debugFile ) )
+        self.run_command_shell( "objcopy --add-section .gdb_index=%s --set-section-flags .gdb_index=readonly %s %s" % (debugIndexFile, debugFile, debugFile) )
 
-        self.run_command( "cd %s && objcopy --add-gnu-debuglink=%s %s" % (debugDir, debugName, fileBin) )
+        self.run_command_shell( "cd %s && objcopy --add-gnu-debuglink=%s %s" % (debugDir, debugName, fileBin) )
         
         if( os.path.exists( "%s/firestorm-symbols-linux.tar.bz2" % self.args['configuration'].lower()) ):
             symName = "%s/Phoenix_%s_%s_%s_symbols-linux.tar.bz2" % ( self.args['configuration'].lower(), self.fs_channel_legacy_oneword(),
@@ -174,7 +174,7 @@ class FSViewerManifest:
 
     def fs_setuid_chromesandbox( self ):
         filename = os.path.join( self.get_dst_prefix(), "bin", "chrome-sandbox" )
-        self.run_command( "chmod 755 %s" % ( filename) ) # Strip sticky bit that might be set (in case the following two commands fail)
-        self.run_command( "sudo -n chown root:root %s || exit 0" % ( filename) )
-        self.run_command( "sudo -n chmod 4755 %s || exit 0" % ( filename) )
+        self.run_command_shell( "chmod 755 %s" % ( filename) ) # Strip sticky bit that might be set (in case the following two commands fail)
+        self.run_command_shell( "sudo -n chown root:root %s || exit 0" % ( filename) )
+        self.run_command_shell( "sudo -n chmod 4755 %s || exit 0" % ( filename) )