diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index c5294e0a8c..26802e8095 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1025,6 +1025,21 @@ class DarwinManifest(ViewerManifest): print "Copying to dmg", s, d self.copy_action(self.src_path_of(s), os.path.join(volpath, d)) + # The next two commands *MUST* execute before the loop + # that hides the files. If not, packaging will fail. + # YOU HAVE BEEN WARNED. + # Create the alias file (which is a resource file) from the .r + self.run_command('Rez %r -o %r' % + (self.src_path_of("installers/darwin/release-dmg/Applications-alias.r"), + os.path.join(volpath, "Applications"))) + + # Set up the installer disk image: set icon positions, folder view + # options, and icon label colors. This must be done before the + # files are hidden. + self.run_command('osascript %r %r' % + (self.src_path_of("installers/darwin/installer-dmg.applescript"), + volname)) + # Hide the background image, DS_Store file, and volume icon file (set their "visible" bit) for f in ".VolumeIcon.icns", "background.png", ".DS_Store": pathname = os.path.join(volpath, f) @@ -1045,18 +1060,6 @@ class DarwinManifest(ViewerManifest): # the original problem manifest by executing the desired command. self.run_command('SetFile -a V %r' % pathname) - # Create the alias file (which is a resource file) from the .r - self.run_command('Rez %r -o %r' % - (self.src_path_of("installers/darwin/release-dmg/Applications-alias.r"), - os.path.join(volpath, "Applications"))) - - # Set up the installer disk image: set icon positions, folder view - # options, and icon label colors. This must be done before the - # files are hidden. - self.run_command('osascript %r %r' % - (self.src_path_of("installers/darwin/installer-dmg.applescript"), - volname)) - # Set the alias file's alias and custom icon bits self.run_command('SetFile -a AC %r' % os.path.join(volpath, "Applications"))