diff --git a/indra/llcommon/llversionserver.h.in b/indra/llcommon/llversionserver.h.in deleted file mode 100644 index 96963e0bba..0000000000 --- a/indra/llcommon/llversionserver.h.in +++ /dev/null @@ -1,38 +0,0 @@ -/** - * @file llversionserver.h - * @brief - * - * $LicenseInfo:firstyear=2002&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_LLVERSIONSERVER_H -#define LL_LLVERSIONSERVER_H - -const S32 LL_VERSION_MAJOR = 2; -const S32 LL_VERSION_MINOR = 6; -const S32 LL_VERSION_PATCH = 1; -const S32 LL_VERSION_BUILD = 264760; - -const char * const LL_CHANNEL = "Second Life Server"; - - -#endif diff --git a/indra/llcommon/llversionviewer.h.in b/indra/llcommon/llversionviewer.h.in deleted file mode 100644 index 9e54c5a231..0000000000 --- a/indra/llcommon/llversionviewer.h.in +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @file llversionviewer.h - * @brief - * - * $LicenseInfo:firstyear=2002&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_LLVERSIONVIEWER_H -#define LL_LLVERSIONVIEWER_H - -const S32 LL_VERSION_MAJOR = 3; -const S32 LL_VERSION_MINOR = 5; -const S32 LL_VERSION_PATCH = 1; -const S32 LL_VERSION_BUILD = 264760; - -const char * const LL_CHANNEL = "Firestorm-private"; - -#if LL_DARWIN -const char * const LL_VERSION_BUNDLE_ID = "com.phoenixviewer.firestorm.viewer"; -#endif - -#endif diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 3ec08ca7ac..f813f77cb5 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -230,7 +230,7 @@ class ViewerManifest(LLManifest): def app_name(self): app_suffix='Test' channel_type=self.channel_lowerword() - if channel_type == 'release' : + if channel_type.startswith('release') : app_suffix='Viewer' elif re.match('^(beta|project).*',channel_type) : app_suffix=self.channel_unique() @@ -239,10 +239,9 @@ class ViewerManifest(LLManifest): def icon_path(self): icon_path="icons/" channel_type=self.channel_lowerword() - #print "Icon channel type '%s'" % channel_type F_EX merge LL new - print "DEBUG: channel_type= %s" % channel_type # AO, for further refining - if channel_type == 'release' : - icon_path += channel_type + print "Icon channel type '%s'" % channel_type + if channel_type.startswith('release') : + icon_path += 'release' elif re.match('^beta.*',channel_type) : icon_path += 'beta' elif re.match('^project.*',channel_type) : @@ -301,7 +300,7 @@ class WindowsManifest(ViewerManifest): def final_exe(self): app_suffix="Test" channel_type=self.channel_lowerword() - if channel_type == 'release' : + if channel_type.startswith('release') : app_suffix='' elif re.match('^(beta|project).*',channel_type) : app_suffix=''.join(self.channel_unique().split()) @@ -611,9 +610,6 @@ class WindowsManifest(ViewerManifest): 'channel_unique':self.channel_unique(), 'subchannel_underscores':'_'.join(self.channel_unique().split()) } - - print "DEBUG , version= %s" % self.args['version'] - print substitution_strings version_vars = """ !define INSTEXE "%(final_exe)s" @@ -760,11 +756,11 @@ class DarwinManifest(ViewerManifest): if self.prefix(src="", dst="Contents"): # everything goes in Contents self.path("Info.plist", dst="Info.plist") - #self.path("Info-Firestorm.plist", dst="Info.plist") F_EX merge - FS old, above is LL new # copy additional libs in /Contents/MacOS/ self.path("../packages/lib/release/libndofdev.dylib", dst="Resources/libndofdev.dylib") self.path("../packages/lib/release/libhunspell-1.3.0.dylib", dst="Resources/libhunspell-1.3.0.dylib") + if self.prefix(dst="MacOS"): self.path2basename("../viewer_components/updater/scripts/darwin", "*.py") self.end_prefix() @@ -1029,18 +1025,6 @@ class DarwinManifest(ViewerManifest): print "Copying to dmg", s, d self.copy_action(self.src_path_of(s), os.path.join(volpath, d)) - # 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) @@ -1061,12 +1045,23 @@ 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")) # Set the disk image root's custom icon bit self.run_command('SetFile -a C %r' % volpath) - finally: # Unmount the image even if exceptions from any of the above self.run_command('hdiutil detach -force %r' % devfile) diff --git a/scripts/build_channel.py b/scripts/build_channel.py deleted file mode 100755 index 24af4bd27b..0000000000 --- a/scripts/build_channel.py +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/env python -"""\ -@file build_version.py -@brief Print the build information embedded in a header file. - - Expects to be invoked from the command line with a file name and a - list of directories to search. The file name will be one of the - following: - - llversionserver.h - llversionviewer.h - - The directory list that follows will include indra/llcommon, where - these files live. - -$LicenseInfo:firstyear=2010&license=viewerlgpl$ -Second Life Viewer Source Code -Copyright (C) 2010-2011, Linden Research, Inc. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; -version 2.1 of the License only. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA -$/LicenseInfo$ -""" - -import errno, os, re - -def get_channel(filename): - fp = open(filename) - data = fp.read() - fp.close() - - vals = {} - m = re.search('const char \* const LL_CHANNEL = \"(.*)\";', data) - vals['channel'] = m.group(1) - - return vals['channel'] - -if __name__ == '__main__': - import sys - - try: - for path in sys.argv[2:]: - name = os.path.join(path, sys.argv[1]) - try: - print get_channel(name) - break - except OSError, err: - if err.errno != errno.ENOENT: - raise - else: - print >> sys.stderr, 'File not found:', sys.argv[1] - sys.exit(1) - except AttributeError: - print >> sys.stderr, 'Error: malformatted file: ', name - sys.exit(1) - except IndexError: - print >> sys.stderr, ('Usage: %s llversion[...].h [directories]' % - sys.argv[0]) diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh index 17b2222ff3..5634d54f4d 100755 --- a/scripts/configure_firestorm.sh +++ b/scripts/configure_firestorm.sh @@ -319,7 +319,6 @@ if [ \( $WANTS_VERSION -eq $TRUE \) -o \( $WANTS_CONFIG -eq $TRUE \) ] ; then patchVer=`cat indra/Version | cut -d "=" -f 2 | cut -d "." -f 3` echo "Channel : Firestorm-${CHANNEL}" echo "Version : ${majorVer}.${minorVer}.${patchVer}.${buildVer}" - python ./scripts/update_version_files.py --channel="Firestorm-$CHANNEL" --version=${majorVer}.${minorVer}.${patchVer}.${buildVer} popd fi