From 973e39608ac8d12a2ee70a69ea8eb14e1bfc7b5f Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Sat, 16 Feb 2013 01:02:20 +0000 Subject: Updated to use 4.5SDKs for Mac and Windows. Tricked into believing 3.2 SDK is 4.5 for linux --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 017427278e..844f686b4c 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1734,9 +1734,9 @@ archive hash - 8a0bc982367d6fdc20a28b391cd40566 + 957773fff7148ffaca42b1ea4a18d192 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-slvoice/rev/231678/arch/Linux/installer/slvoice-3.2.0002.10426-linux-20110601.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-slvoice/rev/270512/arch/Linux/installer/slvoice-4.5.0009.17865-linux-20130216.tar.bz2 name linux -- cgit v1.3 From 669d1295a3c5745db566f40d12f3de19445131df Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Fri, 15 Feb 2013 17:05:01 -0800 Subject: Added ca-bundle.crt behaviors for Mac and Windows. --- autobuild.xml | 8 ++++---- indra/cmake/Copy3rdPartyLibs.cmake | 3 +++ indra/newview/CMakeLists.txt | 1 + indra/newview/viewer_manifest.py | 2 ++ 4 files changed, 10 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 844f686b4c..41665db827 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1722,9 +1722,9 @@ archive hash - 24e735ae005f3ce7a21a09cc02cece17 + 2994f1e028fb200c454c12b5f7ca9108 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-slvoice/rev/231678/arch/Darwin/installer/slvoice-3.2.0002.10426-darwin-20110601.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-slvoice/rev/270464/arch/Darwin/installer/slvoice-4.5.0009.17865-darwin-20130215.tar.bz2 name darwin @@ -1746,9 +1746,9 @@ archive hash - 1e821cc7d25eabad013b7f3db260dd6b + 24710eda136bfd42d6333e5609c2c74f url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-slvoice/rev/231678/arch/CYGWIN/installer/slvoice-3.2.0002.10426-windows-20110601.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-slvoice/rev/270464/arch/CYGWIN/installer/slvoice-4.5.0009.17865-windows-20130214.tar.bz2 name windows diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index c32e357da3..553357f675 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -20,6 +20,7 @@ if(WINDOWS) set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(vivox_files SLVoice.exe + ca-bundle.crt libsndfile-1.dll vivoxplatform.dll vivoxsdk.dll @@ -196,6 +197,7 @@ elseif(DARWIN) set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(vivox_files SLVoice + ca-bundle.crt libsndfile.dylib libvivoxoal.dylib libortp.dylib @@ -240,6 +242,7 @@ elseif(LINUX) libvivoxplatform.so libvivoxsdk.so SLVoice + # ca-bundle.crt #No cert for linux. It is actually still 3.2SDK. ) # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables # or ARCH_PREBUILT_DIRS diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index dff2c04fbc..caad29131c 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1636,6 +1636,7 @@ if (WINDOWS) ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/zlib1.dll ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/vivoxplatform.dll ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/vivoxoal.dll + ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/ca-bundle.crt ${GOOGLE_PERF_TOOLS_SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/licenses-win32.txt ${CMAKE_CURRENT_SOURCE_DIR}/featuretable.txt diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index ea75d4f4f6..882052d262 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -395,6 +395,7 @@ class WindowsManifest(ViewerManifest): self.path("zlib1.dll") self.path("vivoxplatform.dll") self.path("vivoxoal.dll") + self.path("ca-bundle.crt") # Security self.path("ssleay32.dll") @@ -754,6 +755,7 @@ class DarwinManifest(ViewerManifest): 'libvivoxoal.dylib', 'libvivoxsdk.dylib', 'libvivoxplatform.dylib', + 'ca-bundle.crt', 'SLVoice', ): self.path2basename(libdir, libfile) -- cgit v1.3 From 32b8d398eca5eaa4ca99aa48839ad64d97954cae Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 5 Aug 2013 14:42:37 -0400 Subject: increment viewer version to 3.6.3 --- autobuild.xml | 60 ++++++++-------------------------------- indra/newview/VIEWER_VERSION.txt | 2 +- 2 files changed, 13 insertions(+), 49 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 0472eada03..e047d4d686 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -522,9 +522,9 @@ archive hash - 91752db72202807cffb33c1ec3fd90fc + 91752db72202807cffb33c1ec3fd90fc url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/276321/arch/CYGWIN/installer/fmodex-4.44-windows-20130521.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/276321/arch/CYGWIN/installer/fmodex-4.44-windows-20130521.tar.bz2 name windows @@ -761,9 +761,9 @@ archive - hash - aff5566e04003de0383941981198e04e - url + hash + aff5566e04003de0383941981198e04e + url http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273073/arch/Darwin/installer/google_breakpad-0.0.0-rev1099-darwin-20130329.tar.bz2 name @@ -773,9 +773,9 @@ archive - hash - 52257e5eb166a0b69c9c0c38f6e1920e - url + hash + 52257e5eb166a0b69c9c0c38f6e1920e + url http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273079/arch/Linux/installer/google_breakpad-0.0.0-rev1099-linux-20130329.tar.bz2 name @@ -786,7 +786,7 @@ archive hash - d812a6dfcabe6528198a3191068dac09 + d812a6dfcabe6528198a3191068dac09 url http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273073/arch/CYGWIN/installer/google_breakpad-0.0.0-rev1099-windows-20130329.tar.bz2 @@ -879,42 +879,6 @@ - gperftools - - license - bsd - license_file - LICENSES/gperftools.txt - name - gperftools - platforms - - linux - - archive - - hash - 8aedfdcf670348c18a9991ae1b384a61 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/262672/arch/Linux/installer/gperftools-2.0-linux-20120727.tar.bz2 - - name - linux - - windows - - archive - - hash - f62841804acb91e1309603a84f3f0ce8 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/262672/arch/CYGWIN/installer/gperftools-2.0-windows-20120727.tar.bz2 - - name - windows - - - gstreamer license @@ -2567,7 +2531,7 @@ "Visual Studio 10" -DUNATTENDED:BOOL=ON -DUSE_KDU=FALSE - + name DebugOS @@ -2655,7 +2619,7 @@ -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE - + name RelWithDebInfoOS @@ -2742,7 +2706,7 @@ -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE - + name ReleaseOS diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index b72762837e..4a788a01da 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -3.6.2 +3.6.3 -- cgit v1.3