Hack up the Mac packaging to actually work.

Evil hack, but this part seems broken on Mac.  Works fine on Linux, dunno about Windows.
Now it even builds from ssh with no GUI running.
This commit is contained in:
David Walter Seikel
2013-12-13 12:14:51 +10:00
parent 855bec2520
commit 2fc0375d97
2 changed files with 5 additions and 3 deletions
+3 -2
View File
@@ -740,8 +740,9 @@ class DarwinManifest(ViewerManifest):
self.run_command('strip -S "%(viewer_binary)s"' %
{ 'viewer_binary' : self.dst_path_of('Contents/MacOS/Second Life')})
def package_finish(self):
# No idea why, but the Mac version is not calling this, though the Linux version does. I've not checked the Windows version yet.
# SO just let it fall through and hope that doesn't mess things up.
# def package_finish(self):
channel_standin = 'Imprudence' # hah, our default channel is not usable on its own
if not self.default_channel():
channel_standin = self.channel()
+2 -1
View File
@@ -8,7 +8,8 @@ if [[ "$OSTYPE" =~ ^cygwin ]] ; then
iscc newview/${TYPE}/package/${version}-Windows-x86.iss
elif [[ "$OSTYPE" =~ ^darwin ]] ; then
cd ../../indra/build-darwin-*
../../scripts/package.py --build-dir=.
# This is actually taken care of in the build stage. For now.
#../../scripts/package.py --build-dir=.
else
cd ../../indra/viewer-linux-*
make package