aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/cmake/00-Common.cmake5
-rwxr-xr-xlinden/indra/develop.py208
-rwxr-xr-xlinden/indra/llplugin/slplugin/CMakeLists.txt2
-rw-r--r--linden/indra/mac_crash_logger/CMakeLists.txt2
-rw-r--r--linden/indra/mac_updater/CMakeLists.txt2
-rw-r--r--linden/indra/media_plugins/webkit/CMakeLists.txt4
-rw-r--r--linden/indra/newview/CMakeLists.txt46
-rw-r--r--linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss4
-rw-r--r--linden/indra/newview/installers/windows/imprudence_installer_template.iss16
-rw-r--r--linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings4
-rw-r--r--linden/indra/newview/res/viewerRes.rc4
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py49
-rw-r--r--linden/indra/newview/viewerinfo.cpp2
-rw-r--r--linden/indra/test_apps/llplugintest/CMakeLists.txt4
-rwxr-xr-xlinden/scripts/linux/0-patch-SL-source2
-rwxr-xr-xlinden/scripts/linux/1-get-libraries-from-SL11
-rwxr-xr-xlinden/scripts/linux/3-compile-SL-source27
-rwxr-xr-xlinden/scripts/linux/4-package-viewer11
-rw-r--r--linden/scripts/linux/config-SL-source22
19 files changed, 215 insertions, 210 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 81bfbdf..ea21ba0 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -24,6 +24,11 @@ list(REMOVE_DUPLICATES TYPES)
24set(CMAKE_CONFIGURATION_TYPES ${TYPES} CACHE STRING "Supported build types." FORCE) 24set(CMAKE_CONFIGURATION_TYPES ${TYPES} CACHE STRING "Supported build types." FORCE)
25unset(TYPES) 25unset(TYPES)
26 26
27# Work around nmake / VS difference.
28set(VIEWER_CFG_INTDIR ${CMAKE_CFG_INTDIR})
29if (NMAKE)
30 set(VIEWER_CFG_INTDIR ${CMAKE_BUILD_TYPE})
31endif(NMAKE)
27 32
28# Determine the number of bits of this processor 33# Determine the number of bits of this processor
29 34
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 3760609..76ba0d9 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -408,7 +408,7 @@ class LinuxSetup(UnixSetup):
408 print 'Running %r' % cmd 408 print 'Running %r' % cmd
409 self.run(cmd) 409 self.run(cmd)
410 410
411 411
412class DarwinSetup(UnixSetup): 412class DarwinSetup(UnixSetup):
413 def __init__(self): 413 def __init__(self):
414 super(DarwinSetup, self).__init__() 414 super(DarwinSetup, self).__init__()
@@ -485,6 +485,10 @@ class WindowsSetup(PlatformSetup):
485 'vc100' : { 485 'vc100' : {
486 'gen' : r'Visual Studio 10', 486 'gen' : r'Visual Studio 10',
487 'ver' : r'10.0' 487 'ver' : r'10.0'
488 },
489 'nmake' : {
490 'gen' : r'NMake Makefiles',
491 'ver' : r''
488 } 492 }
489 } 493 }
490 gens['vs2003'] = gens['vc71'] 494 gens['vs2003'] = gens['vc71']
@@ -500,6 +504,41 @@ class WindowsSetup(PlatformSetup):
500 self._generator = None 504 self._generator = None
501 self.incredibuild = False 505 self.incredibuild = False
502 506
507 def find_visual_studio(self, gen=None):
508 if gen is None:
509 gen = self._generator
510 gen = gen.lower()
511 try:
512 import _winreg
513 key_str = (r'SOFTWARE\Microsoft\VisualStudio\%s\Setup\VS' %
514 self.gens[gen]['ver'])
515 value_str = (r'EnvironmentDirectory')
516 reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
517 key = _winreg.OpenKey(reg, key_str)
518 value = _winreg.QueryValueEx(key, value_str)[0]
519 print 'Found: %s' % value
520 return value
521 except WindowsError, err:
522 return ''
523
524 def find_visual_studio_express(self, gen=None):
525 if gen is None:
526 gen = self._generator
527 gen = gen.lower()
528 try:
529 import _winreg
530 key_str = (r'SOFTWARE\Microsoft\VCExpress\%s\Setup\VC' %
531 self.gens[gen]['ver'])
532 value_str = (r'ProductDir')
533 reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
534 key = _winreg.OpenKey(reg, key_str)
535 value = _winreg.QueryValueEx(key, value_str)[0]+"IDE"
536 print 'Found: %s' % value
537 self.using_express = True
538 return value
539 except WindowsError, err:
540 return ''
541
503 def _get_generator(self): 542 def _get_generator(self):
504 if self._generator is None: 543 if self._generator is None:
505 for version in 'vc80 vc90 vc100 vc71'.split(): 544 for version in 'vc80 vc90 vc100 vc71'.split():
@@ -508,9 +547,8 @@ class WindowsSetup(PlatformSetup):
508 print 'Building with ', self.gens[version]['gen'] 547 print 'Building with ', self.gens[version]['gen']
509 break 548 break
510 else: 549 else:
511 print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions'
512 for version in 'vc80 vc90 vc100 vc71'.split(): 550 for version in 'vc80 vc90 vc100 vc71'.split():
513 if self.find_visual_studio_express(version): 551 if self.find_visual_studio_express(version) != '':
514 self._generator = version 552 self._generator = version
515 self.using_express = True 553 self.using_express = True
516 print 'Building with ', self.gens[version]['gen'] , "Express edition" 554 print 'Building with ', self.gens[version]['gen'] , "Express edition"
@@ -521,6 +559,8 @@ class WindowsSetup(PlatformSetup):
521 return self._generator 559 return self._generator
522 560
523 def _set_generator(self, gen): 561 def _set_generator(self, gen):
562 if gen == 'nmake':
563 self._get_generator()
524 self._generator = gen 564 self._generator = gen
525 565
526 generator = property(_get_generator, _set_generator) 566 generator = property(_get_generator, _set_generator)
@@ -538,83 +578,62 @@ class WindowsSetup(PlatformSetup):
538 opts=quote(opts), 578 opts=quote(opts),
539 standalone=self.standalone, 579 standalone=self.standalone,
540 unattended=self.unattended, 580 unattended=self.unattended,
541 project_name=self.project_name 581 project_name=self.project_name,
582 type=self.build_type,
583 use_vstool='ON',
584 nmake=''
542 ) 585 )
586 if self.generator == 'nmake':
587 args['use_vstool'] = 'OFF'
588 args['nmake'] = '-DNMAKE:BOOL=ON'
589 if self.using_express:
590 args['using_express'] = 'ON'
591 args['use_vstool'] = 'OFF'
592 else:
593 args['using_express'] = 'OFF'
543 # default to packaging disabled 594 # default to packaging disabled
544 # if simple: 595 # if simple:
545 # return 'cmake %(opts)s "%(dir)s"' % args 596 # return 'cmake %(opts)s "%(dir)s"' % args
546 return ('cmake -G "%(generator)s" ' 597 return ('cmake -G "%(generator)s" '
598 '-DCMAKE_BUILD_TYPE:STRING=%(type)s '
547 '-DSTANDALONE:BOOL=%(standalone)s ' 599 '-DSTANDALONE:BOOL=%(standalone)s '
548 '-DUNATTENDED:BOOL=%(unattended)s ' 600 '-DUNATTENDED:BOOL=%(unattended)s '
549 '-DROOT_PROJECT_NAME:STRING=%(project_name)s ' 601 '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
550 #'-DPACKAGE:BOOL=ON ' 602 '-DUSING_EXPRESS:BOOL=%(using_express)s '
603 '-DUSE_VSTOOL:BOOL=%(use_vstool)s '
604 '%(nmake)s '
551 '%(opts)s "%(dir)s"' % args) 605 '%(opts)s "%(dir)s"' % args)
552 606
553 def find_visual_studio(self, gen=None):
554 if gen is None:
555 gen = self._generator
556 gen = gen.lower()
557 try:
558 import _winreg
559 key_str = (r'SOFTWARE\Microsoft\VisualStudio\%s\Setup\VS' %
560 self.gens[gen]['ver'])
561 value_str = (r'EnvironmentDirectory')
562 print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' %
563 (key_str, value_str))
564 print key_str
565
566 reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
567 key = _winreg.OpenKey(reg, key_str)
568 value = _winreg.QueryValueEx(key, value_str)[0]
569 print 'Found: %s' % value
570 return value
571 except WindowsError, err:
572 print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
573 return ''
574
575 def find_visual_studio_express(self, gen=None):
576 if gen is None:
577 gen = self._generator
578 gen = gen.lower()
579 try:
580 import _winreg
581 key_str = (r'SOFTWARE\Microsoft\VCExpress\%s\Setup\VC' %
582 self.gens[gen]['ver'])
583 value_str = (r'ProductDir')
584 print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' %
585 (key_str, value_str))
586 print key_str
587
588 reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
589 key = _winreg.OpenKey(reg, key_str)
590 value = _winreg.QueryValueEx(key, value_str)[0]+"IDE"
591 print 'Found: %s' % value
592 self.using_express = True
593 return value
594 except WindowsError, err:
595 print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
596 return ''
597
598 def get_build_cmd(self): 607 def get_build_cmd(self):
599 if self.incredibuild: 608 if self.incredibuild:
600 config = self.build_type 609 config = self.build_type
601 if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0', r'10.0', r'7.1' ]: 610 if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0', r'10.0', r'7.1' ]:
602 config = '\"%s|Win32\"' % config 611 config = '\"%s|Win32\"' % config
603
604 return "buildconsole %s.sln /build %s" % (self.project_name, config) 612 return "buildconsole %s.sln /build %s" % (self.project_name, config)
605 613
606 environment = self.find_visual_studio() 614 environment = self.find_visual_studio(self.generator)
607 if environment == '': 615 if environment == '':
608 environment = self.find_visual_studio_express() 616 environment = self.find_visual_studio_express(self.generator)
609 if environment == '': 617 if self.generator != 'nmake':
610 print >> sys.stderr, "Something went very wrong during build stage, could not find a Visual Studio?" 618 if environment == '':
611 else: 619 print >> sys.stderr, "Something went very wrong during build stage, could not find a Visual Studio?"
612 print >> sys.stderr, "\nSolution generation complete, as you are using an express edition the final\n stages will need to be completed by hand" 620 else:
613 build_dirs=self.build_dirs(); 621 print >> sys.stderr, "\nSolution generation complete, as you are using an express edition the final\n stages will need to be completed by hand"
614 print >> sys.stderr, "Solution can now be found in:", build_dirs[0] 622 build_dirs=self.build_dirs();
615 print >> sys.stderr, "Set %s as startup project" % self.project_name 623 print >> sys.stderr, "Solution can now be found in:", build_dirs[0]
616 print >> sys.stderr, "Set build target is Release or RelWithDbgInfo" 624 print >> sys.stderr, "Set %s as startup project" % self.project_name
617 exit(0) 625 print >> sys.stderr, "Set build target is Release or RelWithDbgInfo"
626 exit(0)
627
628 if self.generator == 'nmake':
629 # Hack around a bug in cmake that I'm surprised did not hit GUI controlled builds.
630 self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make')
631 self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/newview/CMakeFiles/imprudence-bin.dir/flags.make')
632 self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make')
633 self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/newview/CMakeFiles/imprudence-bin.dir/flags.make')
634 # Evil hack.
635 self.run(r'touch newview/touched.bat')
636 return 'nmake'
618 637
619 # devenv.com is CLI friendly, devenv.exe... not so much. 638 # devenv.com is CLI friendly, devenv.exe... not so much.
620 return ('"%sdevenv.com" %s.sln /build %s' % 639 return ('"%sdevenv.com" %s.sln /build %s' %
@@ -634,55 +653,29 @@ class WindowsSetup(PlatformSetup):
634 raise CommandError('the command %r %s' % 653 raise CommandError('the command %r %s' %
635 (name, ret)) 654 (name, ret))
636 655
637 def run_cmake(self, args=[]):
638 '''Override to add the vstool.exe call after running cmake.'''
639 PlatformSetup.run_cmake(self, args)
640 if self.unattended == 'OFF':
641 if self.using_express == False:
642 self.run_vstool()
643
644 def run_vstool(self):
645 for build_dir in self.build_dirs():
646 stamp = os.path.join(build_dir, 'vstool.txt')
647 try:
648 prev_build = open(stamp).read().strip()
649 except IOError:
650 prev_build = ''
651 if prev_build == self.build_type:
652 # Only run vstool if the build type has changed.
653 continue
654 vstool_cmd = (os.path.join('tools','vstool','VSTool.exe') +
655 ' --solution ' +
656 os.path.join(build_dir,'Imprudence.sln') +
657 ' --config ' + self.build_type +
658 ' --startup imprudence-bin')
659 print 'Running %r in %r' % (vstool_cmd, getcwd())
660 self.run(vstool_cmd)
661 print >> open(stamp, 'w'), self.build_type
662
663 def run_build(self, opts, targets): 656 def run_build(self, opts, targets):
664 cwd = getcwd() 657 cwd = getcwd()
665 build_cmd = self.get_build_cmd() 658 build_cmd = self.get_build_cmd()
666 659 if build_cmd != "":
667 for d in self.build_dirs(): 660 for d in self.build_dirs():
668 try: 661 try:
669 os.chdir(d) 662 os.chdir(d)
670 if targets: 663 if targets:
671 for t in targets: 664 for t in targets:
672 cmd = '%s /project %s %s' % (build_cmd, t, ' '.join(opts)) 665 cmd = '%s /project %s %s' % (build_cmd, t, ' '.join(opts))
666 print 'Running %r in %r' % (cmd, d)
667 self.run(cmd)
668 else:
669 cmd = '%s %s' % (build_cmd, ' '.join(opts))
673 print 'Running %r in %r' % (cmd, d) 670 print 'Running %r in %r' % (cmd, d)
674 self.run(cmd) 671 self.run(cmd)
675 else: 672 finally:
676 cmd = '%s %s' % (build_cmd, ' '.join(opts)) 673 os.chdir(cwd)
677 print 'Running %r in %r' % (cmd, d) 674
678 self.run(cmd)
679 finally:
680 os.chdir(cwd)
681
682class CygwinSetup(WindowsSetup): 675class CygwinSetup(WindowsSetup):
683 def __init__(self): 676 def __init__(self):
684 super(CygwinSetup, self).__init__() 677 super(CygwinSetup, self).__init__()
685 self.generator = 'vc80' 678 self.generator = 'nmake'
686 679
687 def cmake_commandline(self, src_dir, build_dir, opts, simple): 680 def cmake_commandline(self, src_dir, build_dir, opts, simple):
688 dos_dir = commands.getoutput("cygpath -w %s" % src_dir) 681 dos_dir = commands.getoutput("cygpath -w %s" % src_dir)
@@ -692,11 +685,13 @@ class CygwinSetup(WindowsSetup):
692 opts=quote(opts), 685 opts=quote(opts),
693 standalone=self.standalone, 686 standalone=self.standalone,
694 unattended=self.unattended, 687 unattended=self.unattended,
695 project_name=self.project_name 688 project_name=self.project_name,
689 type=self.build_type
696 ) 690 )
697 #if simple: 691 #if simple:
698 # return 'cmake %(opts)s "%(dir)s"' % args 692 # return 'cmake %(opts)s "%(dir)s"' % args
699 return ('cmake -G "%(generator)s" ' 693 return ('cmake -G "%(generator)s" '
694 '-DCMAKE_BUILD_TYPE:STRING=%(type)s '
700 '-DUNATTENDED:BOOl=%(unattended)s ' 695 '-DUNATTENDED:BOOl=%(unattended)s '
701 '-DSTANDALONE:BOOL=%(standalone)s ' 696 '-DSTANDALONE:BOOL=%(standalone)s '
702 '-DROOT_PROJECT_NAME:STRING=%(project_name)s ' 697 '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
@@ -723,7 +718,7 @@ Options:
723 -m32 | -m64 build architecture (32-bit or 64-bit) 718 -m32 | -m64 build architecture (32-bit or 64-bit)
724 -N | --no-distcc disable use of distcc 719 -N | --no-distcc disable use of distcc
725 -G | --generator=NAME generator name 720 -G | --generator=NAME generator name
726 Windows: VC80 (VS2005--default), VC71 (VS2003), 721 Windows: NMake, VC80 (VS2005--default), VC71 (VS2003),
727 VC90 (VS2008), or VC100 (VS2010) 722 VC90 (VS2008), or VC100 (VS2010)
728 Mac OS X: Xcode (default), Unix Makefiles 723 Mac OS X: Xcode (default), Unix Makefiles
729 Linux: Unix Makefiles (default), KDevelop3 724 Linux: Unix Makefiles (default), KDevelop3
@@ -806,7 +801,6 @@ For example: develop.py configure -DSERVER:BOOL=OFF"""
806 for d in setup.build_dirs(): 801 for d in setup.build_dirs():
807 if not os.path.exists(d): 802 if not os.path.exists(d):
808 raise CommandError('run "develop.py cmake" first') 803 raise CommandError('run "develop.py cmake" first')
809 setup.run_cmake()
810 opts, targets = setup.parse_build_opts(args) 804 opts, targets = setup.parse_build_opts(args)
811 setup.run_build(opts, targets) 805 setup.run_build(opts, targets)
812 elif cmd == 'clean': 806 elif cmd == 'clean':
diff --git a/linden/indra/llplugin/slplugin/CMakeLists.txt b/linden/indra/llplugin/slplugin/CMakeLists.txt
index 81d9299..f794dae 100755
--- a/linden/indra/llplugin/slplugin/CMakeLists.txt
+++ b/linden/indra/llplugin/slplugin/CMakeLists.txt
@@ -75,7 +75,7 @@ if (DARWIN)
75 COMMAND mkdir 75 COMMAND mkdir
76 ARGS 76 ARGS
77 -p 77 -p
78 ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/SLPlugin.app/Contents/Resources 78 ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/SLPlugin.app/Contents/Resources
79 ) 79 )
80endif (DARWIN) 80endif (DARWIN)
81 81
diff --git a/linden/indra/mac_crash_logger/CMakeLists.txt b/linden/indra/mac_crash_logger/CMakeLists.txt
index daf3e10..ee1dc93 100644
--- a/linden/indra/mac_crash_logger/CMakeLists.txt
+++ b/linden/indra/mac_crash_logger/CMakeLists.txt
@@ -71,6 +71,6 @@ add_custom_command(
71 -E 71 -E
72 copy_directory 72 copy_directory
73 ${CMAKE_CURRENT_SOURCE_DIR}/CrashReporter.nib 73 ${CMAKE_CURRENT_SOURCE_DIR}/CrashReporter.nib
74 ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/mac-crash-logger.app/Contents/Resources/CrashReporter.nib 74 ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/mac-crash-logger.app/Contents/Resources/CrashReporter.nib
75 ) 75 )
76 76
diff --git a/linden/indra/mac_updater/CMakeLists.txt b/linden/indra/mac_updater/CMakeLists.txt
index 0eac76f..5ae7dd8 100644
--- a/linden/indra/mac_updater/CMakeLists.txt
+++ b/linden/indra/mac_updater/CMakeLists.txt
@@ -74,6 +74,6 @@ add_custom_command(
74 -E 74 -E
75 copy_directory 75 copy_directory
76 ${CMAKE_CURRENT_SOURCE_DIR}/AutoUpdater.nib 76 ${CMAKE_CURRENT_SOURCE_DIR}/AutoUpdater.nib
77 ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/mac-updater.app/Contents/Resources/AutoUpdater.nib 77 ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/mac-updater.app/Contents/Resources/AutoUpdater.nib
78 ) 78 )
79 79
diff --git a/linden/indra/media_plugins/webkit/CMakeLists.txt b/linden/indra/media_plugins/webkit/CMakeLists.txt
index 303a774..f589c61 100644
--- a/linden/indra/media_plugins/webkit/CMakeLists.txt
+++ b/linden/indra/media_plugins/webkit/CMakeLists.txt
@@ -112,8 +112,8 @@ if (DARWIN)
112 # copy the webkit dylib to the build directory 112 # copy the webkit dylib to the build directory
113 add_custom_command( 113 add_custom_command(
114 TARGET media_plugin_webkit POST_BUILD 114 TARGET media_plugin_webkit POST_BUILD
115# OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllqtwebkit.dylib 115# OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/libllqtwebkit.dylib
116 COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ 116 COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/
117 DEPENDS media_plugin_webkit ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib 117 DEPENDS media_plugin_webkit ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib
118 ) 118 )
119 119
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index b9c41fc..907fa5c 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1326,7 +1326,7 @@ if (WINDOWS)
1326 1326
1327 # sets the 'working directory' for debugging from visual studio. 1327 # sets the 'working directory' for debugging from visual studio.
1328 if (NOT UNATTENDED) 1328 if (NOT UNATTENDED)
1329 if (NOT self.using_express) 1329 if (USE_VSTOOL)
1330 add_custom_command( 1330 add_custom_command(
1331 TARGET ${VIEWER_BINARY_NAME} PRE_BUILD 1331 TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
1332 COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe 1332 COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
@@ -1338,7 +1338,7 @@ if (WINDOWS)
1338 ${CMAKE_CURRENT_SOURCE_DIR} 1338 ${CMAKE_CURRENT_SOURCE_DIR}
1339 COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging." 1339 COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
1340 ) 1340 )
1341 endif (NOT self.using_express) 1341 endif (USE_VSTOOL)
1342 endif (NOT UNATTENDED) 1342 endif (NOT UNATTENDED)
1343 1343
1344 add_custom_command( 1344 add_custom_command(
@@ -1348,7 +1348,7 @@ if (WINDOWS)
1348 -E 1348 -E
1349 copy_if_different 1349 copy_if_different
1350 ${CMAKE_CURRENT_SOURCE_DIR}/../../scripts/messages/message_template.msg 1350 ${CMAKE_CURRENT_SOURCE_DIR}/../../scripts/messages/message_template.msg
1351 ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings/message_template.msg 1351 ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/app_settings/message_template.msg
1352 COMMENT "Copying message_template.msg to the runtime folder." 1352 COMMENT "Copying message_template.msg to the runtime folder."
1353 ) 1353 )
1354 1354
@@ -1359,7 +1359,7 @@ if (WINDOWS)
1359 -E 1359 -E
1360 copy_if_different 1360 copy_if_different
1361 ${CMAKE_CURRENT_SOURCE_DIR}/../../etc/message.xml 1361 ${CMAKE_CURRENT_SOURCE_DIR}/../../etc/message.xml
1362 ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings/message.xml 1362 ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/app_settings/message.xml
1363 COMMENT "Copying message.xml to the runtime folder." 1363 COMMENT "Copying message.xml to the runtime folder."
1364 ) 1364 )
1365 1365
@@ -1370,11 +1370,11 @@ if (WINDOWS)
1370 endif (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts) 1370 endif (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
1371 1371
1372 add_custom_command( 1372 add_custom_command(
1373 OUTPUT ${CMAKE_CFG_INTDIR}/touched.bat 1373 OUTPUT ${VIEWER_CFG_INTDIR}/touched.bat
1374 COMMAND ${PYTHON_EXECUTABLE} 1374 COMMAND ${PYTHON_EXECUTABLE}
1375 ARGS 1375 ARGS
1376 ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py 1376 ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
1377 --configuration=${CMAKE_CFG_INTDIR} 1377 --configuration=${VIEWER_CFG_INTDIR}
1378 --channel=${VIEWER_CHANNEL} 1378 --channel=${VIEWER_CHANNEL}
1379 --login_channel=${VIEWER_LOGIN_CHANNEL} 1379 --login_channel=${VIEWER_LOGIN_CHANNEL}
1380 --standalone=${STANDALONE} 1380 --standalone=${STANDALONE}
@@ -1383,15 +1383,15 @@ if (WINDOWS)
1383 --source=${CMAKE_CURRENT_SOURCE_DIR} 1383 --source=${CMAKE_CURRENT_SOURCE_DIR}
1384 --artwork=${ARTWORK_DIR} 1384 --artwork=${ARTWORK_DIR}
1385 --build=${CMAKE_CURRENT_BINARY_DIR} 1385 --build=${CMAKE_CURRENT_BINARY_DIR}
1386 --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/package 1386 --dest=${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/package
1387 --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat 1387 --touch=${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/touched.bat
1388 DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py 1388 DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
1389 ) 1389 )
1390 1390
1391 add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit media_plugin_gstreamer010) 1391 add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit media_plugin_gstreamer010)
1392 1392
1393 if (PACKAGE) 1393 if (PACKAGE)
1394 add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat) 1394 add_custom_target(package ALL DEPENDS ${VIEWER_CFG_INTDIR}/touched.bat)
1395 add_dependencies(package windows-updater windows-crash-logger) 1395 add_dependencies(package windows-updater windows-crash-logger)
1396 endif (PACKAGE) 1396 endif (PACKAGE)
1397endif (WINDOWS) 1397endif (WINDOWS)
@@ -1526,8 +1526,8 @@ if (DARWIN)
1526 --artwork=${ARTWORK_DIR} 1526 --artwork=${ARTWORK_DIR}
1527 --build=${CMAKE_CURRENT_BINARY_DIR} 1527 --build=${CMAKE_CURRENT_BINARY_DIR}
1528 --buildtype=${CMAKE_BUILD_TYPE} 1528 --buildtype=${CMAKE_BUILD_TYPE}
1529 --configuration=${CMAKE_CFG_INTDIR} 1529 --configuration=${VIEWER_CFG_INTDIR}
1530 --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app 1530 --dest=${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/${product}.app
1531 --grid=${GRID} 1531 --grid=${GRID}
1532 --source=${CMAKE_CURRENT_SOURCE_DIR} 1532 --source=${CMAKE_CURRENT_SOURCE_DIR}
1533 --standalone=${STANDALONE} 1533 --standalone=${STANDALONE}
@@ -1558,8 +1558,8 @@ if (WINDOWS)
1558 -E 1558 -E
1559 copy_if_different 1559 copy_if_different
1560 ${BUILT_LLCOMMON} 1560 ${BUILT_LLCOMMON}
1561 ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} 1561 ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}
1562 COMMENT "Copying llcommon.dll to the runtime folder." 1562 COMMENT "Copying llcommon.dll to the runtime folder ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}."
1563 ) 1563 )
1564 1564
1565 get_target_property(BUILT_SLPLUGIN SLPlugin LOCATION) 1565 get_target_property(BUILT_SLPLUGIN SLPlugin LOCATION)
@@ -1570,8 +1570,8 @@ if (WINDOWS)
1570 -E 1570 -E
1571 copy_if_different 1571 copy_if_different
1572 ${BUILT_SLPLUGIN} 1572 ${BUILT_SLPLUGIN}
1573 ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} 1573 ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}
1574 COMMENT "Copying SLPlugin executable to the runtime folder." 1574 COMMENT "Copying SLPlugin executable to the runtime folder ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}."
1575 ) 1575 )
1576 1576
1577 get_target_property(BUILT_WEBKIT_PLUGIN media_plugin_webkit LOCATION) 1577 get_target_property(BUILT_WEBKIT_PLUGIN media_plugin_webkit LOCATION)
@@ -1582,8 +1582,8 @@ if (WINDOWS)
1582 -E 1582 -E
1583 copy_if_different 1583 copy_if_different
1584 ${BUILT_WEBKIT_PLUGIN} 1584 ${BUILT_WEBKIT_PLUGIN}
1585 ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin 1585 ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin
1586 COMMENT "Copying WebKit Plugin to the runtime folder." 1586 COMMENT "Copying WebKit Plugin to the runtime folder ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin."
1587 ) 1587 )
1588 1588
1589 get_target_property(BUILT_GSTREAMER_PLUGIN media_plugin_gstreamer010 LOCATION) 1589 get_target_property(BUILT_GSTREAMER_PLUGIN media_plugin_gstreamer010 LOCATION)
@@ -1594,8 +1594,8 @@ if (WINDOWS)
1594 -E 1594 -E
1595 copy_if_different 1595 copy_if_different
1596 ${BUILT_GSTREAMER_PLUGIN} 1596 ${BUILT_GSTREAMER_PLUGIN}
1597 ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin 1597 ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin
1598 COMMENT "Copying Gstreamer Plugin to the runtime folder." 1598 COMMENT "Copying Gstreamer Plugin to the runtime folder ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin."
1599 ) 1599 )
1600 1600
1601 get_target_property(BUILT_QUICKTIME_PLUGIN media_plugin_quicktime LOCATION) 1601 get_target_property(BUILT_QUICKTIME_PLUGIN media_plugin_quicktime LOCATION)
@@ -1606,13 +1606,13 @@ if (WINDOWS)
1606 -E 1606 -E
1607 copy_if_different 1607 copy_if_different
1608 ${BUILT_QUICKTIME_PLUGIN} 1608 ${BUILT_QUICKTIME_PLUGIN}
1609 ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin 1609 ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin
1610 COMMENT "Copying Quicktime Plugin to the runtime folder." 1610 COMMENT "Copying Quicktime Plugin to the runtime folder ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin."
1611 ) 1611 )
1612 1612
1613 # Copying the mime_types.xml file to app_settings 1613 # Copying the mime_types.xml file to app_settings
1614 set(mime_types_source "${CMAKE_SOURCE_DIR}/newview/skins/default/xui/en-us") 1614 set(mime_types_source "${CMAKE_SOURCE_DIR}/newview/skins/default/xui/en-us")
1615 set(mime_types_dest "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings") 1615 set(mime_types_dest "${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/app_settings")
1616 add_custom_command( 1616 add_custom_command(
1617 TARGET ${VIEWER_BINARY_NAME} POST_BUILD 1617 TARGET ${VIEWER_BINARY_NAME} POST_BUILD
1618 COMMAND ${CMAKE_COMMAND} 1618 COMMAND ${CMAKE_COMMAND}
@@ -1629,7 +1629,7 @@ endif (WINDOWS)
1629if (DARWIN) 1629if (DARWIN)
1630# Don't do this here -- it's taken care of by viewer_manifest.py 1630# Don't do this here -- it's taken care of by viewer_manifest.py
1631# add_custom_command(TARGET ${VIEWER_BINARY_NAME} POST_BUILD 1631# add_custom_command(TARGET ${VIEWER_BINARY_NAME} POST_BUILD
1632# COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin/ 1632# COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin/
1633# DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib 1633# DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib
1634# ) 1634# )
1635endif (DARWIN) 1635endif (DARWIN)
diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
index d50957d..a396381 100644
--- a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
+++ b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
@@ -9,11 +9,11 @@
9; These will change 9; These will change
10AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460} 10AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460}
11AppName=Imprudence Viewer Experimental 11AppName=Imprudence Viewer Experimental
12AppVerName=Imprudence Viewer 1.4.0.3 exp 0 windows test release 12AppVerName=Imprudence Viewer 1.4.0.3 exp 1 windows test release
13DefaultDirName={pf}\ImprudenceExperimental 13DefaultDirName={pf}\ImprudenceExperimental
14DefaultGroupName=Imprudence Viewer Experimental 14DefaultGroupName=Imprudence Viewer Experimental
15VersionInfoProductName=Imprudence Viewer Experimental 15VersionInfoProductName=Imprudence Viewer Experimental
16OutputBaseFilename=Imprudence-1.4.0.3-exp-0-windows-test 16OutputBaseFilename=Imprudence-1.4.0.3-exp-1-windows-test
17VersionInfoVersion=1.4.0.3 17VersionInfoVersion=1.4.0.3
18VersionInfoTextVersion=1.4.0.3 18VersionInfoTextVersion=1.4.0.3
19VersionInfoProductVersion=1.4.0.3 19VersionInfoProductVersion=1.4.0.3
diff --git a/linden/indra/newview/installers/windows/imprudence_installer_template.iss b/linden/indra/newview/installers/windows/imprudence_installer_template.iss
index 7113368..6ae437e 100644
--- a/linden/indra/newview/installers/windows/imprudence_installer_template.iss
+++ b/linden/indra/newview/installers/windows/imprudence_installer_template.iss
@@ -8,7 +8,7 @@
8; Imp Experimental ID: 1B3E68BC-13EB-4277-9439-CB5FF9259460 8; Imp Experimental ID: 1B3E68BC-13EB-4277-9439-CB5FF9259460
9 9
10; These will change 10; These will change
11AppId={{D7736EE8-AFCE-4735-BBE3-652CDFBBFCA8} 11AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460}
12AppName=%%APPNAME%% 12AppName=%%APPNAME%%
13AppVerName=%%APPVERNAME%% 13AppVerName=%%APPVERNAME%%
14DefaultDirName={pf}\Imprudence 14DefaultDirName={pf}\Imprudence
@@ -27,16 +27,16 @@ AppPublisher=The Imprudence Project
27AppPublisherURL=http://kokuaviewer.org 27AppPublisherURL=http://kokuaviewer.org
28AppSupportURL=http://kokuaviewer.org 28AppSupportURL=http://kokuaviewer.org
29AllowNoIcons=true 29AllowNoIcons=true
30InfoAfterFile=..\..\..\..\..\README.txt 30InfoAfterFile=..\..\..\..\..\..\README.txt
31OutputDir=. 31OutputDir=.
32SetupIconFile=..\..\..\newview\installers\windows\imp_icon.ico 32SetupIconFile=..\..\..\..\newview\installers\windows\imp_icon.ico
33Compression=lzma2/ultra64 33Compression=lzma2/ultra64
34InternalCompressLevel=ultra64 34InternalCompressLevel=ultra64
35SolidCompression=true 35SolidCompression=true
36PrivilegesRequired=poweruser 36PrivilegesRequired=poweruser
37AllowRootDirectory=true 37AllowRootDirectory=true
38WizardImageFile=..\..\..\newview\installers\windows\imprudence_installer_icon_left.bmp 38WizardImageFile=..\..\..\..\newview\installers\windows\imprudence_installer_icon_left.bmp
39WizardSmallImageFile=..\..\..\newview\installers\windows\imprudence_installer_icon_right.bmp 39WizardSmallImageFile=..\..\..\..\newview\installers\windows\imprudence_installer_icon_right.bmp
40SetupLogging=true 40SetupLogging=true
41RestartIfNeededByRun=false 41RestartIfNeededByRun=false
42AlwaysRestart=false 42AlwaysRestart=false
@@ -145,9 +145,9 @@ Source: %%PACKAGEFILES%%\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion
145Source: %%PACKAGEFILES%%\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion 145Source: %%PACKAGEFILES%%\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion
146 146
147; VC++ 2005 SP1 x86, VC++ 2008 SP1 x86, and VC++ 2010 SP1 x86 redist 147; VC++ 2005 SP1 x86, VC++ 2008 SP1 x86, and VC++ 2010 SP1 x86 redist
148Source: ..\..\..\newview\installers\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe 148Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe
149;Source: ..\..\..\newview\installers\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe 149;Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe
150Source: ..\..\..\newview\installers\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe 150Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe
151 151
152; Old files we don't use anymore: 152; Old files we don't use anymore:
153; Source: %%PACKAGEFILES%%\dronesettings.xml; DestDir: {app}; Flags: ignoreversion 153; Source: %%PACKAGEFILES%%\dronesettings.xml; DestDir: {app}; Flags: ignoreversion
diff --git a/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings b/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings
index 91eae98..e0014d3 100644
--- a/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
1/* Localized versions of Info.plist keys */ 1/* Localized versions of Info.plist keys */
2 2
3CFBundleName = "Imprudence"; 3CFBundleName = "Imprudence";
4CFBundleShortVersionString = "Imprudence 1.4.0.3 exp 0"; 4CFBundleShortVersionString = "Imprudence 1.4.0.3 exp 1";
5CFBundleGetInfoString = "Imprudence 1.4.0.3 exp 0"; 5CFBundleGetInfoString = "Imprudence 1.4.0.3 exp 1";
diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc
index 4144e47..edeee92 100644
--- a/linden/indra/newview/res/viewerRes.rc
+++ b/linden/indra/newview/res/viewerRes.rc
@@ -156,11 +156,11 @@ BEGIN
156 BEGIN 156 BEGIN
157 VALUE "CompanyName", "Imprudence Viewer Project" 157 VALUE "CompanyName", "Imprudence Viewer Project"
158 VALUE "FileDescription", "Imprudence" 158 VALUE "FileDescription", "Imprudence"
159 VALUE "FileVersion", "1.4.0.3 exp 0" 159 VALUE "FileVersion", "1.4.0.3 exp 1"
160 VALUE "InternalName", "Imprudence" 160 VALUE "InternalName", "Imprudence"
161 VALUE "OriginalFilename", "imprudence.exe" 161 VALUE "OriginalFilename", "imprudence.exe"
162 VALUE "ProductName", "Imprudence" 162 VALUE "ProductName", "Imprudence"
163 VALUE "ProductVersion", "1.4.0.3 exp 0" 163 VALUE "ProductVersion", "1.4.0.3 exp 1"
164 END 164 END
165 END 165 END
166 BLOCK "VarFileInfo" 166 BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 6380b39..ea18cd2 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -232,21 +232,15 @@ class WindowsManifest(ViewerManifest):
232 232
233 def construct(self): 233 def construct(self):
234 super(WindowsManifest, self).construct() 234 super(WindowsManifest, self).construct()
235 # the final exe is complicated because we're not sure where it's coming from, 235 # Come out, come out, where ever you are.
236 # nor do we have a fixed name for the executable 236 executable = self.find_existing_file('release/imprudence-bin.exe', 'releasesse2/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe', 'debug/imprudence-bin.exe', './imprudence-bin.exe')
237 # Actually, we know on both counts -- MC 237 nmake = False
238 if self.configuration().lower() == "release": 238 self.path(executable, dst=self.final_exe())
239 self.path(self.find_existing_file('release/imprudence-bin.exe'), dst=self.final_exe())
240 elif self.configuration().lower() == "releasesse2":
241 self.path(self.find_existing_file('releasesse2/imprudence-bin.exe'), dst=self.final_exe())
242 elif self.configuration().lower() == "relwithdebinfo":
243 self.path(self.find_existing_file('relwithdebinfo/imprudence-bin.exe'), dst=self.final_exe())
244 elif self.configuration().lower() == "debug":
245 self.path(self.find_existing_file('debug/imprudence-bin.exe'), dst=self.final_exe())
246 else:
247 self.path(self.find_existing_file('release/imprudence-bin.exe', 'releasesse2/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe', 'debug/imprudence-bin.exe'), dst=self.final_exe())
248 239
249 # copy over the the pdb file for the regular or SSE2 versions if we don't already have one copied 240 # copy over the the pdb file for the regular or SSE2 versions if we don't already have one copied
241 # Don't think this ever worked, the destination seems bogus.
242 # It's trying to copy a built file outside of the source tree, a file we have anyway.
243 # TODO - do we even need this?
250 symbol_ver = '.'.join(self.args['version']) 244 symbol_ver = '.'.join(self.args['version'])
251 symbol_file = 'imprudence-%s.%s.pdb' % (symbol_ver, self.args['configuration']) 245 symbol_file = 'imprudence-%s.%s.pdb' % (symbol_ver, self.args['configuration'])
252 symbol_path = '../../../../../pdb_files/%s' % (symbol_file) 246 symbol_path = '../../../../../pdb_files/%s' % (symbol_file)
@@ -255,7 +249,7 @@ class WindowsManifest(ViewerManifest):
255 else: 249 else:
256 #print "%s doesn't exist yet" % (os.getcwd() + symbol_path) 250 #print "%s doesn't exist yet" % (os.getcwd() + symbol_path)
257 try: 251 try:
258 self.path(self.find_existing_file('release/imprudence-bin.pdb'), dst="../%s" % (symbol_path)) 252 self.path(self.find_existing_file(executable.split('/', 1)[0] % '/imprudence-bin.pdb'), dst="../%s" % (symbol_path))
259 pass 253 pass
260 except: 254 except:
261 print "Can't save symbol file %s, skipping" % (symbol_path) 255 print "Can't save symbol file %s, skipping" % (symbol_path)
@@ -270,7 +264,13 @@ class WindowsManifest(ViewerManifest):
270 self.path("imprudence.url") 264 self.path("imprudence.url")
271 265
272 # Plugin host application 266 # Plugin host application
273 self.path(os.path.join(os.pardir, 'llplugin', 'slplugin', self.args['configuration'], "SLPlugin.exe"), "SLPlugin.exe") 267 try:
268 self.path(os.path.join(os.pardir, 'llplugin', 'slplugin', self.args['configuration'], "SLPlugin.exe"), "SLPlugin.exe")
269 except:
270 # Probably an nmake build, which is not putting exe's into the configuration folders.
271 self.path(os.path.join(os.pardir, 'llplugin', 'slplugin', "SLPlugin.exe"), "SLPlugin.exe")
272 # Propogate our wild guess.
273 nmake = True
274 274
275 self.path("featuretable.txt") 275 self.path("featuretable.txt")
276 276
@@ -281,7 +281,7 @@ class WindowsManifest(ViewerManifest):
281 #self.path("fmod.dll") 281 #self.path("fmod.dll")
282 282
283 # For spellchecking 283 # For spellchecking
284 if self.prefix(src=self.args['configuration'], dst=""): 284 if self.prefix(self.args['configuration'], dst=""):
285 self.path("libhunspell.dll") 285 self.path("libhunspell.dll")
286 self.end_prefix() 286 self.end_prefix()
287 287
@@ -289,7 +289,7 @@ class WindowsManifest(ViewerManifest):
289 self.path("llkdu.dll.2.config") 289 self.path("llkdu.dll.2.config")
290 290
291 # Get llcommon and deps. 291 # Get llcommon and deps.
292 if self.prefix(src=self.args['configuration'], dst=""): 292 if self.prefix(self.args['configuration'], dst=""):
293 self.path('libapr-1.dll') 293 self.path('libapr-1.dll')
294 self.path('libaprutil-1.dll') 294 self.path('libaprutil-1.dll')
295 self.path('libapriconv-1.dll') 295 self.path('libapriconv-1.dll')
@@ -307,21 +307,26 @@ class WindowsManifest(ViewerManifest):
307 self.path("alut.dll") 307 self.path("alut.dll")
308 self.end_prefix() 308 self.end_prefix()
309 309
310 # TODO - Yes, I know, would be better if nmake builds put stuff in the right place, track that down and fix it later.
311 if nmake:
312 config = ''
313 else:
314 config = self.args['configuration']
310 # Media plugins - QuickTime 315 # Media plugins - QuickTime
311 if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"): 316 if self.prefix(src='../media_plugins/quicktime/%s' % config, dst="llplugin"):
312 self.path("media_plugin_quicktime.dll") 317 self.path("media_plugin_quicktime.dll")
313 self.end_prefix() 318 self.end_prefix()
314 319
315 # Media plugins - WebKit/Qt 320 # Media plugins - WebKit/Qt
316 if self.prefix(src='../media_plugins/webkit/%s' % self.args['configuration'], dst="llplugin"): 321 if self.prefix(src='../media_plugins/webkit/%s' % config, dst="llplugin"):
317 self.path("media_plugin_webkit.dll") 322 self.path("media_plugin_webkit.dll")
318 self.end_prefix() 323 self.end_prefix()
319 324
320 # Media plugins - GStreamer 325 # Media plugins - GStreamer
321 if self.prefix(src='../media_plugins/gstreamer010/%s' % self.args['configuration'], dst="llplugin"): 326 if self.prefix(src='../media_plugins/gstreamer010/%s' % config, dst="llplugin"):
322 self.path("media_plugin_gstreamer010.dll") 327 self.path("media_plugin_gstreamer010.dll")
323 self.end_prefix() 328 self.end_prefix()
324 329
325 # For WebKit/Qt plugin runtimes 330 # For WebKit/Qt plugin runtimes
326 if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"): 331 if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"):
327 self.path("libeay32.dll") 332 self.path("libeay32.dll")
diff --git a/linden/indra/newview/viewerinfo.cpp b/linden/indra/newview/viewerinfo.cpp
index d1ed1a0..7237c16 100644
--- a/linden/indra/newview/viewerinfo.cpp
+++ b/linden/indra/newview/viewerinfo.cpp
@@ -37,7 +37,7 @@ namespace ViewerInfo
37 const S32 MINOR = 4; 37 const S32 MINOR = 4;
38 const S32 PATCH = 0; 38 const S32 PATCH = 0;
39 const S32 RLEAS = 3; // increment for each beta/RC/release 39 const S32 RLEAS = 3; // increment for each beta/RC/release
40 const std::string EXTRA = "exp 0"; 40 const std::string EXTRA = "exp 1";
41 41
42 // Mac OS X bundle identifier. Should match the one in Info.plist. 42 // Mac OS X bundle identifier. Should match the one in Info.plist.
43 const std::string BUNDLE_ID = "org.imprudenceviewer.viewer"; 43 const std::string BUNDLE_ID = "org.imprudenceviewer.viewer";
diff --git a/linden/indra/test_apps/llplugintest/CMakeLists.txt b/linden/indra/test_apps/llplugintest/CMakeLists.txt
index a6cb740..91ba2db 100644
--- a/linden/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/linden/indra/test_apps/llplugintest/CMakeLists.txt
@@ -311,7 +311,7 @@ endif (DARWIN OR LINUX)
311if (DARWIN) 311if (DARWIN)
312 # path inside the app bundle where we'll need to copy plugins and other related files 312 # path inside the app bundle where we'll need to copy plugins and other related files
313 set(PLUGINS_DESTINATION_DIR 313 set(PLUGINS_DESTINATION_DIR
314 ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llmediaplugintest.app/Contents/Resources 314 ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llmediaplugintest.app/Contents/Resources
315 ) 315 )
316 316
317 # create the Contents/Resources directory 317 # create the Contents/Resources directory
@@ -326,7 +326,7 @@ if (DARWIN)
326 ) 326 )
327else (DARWIN) 327else (DARWIN)
328 set(PLUGINS_DESTINATION_DIR 328 set(PLUGINS_DESTINATION_DIR
329 ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ 329 ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/
330 ) 330 )
331endif (DARWIN) 331endif (DARWIN)
332 332
diff --git a/linden/scripts/linux/0-patch-SL-source b/linden/scripts/linux/0-patch-SL-source
index 4885d5d..ce0dabe 100755
--- a/linden/scripts/linux/0-patch-SL-source
+++ b/linden/scripts/linux/0-patch-SL-source
@@ -22,7 +22,7 @@ if [ "$PATCHES" != "" ] ; then
22 elif echo $i | grep ".bz2" &>/dev/null ; then 22 elif echo $i | grep ".bz2" &>/dev/null ; then
23 bzcat $i | patch -p1 -s 23 bzcat $i | patch -p1 -s
24 elif echo $i | grep ".zip" &>/dev/null ; then 24 elif echo $i | grep ".zip" &>/dev/null ; then
25 unzip -o $i >/dev/null 25 unzip -o $i >/dev/null
26 else 26 else
27 patch -p1 -s <$i 27 patch -p1 -s <$i
28 fi 28 fi
diff --git a/linden/scripts/linux/1-get-libraries-from-SL b/linden/scripts/linux/1-get-libraries-from-SL
index 9ba61f4..99a4367 100755
--- a/linden/scripts/linux/1-get-libraries-from-SL
+++ b/linden/scripts/linux/1-get-libraries-from-SL
@@ -53,7 +53,7 @@ source config-SL-source
53cd $PATH_TO_SOURCES/indra 53cd $PATH_TO_SOURCES/indra
54 54
55# Do a clean build 55# Do a clean build
56./develop.py clean 56#./develop.py $os_extra clean
57 57
58# Force the vectorization use if we chose so. 58# Force the vectorization use if we chose so.
59if [ "$FORCE_VECTORIZE" == "yes" ] ; then 59if [ "$FORCE_VECTORIZE" == "yes" ] ; then
@@ -65,7 +65,8 @@ else
65 FATAL_WARNINGS="" 65 FATAL_WARNINGS=""
66fi 66fi
67# Configure the sources and download the LL provided libraries: 67# Configure the sources and download the LL provided libraries:
68./develop.py --type=Release configure "$FATAL_WARNINGS" \ 68./develop.py $os_extra --type=$TYPE configure "$FATAL_WARNINGS" \
69 -DCMAKE_C_FLAGS:STRING="-O2 $TUNE_FLAGS" -DCMAKE_CXX_FLAGS:STRING="-O2 $TUNE_FLAGS" \ 69 -DCMAKE_C_FLAGS:STRING="$TUNE_FLAGS" -DCMAKE_CXX_FLAGS:STRING="$TUNE_FLAGS" \
70 -DCMAKE_C_FLAGS_RELEASE:STRING="-O2 $TUNE_FLAGS" -DCMAKE_CXX_FLAGS_RELEASE:STRING="-O2 $TUNE_FLAGS" \ 70 -DCMAKE_C_FLAGS_DEBUG:STRING="-g $TUNE_FLAGS" -DCMAKE_CXX_FLAGS_DEBUG:STRING="-g $TUNE_FLAGS" \
71 -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="-g -O2 $TUNE_FLAGS" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-g -O2 $TUNE_FLAGS" 71 -DCMAKE_C_FLAGS_RELEASE:STRING="$TUNE_FLAGS" -DCMAKE_CXX_FLAGS_RELEASE:STRING="$TUNE_FLAGS" \
72 -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="-g $TUNE_FLAGS" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-g $TUNE_FLAGS" -DPACKAGE:BOOL=ON
diff --git a/linden/scripts/linux/3-compile-SL-source b/linden/scripts/linux/3-compile-SL-source
index 34395bb..4ac80a7 100755
--- a/linden/scripts/linux/3-compile-SL-source
+++ b/linden/scripts/linux/3-compile-SL-source
@@ -54,10 +54,7 @@ source config-SL-source
54function compile() { 54function compile() {
55 cd $PATH_TO_SOURCES/indra 55 cd $PATH_TO_SOURCES/indra
56 echo "Compiling the client into $TEMP_DIR..." 56 echo "Compiling the client into $TEMP_DIR..."
57 nice -n 19 ionice -c 3 ./develop.py --type=Release build 57 nice -n 19 $ionice ./develop.py $os_extra --type=$TYPE build
58# if (($? == 0)) ; then
59# mv -f $PATH_TO_SOURCES/indra/viewer-linux-i686*/newview/SecondLife*.tar.bz2 $HOME/
60# fi
61} 58}
62 59
63########### end of functions ########### 60########### end of functions ###########
@@ -66,14 +63,7 @@ if [ "$TEMP_DIR" == "" ] ; then
66 export TEMP_DIR="/usr/tmp/$USER" 63 export TEMP_DIR="/usr/tmp/$USER"
67fi 64fi
68 65
69# Check to see if we simply want to retry a compilation:
70if [ "$1" == "--retry" ] ; then
71 compile
72 exit $?
73fi
74
75# Use the parameter (if any) as the path to the archives: 66# Use the parameter (if any) as the path to the archives:
76
77PATH_TO_ARCHIVES=`pwd` 67PATH_TO_ARCHIVES=`pwd`
78if [ "$1" != "" ] && [ "$1" != "--prep" ] ; then 68if [ "$1" != "" ] && [ "$1" != "--prep" ] ; then
79 if [ -d $1 ] ; then 69 if [ -d $1 ] ; then
@@ -83,19 +73,4 @@ if [ "$1" != "" ] && [ "$1" != "--prep" ] ; then
83fi 73fi
84 74
85cd $PATH_TO_SOURCES/indra 75cd $PATH_TO_SOURCES/indra
86
87# Do a clean build
88#./develop.py clean
89
90# Force the vectorization use if we chose so.
91if [ "$FORCE_VECTORIZE" == "yes" ] ; then
92 TUNE_FLAGS="$TUNE_FLAGS -DLL_VECTORIZE=1"
93fi
94if [ "$ALLOW_WARNINGS" == "yes" ] ; then
95 FATAL_WARNINGS="-DGCC_DISABLE_FATAL_WARNINGS:BOOL=TRUE"
96else
97 FATAL_WARNINGS=""
98fi
99
100time compile 76time compile
101
diff --git a/linden/scripts/linux/4-package-viewer b/linden/scripts/linux/4-package-viewer
index b2bff7f..d954f02 100755
--- a/linden/scripts/linux/4-package-viewer
+++ b/linden/scripts/linux/4-package-viewer
@@ -1,5 +1,10 @@
1#!/bin/bash 1#!/bin/bash
2 2
3cd ../../indra/viewer-linux-* 3if [ "$OSTYPE" == "cygwin" ] ; then
4make package 4 # Assumes version has been passed in from outside, coz Windows insists on adding crap to python output.
5 5 cd ../../indra/build-nmake/
6 iscc newview/$TYPE/package/${version}-Windows-x86.iss
7else
8 cd ../../indra/viewer-linux-*
9 make package
10fi
diff --git a/linden/scripts/linux/config-SL-source b/linden/scripts/linux/config-SL-source
index 174d7d4..f60fd92 100644
--- a/linden/scripts/linux/config-SL-source
+++ b/linden/scripts/linux/config-SL-source
@@ -9,6 +9,9 @@
9# accordingly, so that you (should) end up with a properly packaged client. 9# accordingly, so that you (should) end up with a properly packaged client.
10 10
11PWD=`pwd` 11PWD=`pwd`
12os_extra=''
13ionice='ionice -c 3'
14
12 15
13# Where the sources of the client will be held (defaults to "./linden"): 16# Where the sources of the client will be held (defaults to "./linden"):
14PATH_TO_SOURCES="$PWD/../.." 17PATH_TO_SOURCES="$PWD/../.."
@@ -18,6 +21,8 @@ PATH_TO_PATCHES="$PWD/../../patches"
18TEMP_DIR="/tmp/SL-$USER" 21TEMP_DIR="/tmp/SL-$USER"
19mkdir -p $TEMP_DIR 22mkdir -p $TEMP_DIR
20 23
24TYPE="RelWithDebInfo"
25
21USE_SYSTEM_GTK="no" 26USE_SYSTEM_GTK="no"
22USE_SYSTEM_SDL="no" 27USE_SYSTEM_SDL="no"
23USE_SYSTEM_SSL="no" 28USE_SYSTEM_SSL="no"
@@ -53,7 +58,7 @@ USE_SYSTEM_BOOST="no"
53# You may add tune flags here, to optimize the code for your processor. 58# You may add tune flags here, to optimize the code for your processor.
54# Example, for an Athlon XP: 59# Example, for an Athlon XP:
55# TUNE_FLAGS="-march=athlon-xp" 60# TUNE_FLAGS="-march=athlon-xp"
56TUNE_FLAGS="-fomit-frame-pointer -frename-registers -ftree-vectorize -fweb -fexpensive-optimizations -msse -mfpmath=sse" 61TUNE_FLAGS="-O2 -fomit-frame-pointer -frename-registers -ftree-vectorize -fweb -fexpensive-optimizations -msse -mfpmath=sse"
57# Set this to "yes" to force vectorization use in the viewer code (only for 62# Set this to "yes" to force vectorization use in the viewer code (only for
58# processors with SSE or Altivec units, and only if you did enable them via 63# processors with SSE or Altivec units, and only if you did enable them via
59# the TUNE_FLAGS. 64# the TUNE_FLAGS.
@@ -61,3 +66,18 @@ FORCE_VECTORIZE="yes"
61 66
62# When using gcc v4.3 or later, you might have to set this to yes... 67# When using gcc v4.3 or later, you might have to set this to yes...
63ALLOW_WARNINGS="yes" 68ALLOW_WARNINGS="yes"
69
70
71# Change it all for cygwin.
72if [ "$OSTYPE" == "cygwin" ] ; then
73 os_extra='-G nmake'
74 ionice=''
75 USE_SYSTEM_LIBSTDC="no"
76 TUNE_FLAGS="/EHsc /GR /Zm1000 /DWIN32 /D_WINDOWS "
77 FORCE_VECTORIZE="no"
78 ALLOW_WARNINGS="no"
79fi
80
81
82# Work around python problems.
83export PYTHONUNBUFFERED='True'
generated by cgit v1.1 at 2025-01-19 18:18:18 +0000