[sldev] Code review request: branding patch SNOW-17 for Linux

[Brad King]

Rob Lanphier wrote:
> Hi folks,
> 
> More branding work.  SNOW-17 has three patches, only one of which is
> ready for prime time.  See:
> https://jira.secondlife.com/secure/ManageAttachments.jspa?id=34683
> 
> This has a couple of common changes plus the Linux-specific portion. 
> It's not the perfect abstraction for branding, but it's a baby step in
> that direction.
> 
> I'll check it in when I get a thumbs up from a committer.

The commit:

   http://svn.secondlife.com/trac/linden/changeset/2381/projects/2009/http-texture

includes this hunk:

@@ -697,7 +720,7 @@ class Linux_i686Manifest(LinuxManifest):
  class Linux_x86_64Manifest(LinuxManifest):
      def construct(self):
          super(Linux_x86_64Manifest, self).construct()
-        self.path("secondlife-stripped","bin/do-not-directly-run-secondlife-bin")
+        self.path("secondlife-stripped",self.get_linuxbin())
          self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin")
          self.path("linux_tools/launch_url.sh","launch_url.sh")
          if self.prefix("res-sdl"):

However, get_linuxbin() is not defined anywhere I can see.  It leads
to the error below.

-Brad


Traceback (most recent call last):
   File "/.../linden/indra/newview/viewer_manifest.py", line 735, in <module>
     main()
   File "/.../linden/indra/newview/../lib/python/indra/util/llmanifest.py", line 236, in main
     wm.do(*args['actions'])
   File "/.../linden/indra/newview/../lib/python/indra/util/llmanifest.py", line 650, in do
     self.construct()
   File "/.../linden/indra/newview/viewer_manifest.py", line 723, in construct
     self.path("secondlife-stripped",self.get_linuxbin())
AttributeError: 'Linux_x86_64Manifest' object has no attribute 'get_linuxbin'
make[2]: *** [newview/Snowglobe-x86_64-0.9.0.2369.tar.bz2] Error 1