From 5f608c0a23487ae78cdc134b1e685a6c3cd4ec19 Mon Sep 17 00:00:00 2001 From: Cinder Date: Wed, 19 Nov 2014 08:01:28 -0700 Subject: OPEN-282 Use pthreads for TLS on mac --- doc/contributions.txt | 1 + indra/llcommon/llthread.cpp | 16 ++-------------- indra/llcommon/llthreadlocalstorage.h | 31 ++----------------------------- 3 files changed, 5 insertions(+), 43 deletions(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index 2d27562e37..1d437a6392 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -314,6 +314,7 @@ Cinder Roxley BUG-2326 BUG-3863 OPEN-185 + OPEN-282 STORM-1703 STORM-1948 STORM-1831 diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index 51c89e1eaf..22e8179b6c 100755 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -92,11 +92,9 @@ void set_thread_name( DWORD dwThreadID, const char* threadName) // //---------------------------------------------------------------------------- -#if LL_DARWIN -// statically allocated thread local storage not supported in Darwin executable formats -#elif LL_WINDOWS +#if LL_WINDOWS U32 __declspec(thread) sThreadID = 0; -#elif LL_LINUX +#else U32 __thread sThreadID = 0; #endif @@ -115,9 +113,7 @@ LL_COMMON_API void assert_main_thread() void LLThread::registerThreadID() { -#if !LL_DARWIN sThreadID = ++sIDIter; -#endif } // @@ -134,9 +130,7 @@ void *APR_THREAD_FUNC LLThread::staticRun(apr_thread_t *apr_threadp, void *datap // for now, hard code all LLThreads to report to single master thread recorder, which is known to be running on main thread threadp->mRecorder = new LLTrace::ThreadRecorder(*LLTrace::get_master_thread_recorder()); -#if !LL_DARWIN sThreadID = threadp->mID; -#endif // Run the user supplied function threadp->run(); @@ -347,13 +341,7 @@ void LLThread::setQuitting() // static U32 LLThread::currentID() { -#if LL_DARWIN - // statically allocated thread local storage not supported in Darwin executable formats - return (U32)apr_os_thread_current(); -#else return sThreadID; -#endif - } // static diff --git a/indra/llcommon/llthreadlocalstorage.h b/indra/llcommon/llthreadlocalstorage.h index ec3b52c8cb..da648902aa 100644 --- a/indra/llcommon/llthreadlocalstorage.h +++ b/indra/llcommon/llthreadlocalstorage.h @@ -130,56 +130,29 @@ class LLThreadLocalSingletonPointer public: LL_FORCE_INLINE static DERIVED_TYPE* getInstance() { -#if LL_DARWIN - createTLSKey(); - return (DERIVED_TYPE*)pthread_getspecific(sInstanceKey); -#else return sInstance; -#endif } static void setInstance(DERIVED_TYPE* instance) { -#if LL_DARWIN - createTLSKey(); - pthread_setspecific(sInstanceKey, (void*)instance); -#else sInstance = instance; -#endif } private: #if LL_WINDOWS static __declspec(thread) DERIVED_TYPE* sInstance; -#elif LL_LINUX +#else static __thread DERIVED_TYPE* sInstance; -#elif LL_DARWIN - static void TLSError() - { - LL_ERRS() << "Could not create thread local storage" << LL_ENDL; - } - static void createTLSKey() - { - static S32 key_created = pthread_key_create(&sInstanceKey, NULL); - if (key_created != 0) - { - LL_ERRS() << "Could not create thread local storage" << LL_ENDL; - } - } - static pthread_key_t sInstanceKey; #endif }; #if LL_WINDOWS template __declspec(thread) DERIVED_TYPE* LLThreadLocalSingletonPointer::sInstance = NULL; -#elif LL_LINUX +#else template __thread DERIVED_TYPE* LLThreadLocalSingletonPointer::sInstance = NULL; -#elif LL_DARWIN -template -pthread_key_t LLThreadLocalSingletonPointer::sInstanceKey; #endif #endif // LL_LLTHREADLOCALSTORAGE_H -- cgit v1.2.3 From 6df6aef62176328c3b0fafa43fd611d4e25ef35c Mon Sep 17 00:00:00 2001 From: Cinder Date: Wed, 19 Nov 2014 22:27:36 -0700 Subject: OPEN-282 - Define LL_THREAD_LOCAL for our platforms in order to unify TLS support --- indra/llcommon/llpreprocessor.h | 5 +++++ indra/llcommon/llthread.cpp | 6 +----- indra/llcommon/llthreadlocalstorage.h | 14 ++------------ 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index 309165da7f..2c4bcc91f6 100755 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -101,6 +101,11 @@ #endif +#if LL_WINDOWS +# define LL_THREAD_LOCAL __declspec(thread) +#else +# define LL_THREAD_LOCAL __thread +#endif // Static linking with apr on windows needs to be declared. #if LL_WINDOWS && !LL_COMMON_LINK_SHARED diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index 22e8179b6c..c3f235c6ee 100755 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -92,11 +92,7 @@ void set_thread_name( DWORD dwThreadID, const char* threadName) // //---------------------------------------------------------------------------- -#if LL_WINDOWS -U32 __declspec(thread) sThreadID = 0; -#else -U32 __thread sThreadID = 0; -#endif +U32 LL_THREAD_LOCAL sThreadID = 0; U32 LLThread::sIDIter = 0; diff --git a/indra/llcommon/llthreadlocalstorage.h b/indra/llcommon/llthreadlocalstorage.h index da648902aa..3b5786023f 100644 --- a/indra/llcommon/llthreadlocalstorage.h +++ b/indra/llcommon/llthreadlocalstorage.h @@ -139,20 +139,10 @@ public: } private: - -#if LL_WINDOWS - static __declspec(thread) DERIVED_TYPE* sInstance; -#else - static __thread DERIVED_TYPE* sInstance; -#endif + static LL_THREAD_LOCAL DERIVED_TYPE* sInstance; }; -#if LL_WINDOWS -template -__declspec(thread) DERIVED_TYPE* LLThreadLocalSingletonPointer::sInstance = NULL; -#else template -__thread DERIVED_TYPE* LLThreadLocalSingletonPointer::sInstance = NULL; -#endif +LL_THREAD_LOCAL DERIVED_TYPE* LLThreadLocalSingletonPointer::sInstance = NULL; #endif // LL_LLTHREADLOCALSTORAGE_H -- cgit v1.2.3 From 680194deaf7a35caaa629abc16e886d71baff636 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 21 Nov 2014 18:09:12 -0500 Subject: automate keeping the About SL -> Licenses tab correct --- autobuild.xml | 26 ++++---- indra/cmake/BuildPackagesInfo.cmake | 10 +++ indra/newview/CMakeLists.txt | 2 + indra/newview/llfloaterabout.cpp | 56 +++++++---------- .../newview/skins/default/xui/en/floater_about.xml | 57 ++--------------- indra/newview/viewer_manifest.py | 24 +------ scripts/packages-formatter.py | 73 ++++++++++++++++++++++ 7 files changed, 126 insertions(+), 122 deletions(-) create mode 100644 indra/cmake/BuildPackagesInfo.cmake create mode 100755 scripts/packages-formatter.py diff --git a/autobuild.xml b/autobuild.xml index 2ba3a8f399..e9aded7d42 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1084,7 +1084,7 @@ havok-source copyright - The Havok software (the "Software") and the accompanying documentation (the "Documentation") supplied (collectively, the "Product") are protected by United States, Irish and international copyright laws, and the copyrights and other intellectual property rights are owned by Telekinesys Research Limited (trading as Havok) Third Floor, 6 Suffolk Street, Dublin 2, Ireland. + Uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details. description Havok source code for libs and demos license @@ -1100,9 +1100,9 @@ archive hash - 04e7b4982cdd3b89c856978f81a8fdbf + 5b7753a810a86f25df54ece3190b7d6e url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/295468/arch/Darwin/installer/havok_source-2012.1-darwin-295468.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/296959/arch/Darwin/installer/havok_source-2012.1-darwin-296959.tar.bz2 name darwin @@ -1112,9 +1112,9 @@ archive hash - 0c0d2058ba48446e274d6595d1d8063e + 6b0f41ddddfa60d8424d8a2e0bc2077d url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/lindenlab_3p-havok-source/rev/268409/arch/Linux/installer/havok_source-2012.1-linux-20121219.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/296959/arch/Linux/installer/havok_source-2012.1-linux-296959.tar.bz2 name linux @@ -2078,7 +2078,7 @@ slvoice copyright - 2010 Vivox + 2010 Vivox, including audio coding using Polycom¨ Siren14TM (ITU-T Rec. G.722.1 Annex C) description Vivox SDK components license @@ -2094,9 +2094,9 @@ archive hash - 9fd91e50ef6848ef5fe74455cc0042c9 + ae89da43466a510fbb0a67eb27bb251f url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/slvoice_3p-update-slvoice/rev/294996/arch/Darwin/installer/slvoice-4.6.0009.20030.294996-darwin-294996.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/slvoice_3p-update-slvoice/rev/296971/arch/Darwin/installer/slvoice-4.6.0009.20030.296971-darwin-296971.tar.bz2 name darwin @@ -2106,9 +2106,9 @@ archive hash - 957773fff7148ffaca42b1ea4a18d192 + c66d434b7df05351662c068d3a8d2183 url - 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 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/slvoice_3p-update-slvoice/rev/296971/arch/Linux/installer/slvoice-4.5.0006.17020.296971-linux-296971.tar.bz2 name linux @@ -2118,16 +2118,16 @@ archive hash - ce89b881ee24977641d1ecbf8aff6dc7 + d0ad191e40b5c98748bdd973d6762ade url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-slvoice/rev/287264/arch/CYGWIN/installer/slvoice-4.6.0009.20030-windows-20140227.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/slvoice_3p-update-slvoice/rev/296971/arch/CYGWIN/installer/slvoice-4.6.0009.20030.296971-windows-296971.tar.bz2 name windows version - 4.6.0009.20030.294996 + 4.5.0006.17020.296971 tut diff --git a/indra/cmake/BuildPackagesInfo.cmake b/indra/cmake/BuildPackagesInfo.cmake new file mode 100644 index 0000000000..0f574ee39a --- /dev/null +++ b/indra/cmake/BuildPackagesInfo.cmake @@ -0,0 +1,10 @@ +# -*- cmake -*- +# Construct the version and copyright information based on package data. +include(Python) + +add_custom_command(OUTPUT packages-info.txt + COMMENT Generating packages-info.txt for the about box + MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/../autobuild.xml + DEPENDS ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py > packages-info.txt + ) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index f5a04a49d0..0905ae7a73 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -5,6 +5,7 @@ project(viewer) include(00-Common) include(Boost) include(BuildVersion) +include(BuildPackagesInfo) include(DBusGlib) include(DirectX) include(OpenSSL) @@ -1583,6 +1584,7 @@ set(viewer_APPSETTINGS_FILES app_settings/viewerart.xml ${CMAKE_SOURCE_DIR}/../etc/message.xml ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg + packages-info.txt ) source_group("App Settings" FILES ${viewer_APPSETTINGS_FILES}) diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 66149a4367..7ac3ac2f61 100755 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -123,18 +123,17 @@ BOOL LLFloaterAbout::postBuild() LLViewerTextEditor *support_widget = getChild("support_editor", true); - LLViewerTextEditor *linden_names_widget = - getChild("linden_names", true); - LLViewerTextEditor *contrib_names_widget = getChild("contrib_names", true); - LLViewerTextEditor *trans_names_widget = - getChild("trans_names", true); + LLViewerTextEditor *licenses_widget = + getChild("licenses_editor", true); getChild("copy_btn")->setCommitCallback( boost::bind(&LLFloaterAbout::onClickCopyToClipboard, this)); + static const LLUIColor about_color = LLUIColorTable::instance().getColor("TextFgReadOnlyColor"); + if (gAgent.getRegion()) { // start fetching server release notes URL @@ -153,24 +152,6 @@ BOOL LLFloaterAbout::postBuild() support_widget->setEnabled(FALSE); support_widget->startOfDoc(); - // Get the names of Lindens, added by viewer_manifest.py at build time - std::string lindens_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"lindens.txt"); - llifstream linden_file; - std::string lindens; - linden_file.open(lindens_path); /* Flawfinder: ignore */ - if (linden_file.is_open()) - { - std::getline(linden_file, lindens); // all names are on a single line - linden_file.close(); - linden_names_widget->setText(lindens); - } - else - { - LL_INFOS("AboutInit") << "Could not read lindens file at " << lindens_path << LL_ENDL; - } - linden_names_widget->setEnabled(FALSE); - linden_names_widget->startOfDoc(); - // Get the names of contributors, extracted from .../doc/contributions.txt by viewer_manifest.py at build time std::string contributors_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"contributors.txt"); llifstream contrib_file; @@ -189,23 +170,28 @@ BOOL LLFloaterAbout::postBuild() contrib_names_widget->setEnabled(FALSE); contrib_names_widget->startOfDoc(); - // Get the names of translators, extracted from .../doc/tranlations.txt by viewer_manifest.py at build time - std::string translators_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"translators.txt"); - llifstream trans_file; - std::string translators; - trans_file.open(translators_path); /* Flawfinder: ignore */ - if (trans_file.is_open()) + // Get the Versions and Copyrights, created at build time + std::string licenses_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"packages-info.txt"); + llifstream licenses_file; + licenses_file.open(licenses_path); /* Flawfinder: ignore */ + if (licenses_file.is_open()) { - std::getline(trans_file, translators); // all names are on a single line - trans_file.close(); + std::string license_line; + licenses_widget->clear(); + while ( std::getline(licenses_file, license_line) ) + { + licenses_widget->appendText(license_line+"\n", FALSE, + LLStyle::Params() .color(about_color)); + } + licenses_file.close(); } else { - LL_WARNS("AboutInit") << "Could not read translators file at " << translators_path << LL_ENDL; + // this case will use the (out of date) hard coded value from the XUI + LL_INFOS("AboutInit") << "Could not read licenses file at " << licenses_path << LL_ENDL; } - trans_names_widget->setText(translators); - trans_names_widget->setEnabled(FALSE); - trans_names_widget->startOfDoc(); + licenses_widget->setEnabled(FALSE); + licenses_widget->startOfDoc(); return TRUE; } diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index ef2f158a86..60f36770bb 100755 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -51,44 +51,20 @@ name="credits_panel"> -Second Life is brought to you by the Lindens: - - -Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase, Baker - - +Second Life is brought to you by the Lindens, with open source contributions from: -Dummy Name replaced at run time - - -and translations from: - - Dummy Name replaced at run time @@ -138,7 +89,7 @@ Dummy Name replaced at run time left="5" text_color="LtGray" max_length="65536" - name="credits_editor" + name="licenses_editor" top="5" width="435" word_wrap="true"> diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index a2039b4528..2394dd26b9 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -55,7 +55,6 @@ class ViewerManifest(LLManifest): def construct(self): super(ViewerManifest, self).construct() - self.exclude("*.svn*") self.path(src="../../scripts/messages/message_template.msg", dst="app_settings/message_template.msg") self.path(src="../../etc/message.xml", dst="app_settings/message.xml") @@ -74,26 +73,6 @@ class ViewerManifest(LLManifest): contributions_path = "../../doc/contributions.txt" contributor_names = self.extract_names(contributions_path) self.put_in_file(contributor_names, "contributors.txt", src=contributions_path) - # include the extracted list of translators - translations_path = "../../doc/translations.txt" - translator_names = self.extract_names(translations_path) - self.put_in_file(translator_names, "translators.txt", src=translations_path) - # include the list of Lindens (if any) - # see https://wiki.lindenlab.com/wiki/Generated_Linden_Credits - linden_names_path = os.getenv("LINDEN_CREDITS") - if not linden_names_path : - print "No 'LINDEN_CREDITS' specified in environment, using built-in list" - else: - try: - linden_file = open(linden_names_path,'r') - except IOError: - print "No Linden names found at '%s', using built-in list" % linden_names_path - else: - # all names should be one line, but the join below also converts to a string - linden_names = ', '.join(linden_file.readlines()) - self.put_in_file(linden_names, "lindens.txt", src=linden_names_path) - linden_file.close() - print "Linden names extracted from '%s'" % linden_names_path # ... and the entire windlight directory self.path("windlight") @@ -107,6 +86,9 @@ class ViewerManifest(LLManifest): self.path("dictionaries") self.end_prefix(pkgdir) + # include the extracted packages information (see BuildPackagesInfo.cmake) + self.path(src=os.path.join(self.args['build'],"packages-info.txt"), dst="packages-info.txt") + # CHOP-955: If we have "sourceid" or "viewer_channel" in the # build process environment, generate it into # settings_install.xml. diff --git a/scripts/packages-formatter.py b/scripts/packages-formatter.py new file mode 100755 index 0000000000..1432cdaebe --- /dev/null +++ b/scripts/packages-formatter.py @@ -0,0 +1,73 @@ +#!/usr/bin/env python +"""\ +This module formats the package version and copyright information for the +viewer and its dependent packages. + +$LicenseInfo:firstyear=2014&license=viewerlgpl$ +Second Life Viewer Source Code +Copyright (C) 2014, 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 os +import sys +import re +import subprocess + +autobuild=os.getenv('AUTOBUILD', + 'autobuild' if not ( sys.platform == 'win32' or sys.platform == 'cygwin') + else 'autobuild.cmd') + +pkg_line=re.compile('^([\w-]+):\s+(.*)$') + +version={} +versions=subprocess.Popen([autobuild, 'install', '--versions'], + stdin=None, stdout=subprocess.PIPE, universal_newlines=True).stdout +for line in versions: + pkg_info = pkg_line.match(line) + if pkg_info: + pkg = pkg_info.group(1) + if pkg not in version: + version[pkg] = pkg_info.group(2).strip() + else: + sys.exit("Duplicate version for %s" % pkg) + else: + sys.exit("Unrecognized --versions output: %s" % line) + +copyright={} +copyrights=subprocess.Popen([autobuild, 'install', '--copyrights'], + stdin=None, stdout=subprocess.PIPE, universal_newlines=True).stdout +viewer_copyright = copyrights.readline() # first line is the copyright for the viewer itself +for line in copyrights: + pkg_info = pkg_line.match(line) + if pkg_info: + pkg = pkg_info.group(1) + if pkg not in copyright: + copyright[pkg] = pkg_info.group(2).strip() + else: + sys.exit("Duplicate copyright for %s" % pkg) + else: + sys.exit("Unrecognized --copyrights output: %s" % line) + +print viewer_copyright +for pkg in sorted(version): + print ': '.join([pkg, version[pkg]]) + if pkg in copyright: + print copyright[pkg] + else: + sys.exit("No copyright for %s" % pkg) -- cgit v1.2.3 From a969321c6cb850a98e92e1ba7f1511527ef9d9b2 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 25 Nov 2014 14:29:01 -0500 Subject: Update viewer to consume zlib build 296881. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index e9aded7d42..f1bc15d12e 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -2232,9 +2232,9 @@ archive hash - 567f437d22d891c811aa9a70e2b63ad8 + 1a79eeac199c2d94e4ae4e5d0194e25f url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/zlib_3p-update-zlib/rev/294883/arch/Darwin/installer/zlib-1.2.8.294883-darwin-294883.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/zlib_3p-update-zlib/rev/296881/arch/Darwin/installer/zlib-1.2.8.296881-darwin-296881.tar.bz2 name darwin @@ -2244,11 +2244,11 @@ archive hash - ba68e85c1c32c9e1c8bf57c9e21b3d45 + 2eb8e59b6464222dcf4435016ad5f618 hash_algorithm md5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/zlib_3p-update-zlib/rev/293925/arch/Linux/installer/zlib-1.2.8.293925-linux-293925.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/zlib_3p-update-zlib/rev/296881/arch/Linux/installer/zlib-1.2.8.296881-linux-296881.tar.bz2 name linux @@ -2258,16 +2258,16 @@ archive hash - ab45a628e22a495814e806ce46081806 + ae420ec6d30411c07aac2502d7bbc0f3 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-zlib-update/rev/290556/arch/CYGWIN/installer/zlib-1.2.8-windows-20140602.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/zlib_3p-update-zlib/rev/296881/arch/CYGWIN/installer/zlib-1.2.8.296881-windows-296881.tar.bz2 name windows version - 1.2.8.293925 + 1.2.8.296881 package_description -- cgit v1.2.3 From f1af1a03104c9039b8331c03058dc341d04060b9 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 25 Nov 2014 14:30:48 -0500 Subject: Update viewer to consume libxml2 build 297050. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index f1bc15d12e..7d2e9631d9 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1508,9 +1508,9 @@ archive hash - 6f6c3409a09a6ddcb94301ead123c89f + 9303f0dd174129e297eca6cc2eb1ab3f url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libxml_3p-update-libxml/rev/295247/arch/Darwin/installer/libxml2-2.9.1.295247-darwin-295247.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libxml_3p-update-libxml/rev/297050/arch/Darwin/installer/libxml2-2.9.1.297050-darwin-297050.tar.bz2 name darwin @@ -1520,9 +1520,9 @@ archive hash - 7eb90f075730f8d7d176f8fb7bad5ef5 + b8b584853dc1344bb3571c13b06ec39e url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-libxml-update/rev/290562/arch/Linux/installer/libxml2-2.9.1-linux-20140602.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libxml_3p-update-libxml/rev/297050/arch/Linux/installer/libxml2-2.9.1.297050-linux-297050.tar.bz2 name linux @@ -1532,16 +1532,16 @@ archive hash - ba20e2634b4c249a7064620d135f7972 + 37fa0e86e54f5f283aa653d770fc8ed5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-libxml-update/rev/290562/arch/CYGWIN/installer/libxml2-2.9.1-windows-20140602.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libxml_3p-update-libxml/rev/297050/arch/CYGWIN/installer/libxml2-2.9.1.297050-windows-297050.tar.bz2 name windows version - 2.9.1.295247 + 2.9.1.297050 llappearance_utility -- cgit v1.2.3 From 894429a280b676ee4488f55cdd4d7751487ca268 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 25 Nov 2014 14:32:30 -0500 Subject: Update viewer to consume libpng build 297051. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 7d2e9631d9..c46136e993 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1424,9 +1424,9 @@ archive hash - acba0d1d5349a2b895680c25f8252b9a + d837ee080fba5d521df4c43d5cb7fa78 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/295246/arch/Darwin/installer/libpng-1.6.8.295246-darwin-295246.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/297051/arch/Darwin/installer/libpng-1.6.8.297051-darwin-297051.tar.bz2 name darwin @@ -1436,9 +1436,9 @@ archive hash - 82498b23cb74e6b957e62b8a676eaa66 + 6dec32fc2527f8cafd616f9271ff3478 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/295246/arch/Linux/installer/libpng-1.6.8.295246-linux-295246.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/297051/arch/Linux/installer/libpng-1.6.8.297051-linux-297051.tar.bz2 name linux @@ -1448,16 +1448,16 @@ archive hash - 596f4798f90941817b1ca5009c24d16a + a4a46193fd3c893c7cd2589d2e6d748d url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-libpng-update/rev/290558/arch/CYGWIN/installer/libpng-1.6.8-windows-20140602.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/297051/arch/CYGWIN/installer/libpng-1.6.8.297051-windows-297051.tar.bz2 name windows version - 1.6.8.295246 + 1.6.8.297051 libuuid -- cgit v1.2.3 From 6e6617e1ae4088c336310d90a093a933e3088ba5 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 25 Nov 2014 14:33:52 -0500 Subject: Update viewer to consume freetype build 297053. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index c46136e993..467c0d31e3 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -606,9 +606,9 @@ archive hash - 3994d486207118a7683a255677c20ed0 + 83618d16d974eb0af93926a10ac13297 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/freetype_3p-update-freetype/rev/295248/arch/Darwin/installer/freetype-2.4.4.295248-darwin-295248.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/freetype_3p-update-freetype/rev/297053/arch/Darwin/installer/freetype-2.4.4.297053-darwin-297053.tar.bz2 name darwin @@ -618,9 +618,9 @@ archive hash - 52f87a65cc61ec4b05721c079d015b19 + 1ac3152b440287c58509d8af0a50326d url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-freetype-update/rev/290557/arch/Linux/installer/freetype-2.4.4-linux-20140602.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/freetype_3p-update-freetype/rev/297053/arch/Linux/installer/freetype-2.4.4.297053-linux-297053.tar.bz2 name linux @@ -630,16 +630,16 @@ archive hash - 6e9fc0fe628a7c88f6f614bf3b0450ae + 207aa1a29bfe4ba63edbca38170970a1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-freetype-update/rev/290557/arch/CYGWIN/installer/freetype-2.4.4-windows-20140602.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/freetype_3p-update-freetype/rev/297053/arch/CYGWIN/installer/freetype-2.4.4.297053-windows-297053.tar.bz2 name windows version - 2.4.4.295248 + 2.4.4.297053 glext -- cgit v1.2.3 From 46e6f9c265ca32202b12c64a9d4d86d8ac6eaeb0 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 25 Nov 2014 14:36:15 -0500 Subject: Update viewer to consume expat build 297014. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 467c0d31e3..47895ff252 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -452,9 +452,9 @@ archive hash - 96ab90f72ba55842e7a19bd2573e875d + 452d1910ef853329cd59858e6c5b2c48 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/expat_3p-update-expat/rev/295018/arch/Darwin/installer/expat-2.0.1.295018-darwin-295018.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/expat_3p-update-expat/rev/297014/arch/Darwin/installer/expat-2.0.1.297014-darwin-297014.tar.bz2 name darwin @@ -464,9 +464,9 @@ archive hash - 1ed2b8d927659b331951f2a7bf1c4d73 + f546615d76bc0f9e8bc2b9ef89f0ca86 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/expat_3p-update-expat/rev/295191/arch/Linux/installer/expat-2.0.1.295191-linux-295191.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/expat_3p-update-expat/rev/297014/arch/Linux/installer/expat-2.0.1.297014-linux-297014.tar.bz2 name linux @@ -476,16 +476,16 @@ archive hash - e72db1bda49b205ebdf4945d4ed2b8f8 + c70c72a8a0a1e508691a9b35739b373f url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-2.0.1-windows-20110215.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/expat_3p-update-expat/rev/297014/arch/CYGWIN/installer/expat-2.0.1.297014-windows-297014.tar.bz2 name windows version - 2.0.1.295191 + 2.0.1.297014 fmodex -- cgit v1.2.3 From 6046083d7458a1ff9652bc390a280f3cfa7bdcb2 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 25 Nov 2014 15:09:03 -0500 Subject: Update viewer to consume xmlrpc-epi build 297075. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 47895ff252..09f152f446 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -2178,9 +2178,9 @@ archive hash - 4d0ef5415076e6593f2533c05c9a87ee + ffd3aab8e0c0ff6dadbce49ca2809078 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/xmlrpc-emi_3p-update-xmlrpc-epi/rev/295632/arch/Darwin/installer/xmlrpc_epi-0.54.1.295632-darwin-295632.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/xmlrpc-emi_3p-update-xmlrpc-epi/rev/297075/arch/Darwin/installer/xmlrpc_epi-0.54.1.297075-darwin-297075.tar.bz2 name darwin @@ -2190,9 +2190,9 @@ archive hash - 4de9b81e31fb9da981e96a3bdcecabfc + 30bb26d6cc78c16047fc85a63f48fcdb url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/xmlrpc-emi_3p-update-xmlrpc-epi/rev/295272/arch/Linux/installer/xmlrpc_epi-0.54.1.295272-linux-295272.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/xmlrpc-emi_3p-update-xmlrpc-epi/rev/297075/arch/Linux/installer/xmlrpc_epi-0.54.1.297075-linux-297075.tar.bz2 name linux @@ -2202,16 +2202,16 @@ archive hash - 5181d1a8f2516928ac064d72acf164a4 + a7e1a8369a5afd52e1b6fc1f14155033 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc_epi-0.54.1-windows-20110224.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/xmlrpc-emi_3p-update-xmlrpc-epi/rev/297075/arch/CYGWIN/installer/xmlrpc_epi-0.54.1.297075-windows-297075.tar.bz2 name windows version - 0.54.1.295632 + 0.54.1.297075 zlib -- cgit v1.2.3 From a10f1f0193a51439b4337c410781d44c045701de Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 26 Nov 2014 11:10:49 -0500 Subject: Update viewer to consume boost 1.57 build 297087. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 09f152f446..78f29f63dd 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -160,9 +160,9 @@ archive hash - a8252cb5f0eae61ada2f02163e67b752 + 26dc7724d5b6b504b0989ab59ba209f3 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/295616/arch/Darwin/installer/boost-1.56-darwin-295616.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297087/arch/Darwin/installer/boost-1.57-darwin-297087.tar.bz2 name darwin @@ -172,9 +172,9 @@ archive hash - 2f076eae296600a1b810ce375dc4b42d + 9c2a2297ee330c81d31c50ebb30e2725 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-boost-update/rev/290566/arch/Linux/installer/boost-1.55.0-linux-20140602.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297087/arch/Linux/installer/boost-1.57-linux-297087.tar.bz2 name linux @@ -184,16 +184,16 @@ archive hash - 8af0500013739866a41cfc2ce90e4f4b + ee1ad887ab438fd76ec450c128b1fd4f url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-boost-update/rev/290566/arch/CYGWIN/installer/boost-1.55.0-windows-20140602.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297087/arch/CYGWIN/installer/boost-1.57-windows-297087.tar.bz2 name windows version - 1.56 + 1.57 colladadom -- cgit v1.2.3 From c5792c1a00262ecafb9196edcaf1803d8129cad1 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 26 Nov 2014 11:36:21 -0500 Subject: Update viewer to consume googlemock build 297089. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 78f29f63dd..a4a9a39eb9 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -922,9 +922,9 @@ archive hash - 0b7abee7091e958ee21ccbd1650d8641 + 37ea2de6f0b4b249c73d6c11bbc68db6 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/295633/arch/Darwin/installer/googlemock-1.7.0.295633-darwin-295633.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297089/arch/Darwin/installer/googlemock-1.7.0.297089-darwin-297089.tar.bz2 name darwin @@ -934,9 +934,9 @@ archive hash - 3de99704847b34c7acccf5ab87222f6c + 79cffa9cd8ef82d39af44700617220b2 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-google-mock-update/rev/290574/arch/Linux/installer/gmock-1.7.0-linux-20140602.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297089/arch/Linux/installer/googlemock-1.7.0.297089-linux-297089.tar.bz2 name linux @@ -946,16 +946,16 @@ archive hash - 5d91c1d03780aa26bcd5481145ee9e86 + 8376dda80c386f925cbe3f1bef6269f1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-google-mock-update/rev/290574/arch/CYGWIN/installer/gmock-1.7.0-windows-20140602.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297089/arch/CYGWIN/installer/googlemock-1.7.0.297089-windows-297089.tar.bz2 name windows version - 1.7.0.295633 + 1.7.0.297089 gperftools -- cgit v1.2.3 From 118278c146e7e5be6d41ba210ed277cf49bb985b Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 1 Dec 2014 14:41:22 -0500 Subject: Update viewer to consume pcre build 297101. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index a4a9a39eb9..99f05c5276 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -2016,9 +2016,9 @@ archive hash - 6e05137f8d30ef05b3b1c3f39860265d + 6ee270f437848da0298ed8f80b007819 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/pcre_3p-update-pcre/rev/295046/arch/Darwin/installer/pcre-8.35.-darwin-295046.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/pcre_3p-update-pcre/rev/297101/arch/Darwin/installer/pcre-8.35.-darwin-297101.tar.bz2 name darwin @@ -2028,9 +2028,9 @@ archive hash - 5e6368d39b95f2c0d5162dac2c17c67f + c7505851906789946d08ceb389d796de url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-pcre-update/rev/290406/arch/Linux/installer/pcre-8.35-linux-20140530.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/pcre_3p-update-pcre/rev/297101/arch/Linux/installer/pcre-8.35.-linux-297101.tar.bz2 name linux @@ -2040,9 +2040,9 @@ archive hash - 9250f74fed826ad1b8700229e964519d + 65626c999316fd849200859bf3710f3f url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-pcre-update/rev/290406/arch/CYGWIN/installer/pcre-8.35-windows-20140529.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/pcre_3p-update-pcre/rev/297101/arch/CYGWIN/installer/pcre-8.35.-windows-297101.tar.bz2 name linux -- cgit v1.2.3 From e5530a98205062815aff2bf0bf4669dfd030e0f5 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 2 Dec 2014 19:53:32 -0500 Subject: Update viewer to consume pcre build 297155. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 99f05c5276..fca27f5d74 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -2016,9 +2016,9 @@ archive hash - 6ee270f437848da0298ed8f80b007819 + 6d2b38897f1adf354b299345d5fc759b url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/pcre_3p-update-pcre/rev/297101/arch/Darwin/installer/pcre-8.35.-darwin-297101.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/pcre_3p-update-pcre/rev/297155/arch/Darwin/installer/pcre-8.35.-darwin-297155.tar.bz2 name darwin @@ -2028,9 +2028,9 @@ archive hash - c7505851906789946d08ceb389d796de + b82817bcc2f63094d9c915d018d0b036 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/pcre_3p-update-pcre/rev/297101/arch/Linux/installer/pcre-8.35.-linux-297101.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/pcre_3p-update-pcre/rev/297155/arch/Linux/installer/pcre-8.35.-linux-297155.tar.bz2 name linux @@ -2040,9 +2040,9 @@ archive hash - 65626c999316fd849200859bf3710f3f + 96ed836c89a99dfc22f9c16a0d7272d3 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/pcre_3p-update-pcre/rev/297101/arch/CYGWIN/installer/pcre-8.35.-windows-297101.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/pcre_3p-update-pcre/rev/297155/arch/CYGWIN/installer/pcre-8.35.-windows-297155.tar.bz2 name linux -- cgit v1.2.3 From 9e310cbe84c38588af34d3bcf9e10e732f0818ee Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 3 Dec 2014 09:49:04 -0500 Subject: Update viewer to consume openssl build 297168. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index fca27f5d74..9726802d01 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1962,9 +1962,9 @@ archive hash - c992a53924cf180fbd644c5fcacd3d92 + 0a77d56769e6075957f614be6575423e url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openssl_3p-update-openssl/rev/295244/arch/Darwin/installer/openssl-1.0.1h.295244-darwin-295244.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openssl_3p-update-openssl/rev/297168/arch/Darwin/installer/openssl-1.0.1h.297168-darwin-297168.tar.bz2 name darwin @@ -1974,9 +1974,9 @@ archive hash - 0665c18f8cdbe2f90cb0a2f088cfe1a6 + c310ba9971cbd796b303c3be67fb11c6 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-openssl-update/rev/290662/arch/Linux/installer/openssl-1.0.1h-linux-20140605.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openssl_3p-update-openssl/rev/297168/arch/Linux/installer/openssl-1.0.1h.297168-linux-297168.tar.bz2 name linux @@ -1986,16 +1986,16 @@ archive hash - 138997e1a73c65525d45c00f43f08010 + 398743f47578cbb44f5504128780369f url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-openssl-update/rev/290662/arch/CYGWIN/installer/openssl-1.0.1h-windows-20140605.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openssl_3p-update-openssl/rev/297168/arch/CYGWIN/installer/openssl-1.0.1h.297168-windows-297168.tar.bz2 name windows version - 1.0.1h.295244 + 1.0.1h.297168 pcre -- cgit v1.2.3 From 8b263beb0bc6d5e4ae8a01d604db47a4e60ec5c7 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 3 Dec 2014 10:28:49 -0500 Subject: Update viewer to consume curl build 297172. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 9726802d01..6aadb0be45 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -266,9 +266,9 @@ archive hash - 37403a72882f9db3cda5bef4940bebba + d1c5125650a339a5209f429c70f4d395 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/296787/arch/Darwin/installer/curl-7.38.0.296787-darwin-296787.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/297172/arch/Darwin/installer/curl-7.38.0.297172-darwin-297172.tar.bz2 name darwin @@ -278,9 +278,9 @@ archive hash - d5328fae9c50e6cd6e0163d14c975815 + ee6c089ee193e551040d610befc5d1c1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/296787/arch/Linux/installer/curl-7.38.0.296787-linux-296787.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/297172/arch/Linux/installer/curl-7.38.0.297172-linux-297172.tar.bz2 name linux @@ -290,16 +290,16 @@ archive hash - 642d6a95b7b7725f6daac73f128eac34 + fdeca7cbc074a88d2701d74a31d21bd8 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/296787/arch/CYGWIN/installer/curl-7.38.0.296787-windows-296787.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/297172/arch/CYGWIN/installer/curl-7.38.0.297172-windows-297172.tar.bz2 name windows version - 7.38.0.296787 + 7.38.0.297172 db -- cgit v1.2.3 From a376aa39ad01f0f0b3a252f8e0aace9a8601316f Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 3 Dec 2014 13:55:27 -0500 Subject: Update viewer to consume boost build 297177. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 6aadb0be45..8e83d1852e 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -160,9 +160,9 @@ archive hash - 26dc7724d5b6b504b0989ab59ba209f3 + 23f92889da917d0ebe542a77dab951ab url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297087/arch/Darwin/installer/boost-1.57-darwin-297087.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297177/arch/Darwin/installer/boost-1.57-darwin-297177.tar.bz2 name darwin @@ -172,9 +172,9 @@ archive hash - 9c2a2297ee330c81d31c50ebb30e2725 + cf9b03e79742944200ad3ab214b06a07 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297087/arch/Linux/installer/boost-1.57-linux-297087.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297177/arch/Linux/installer/boost-1.57-linux-297177.tar.bz2 name linux @@ -184,9 +184,9 @@ archive hash - ee1ad887ab438fd76ec450c128b1fd4f + 37ea0a0d2e276bdc3aaf7cbf29ad8b1a url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297087/arch/CYGWIN/installer/boost-1.57-windows-297087.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297177/arch/CYGWIN/installer/boost-1.57-windows-297177.tar.bz2 name windows -- cgit v1.2.3 From 5ae8c94cf820d64399511c31133135ab1403253d Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 3 Dec 2014 14:11:35 -0500 Subject: Update viewer to consume colladadom build 297187. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 8e83d1852e..e1a98df89d 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -212,9 +212,9 @@ archive hash - 7e64506a22e23ed9d677643d12fad2a9 + 7dfdc5abb5ee54ddb5cf34ff99fbf68e url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/295634/arch/Darwin/installer/colladadom-2.3.295634-darwin-295634.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/297187/arch/Darwin/installer/colladadom-2.3.297187-darwin-297187.tar.bz2 name darwin @@ -224,9 +224,9 @@ archive hash - bdec5fe5fd008da4328f84115128ee61 + 94323c795f5af2aa7073156731b7f8ac url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-colladadom-update/rev/290576/arch/Linux/installer/colladadom-2.3-linux-20140602.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/297187/arch/Linux/installer/colladadom-2.3.297187-linux-297187.tar.bz2 name linux @@ -236,16 +236,16 @@ archive hash - ae103c9481be20cd6c035940832b2650 + 904fc9bb513fc07b9d72312fa07d001b url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-colladadom-update/rev/290576/arch/CYGWIN/installer/colladadom-2.3-windows-20140602.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/297187/arch/CYGWIN/installer/colladadom-2.3.297187-windows-297187.tar.bz2 name windows version - 2.3.295634 + 2.3.297187 curl -- cgit v1.2.3 From 11d14b1f8c1a55b72345d35eb56fe0c8f01be5d8 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 3 Dec 2014 14:24:29 -0500 Subject: Update viewer to consume googlemock build 297188. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index e1a98df89d..dd58e2f4a6 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -922,9 +922,9 @@ archive hash - 37ea2de6f0b4b249c73d6c11bbc68db6 + f92fce4768ed687fe980e716af9d601e url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297089/arch/Darwin/installer/googlemock-1.7.0.297089-darwin-297089.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297188/arch/Darwin/installer/googlemock-1.7.0.297188-darwin-297188.tar.bz2 name darwin @@ -934,9 +934,9 @@ archive hash - 79cffa9cd8ef82d39af44700617220b2 + aa4da4a2e244be142fa07a097463601b url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297089/arch/Linux/installer/googlemock-1.7.0.297089-linux-297089.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297188/arch/Linux/installer/googlemock-1.7.0.297188-linux-297188.tar.bz2 name linux @@ -946,16 +946,16 @@ archive hash - 8376dda80c386f925cbe3f1bef6269f1 + 46c17e436ad7385ff2e195228833c937 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297089/arch/CYGWIN/installer/googlemock-1.7.0.297089-windows-297089.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297188/arch/CYGWIN/installer/googlemock-1.7.0.297188-windows-297188.tar.bz2 name windows version - 1.7.0.297089 + 1.7.0.297188 gperftools -- cgit v1.2.3 From f861e670e37e8471f699bc67751533d67e847c4b Mon Sep 17 00:00:00 2001 From: callum_linden Date: Wed, 3 Dec 2014 11:31:02 -0800 Subject: tweak for typo in GTK/Pango Windows lib --- autobuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autobuild.xml b/autobuild.xml index dd58e2f4a6..750cc1af91 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1072,7 +1072,7 @@ hash_algorithm md5 url - ttp://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-gtk-atk-pango-glib/rev/289881/arch/CYGWIN/installer/gtk_atk_pango_glib-0.0-windows-289881.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-gtk-atk-pango-glib/rev/289881/arch/CYGWIN/installer/gtk_atk_pango_glib-0.0-windows-289881.tar.bz2 name windows -- cgit v1.2.3 From e2e97d4e7d475f8c1f55d1119c2588f0e614e5e0 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 4 Dec 2014 15:54:06 -0500 Subject: We don't want to see all of build-vc120 in 'hg status' output. --- .hgignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgignore b/.hgignore index f3fca9bcb2..10549b6144 100755 --- a/.hgignore +++ b/.hgignore @@ -17,6 +17,7 @@ build-linux-* build-darwin-* build-vc80/ build-vc100/ +build-vc120/ indra/build-vc[0-9]* indra/CMakeFiles indra/lib/mono/1.0/*.dll -- cgit v1.2.3 From 5225444caaa3f3ce77b690e1d112f34bd6ed9f50 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 4 Dec 2014 21:10:04 -0500 Subject: Update viewer to consume apr build 297252. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 750cc1af91..f3528cc6d2 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -52,9 +52,9 @@ archive hash - 9a4b02734c5d0648d3d683cb1dc014cc + 0c53148aa00e51c06fa246c4130915be url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/apr_3p-update-apr/rev/295252/arch/Darwin/installer/apr_suite-1.4.5.295252-darwin-295252.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/apr_3p-update-apr/rev/297252/arch/Darwin/installer/apr_suite-1.4.5.297252-darwin-297252.tar.bz2 name darwin @@ -64,9 +64,9 @@ archive hash - f38c966a430012dc157fdc104f23a59b + 402552cf158e2fe953b7224f4615a957 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-apr/rev/259951/arch/Linux/installer/apr_suite-1.4.5-linux-20120618.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/apr_3p-update-apr/rev/297252/arch/Linux/installer/apr_suite-1.4.5.297252-linux-297252.tar.bz2 name linux @@ -76,16 +76,16 @@ archive hash - 4a9d040582342699c58c886c5ccd2caf + 8f865b509bb5011caf3dd95a22a4589d url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-apr/rev/259951/arch/CYGWIN/installer/apr_suite-1.4.5-windows-20120618.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/apr_3p-update-apr/rev/297252/arch/CYGWIN/installer/apr_suite-1.4.5.297252-windows-297252.tar.bz2 name windows version - 1.4.5.295252 + 1.4.5.297252 ares -- cgit v1.2.3 From cbb6a416fc4111f08e014749a1f02cc1b1719d62 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 4 Dec 2014 21:48:13 -0500 Subject: Make havok_source package name agree with name from repo URL. Until we get a havok-source package built with new metadata-bearing autobuild, the package name in autobuild.xml and CMake must agree with the tarball filename. --- autobuild.xml | 4 ++-- indra/cmake/Havok.cmake | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index f3528cc6d2..6dbb21987e 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1081,7 +1081,7 @@ version 0.0 - havok-source + havok_source copyright Uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details. @@ -1092,7 +1092,7 @@ license_file LICENSES/havok.txt name - havok-source + havok_source platforms darwin diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake index 8b7f01d20b..798e59a679 100755 --- a/indra/cmake/Havok.cmake +++ b/indra/cmake/Havok.cmake @@ -3,7 +3,7 @@ if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES") -use_prebuilt_binary(havok-source) +use_prebuilt_binary(havok_source) set(Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Source) list(APPEND Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Demo) @@ -68,7 +68,7 @@ foreach(HAVOK_LIB ${HAVOK_LIBS}) endif(DEBUG_PREBUILT) endif("${havok_${HAVOK_LIB}_extracted}" STREQUAL "" AND EXISTS "${CMAKE_BINARY_DIR}/temp/havok_${HAVOK_LIB}_extracted") - if(${CMAKE_BINARY_DIR}/temp/havok-source_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/havok_${HAVOK_LIB}_extracted OR NOT ${havok_${HAVOK_LIB}_extracted} EQUAL 0) + if(${CMAKE_BINARY_DIR}/temp/havok_source_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/havok_${HAVOK_LIB}_extracted OR NOT ${havok_${HAVOK_LIB}_extracted} EQUAL 0) if(DEBUG_PREBUILT) MESSAGE(STATUS "Extracting ${HAVOK_LIB}...") endif(DEBUG_PREBUILT) @@ -111,7 +111,7 @@ foreach(HAVOK_LIB ${HAVOK_LIBS}) set(havok_${HAVOK_LIB}_extracted 0) file(WRITE ${CMAKE_BINARY_DIR}/temp/havok_${HAVOK_LIB}_extracted "${havok_${HAVOK_LIB}_extracted}") - endif(${CMAKE_BINARY_DIR}/temp/havok-source_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/havok_${HAVOK_LIB}_extracted OR NOT ${havok_${HAVOK_LIB}_extracted} EQUAL 0) + endif(${CMAKE_BINARY_DIR}/temp/havok_source_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/havok_${HAVOK_LIB}_extracted OR NOT ${havok_${HAVOK_LIB}_extracted} EQUAL 0) file(GLOB extracted_debug "${debug_dir}/*.o") file(GLOB extracted_release "${release_dir}/*.o") -- cgit v1.2.3 From 2a3b58b0c408a348458a4616b0842edd4b5916a0 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 4 Dec 2014 21:50:02 -0500 Subject: Place Windows build artifacts in build-vc120 rather than build-vc100. --- autobuild.xml | 2 +- build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 6dbb21987e..693e52e007 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -2760,7 +2760,7 @@ windows build_directory - build-vc100 + build-vc120 configurations Debug diff --git a/build.sh b/build.sh index 11455bff00..4620a52c22 100755 --- a/build.sh +++ b/build.sh @@ -32,7 +32,7 @@ build_dir_Linux() build_dir_CYGWIN() { - echo build-vc100 + echo build-vc120 } viewer_channel_suffix() -- cgit v1.2.3 From cfbc982b40ff90c180144eece5edcb4d42dcbc37 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 5 Dec 2014 08:12:13 -0500 Subject: Update viewer to consume tut build 297257. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 693e52e007..32f2ceadf2 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -2148,9 +2148,9 @@ archive hash - 253519023e73d03fcb3feb2f7a2a8835 + 2f32faa00e600911f838a7d82da5a8db url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/tut_3p-update-tut/rev/295891/arch/Linux/installer/tut-2008.11.30-common-295891.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/tut_3p-update-tut/rev/297257/arch/Linux/installer/tut-2008.11.30-common-297257.tar.bz2 name common -- cgit v1.2.3 From c54d102c8f7f336e3ad2144710e51062b5eeac97 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 5 Dec 2014 08:48:10 -0500 Subject: Wrap #pragma clang in #if __clang__, else VS produces fatal warnings. --- indra/test/lltut.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/indra/test/lltut.h b/indra/test/lltut.h index b334fb51e2..9835565bb6 100755 --- a/indra/test/lltut.h +++ b/indra/test/lltut.h @@ -75,10 +75,14 @@ namespace tut // overloads declared above. // turn off warnings about unused functions from clang for tut package +#if __clang__ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-function" +#endif #include +#if __clang__ #pragma clang diagnostic pop +#endif // The functions BELOW this point actually consume tut.hpp functionality. namespace tut -- cgit v1.2.3 From 06760492bd99b0454f676251c24387338368f9da Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Sat, 6 Dec 2014 07:57:05 -0500 Subject: Update viewer to consume mesa build 297283. --- autobuild.xml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 32f2ceadf2..77a879f60d 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1743,8 +1743,12 @@ mesa + copyright + Copyright (C) 1999-2007 Brian Paul All Rights Reserved. + description + Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics. license - mesa + Core libraries are MIT license, some of the demo programs vary. license_file LICENSES/mesa.txt name @@ -1756,14 +1760,16 @@ archive hash - 1f600840463c7327ea17486821425750 + 60e1cad8e315793649cd871533479f5d url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-linux-20100930.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/mesa_3p-update-mesa/rev/297283/arch/Linux/installer/mesa-7.11.1.297283-linux-297283.tar.bz2 name linux + version + 7.11.1.297283 nvapi -- cgit v1.2.3 From 0524a4048bd6d4d4bcd12d73e874db9379a0c02a Mon Sep 17 00:00:00 2001 From: callum_linden Date: Mon, 8 Dec 2014 16:32:51 -0800 Subject: Update autobuild to point to new (Windows) third poarty libraries we just built and configure for VS2013 --- autobuild.xml | 180 ++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 105 insertions(+), 75 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 77a879f60d..fcd923de2e 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -130,16 +130,16 @@ archive hash - 887c93c4075beefefa44b69fb2c0461e + f044de05e704d3f3fb6934adf42447c2 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-ares-update/rev/290399/arch/CYGWIN/installer/ares-1.10.0-windows-20140529.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/ares_3p-update-ares/rev/295506/arch/CYGWIN/installer/ares-1.10.0.295506-windows-295506.tar.bz2 name windows version - 1.10.0.295020 + 1.10.0.295506 boost @@ -405,9 +405,21 @@ name linux + windows + + archive + + hash + b0e66bcb304bef0c7715e0475529f7a8 + url + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/dictionaries_3p-update-dictionaries/rev/296922/arch/CYGWIN/installer/dictionaries-1.296922-windows-296922.tar.bz2 + + name + windows + version - 1.295189 + 1.296922 elfio @@ -528,16 +540,16 @@ archive hash - 6c859cd17fb8c9cdd96b188c2a2c2838 + 5aa7b826e7c1cf95e9cd3ef77e314f35 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/288122/arch/CYGWIN/installer/fmodex-4.44.31-windows-20140314.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/fmodex_3p-update-fmodex/rev/297261/arch/CYGWIN/installer/fmodex-4.44.31.297261-windows-297261.tar.bz2 name windows version - 4.44.31.295607 + 4.44.31.297261 fontconfig @@ -565,8 +577,12 @@ freeglut + copyright + Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved. + description + freeglut is a completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library. license - mit + freeglut license_file LICENSES/freeglut.txt name @@ -578,14 +594,16 @@ archive hash - 825d5a9bafcc5bfe28dc4c1c4f87c576 + 58e328a8b2f3788f932c57ad77e3e117 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freeglut/rev/221064/arch/CYGWIN/installer/freeglut-2.6.0-windows-20110214.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/freeglut_3p-update-freeglut/rev/295926/arch/CYGWIN/installer/freeglut-2.6.0.295926-windows-295926.tar.bz2 name windows + version + 2.6.0.295926 freetype @@ -643,8 +661,12 @@ glext + copyright + Copyright (c) 2007-2010 The Khronos Group Inc. + description + glext headers define function prototypes and constants for OpenGL extensions license - glext + Copyright (c) 2007-2010 The Khronos Group Inc. license_file LICENSES/glext.txt name @@ -668,14 +690,16 @@ archive hash - 5de58ca0fe19abf68b25956762ee0d29 + 6eb51c6f17e717a5617b112858d41c80 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glext-68-windows-20110406.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/glext_3p-update-glext/rev/296893/arch/CYGWIN/installer/glext-68-windows-296893.tar.bz2 name windows + version + 68 glh-linear @@ -724,11 +748,11 @@ archive hash - 22f347d243ed587e2b5e7d5329eaadb0 + 156abbd261be10ce68873ff0867b3845 hash_algorithm md5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/glh-linear_3p-update-glh-linear/rev/295212/arch/CYGWIN/installer/glh_linear-0.0.0-windows-295212.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/glh-linear_3p-update-glh-linear/rev/297262/arch/CYGWIN/installer/glh_linear-0.0.0-windows-297262.tar.bz2 name windows @@ -782,18 +806,18 @@ archive hash - 22fb3b3dcd433792e20ceada808ba54f + b0b32155319c6441997c034bdae28a22 hash_algorithm md5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-glod/rev/292477/arch/CYGWIN/installer/glod-1.0pre4-windows-292477.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/glod_3p-update-glod/rev/296895/arch/CYGWIN/installer/glod-1.0pre4.296895-windows-296895.tar.bz2 name windows version - 1.0pre4.295198 + 1.0pre4.296895 glui @@ -838,16 +862,16 @@ archive hash - e006635a741420a15f40bbdac13bd8d7 + b9e44910f2bd5139d752ac2ea19b5d85 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.36-windows-20110214.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/glui_3p-update-glui/rev/297126/arch/CYGWIN/installer/glui-2.36.297126-windows-297126.tar.bz2 name windows version - 2.36.295841 + 2.36.297126 google_breakpad @@ -892,16 +916,16 @@ archive hash - a1e519d08c507c12f9d412b2ae8328c8 + 0af9ab8c34f4acb8b0c2ae56488ee0a9 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/279804/arch/CYGWIN/installer/google_breakpad-0.0.0-rev1099-windows-20130813.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/295565/arch/CYGWIN/installer/google_breakpad-1332.295565-windows-295565.tar.bz2 name windows version - 1332.294995 + 1332.295565 googlemock @@ -1000,16 +1024,16 @@ archive hash - f62841804acb91e1309603a84f3f0ce8 + 2946f9bbf227dee8881af43856ebb3a1 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 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-perftools_3p-update-google-perftools/rev/297263/arch/CYGWIN/installer/gperftools-2.0.297263-windows-297263.tar.bz2 name windows version - 2.0.295031 + 2.0.297263 gstreamer @@ -1124,9 +1148,9 @@ archive hash - 88391b6e08d473506d406ca6f3e88cfb + b03798edda7f8e9dad0b2df46a5137f1 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/lindenlab_3p-havok-source/rev/268409/arch/CYGWIN/installer/havok_source-2012.1-windows-20121219.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/297157/arch/CYGWIN/installer/havok_source-2012.1-windows-297157.tar.bz2 name windows @@ -1178,16 +1202,16 @@ archive hash - a202ec58cef9097c94acfa958ed6da8d + 98d3dc8d107d04b572fe47bd43a56e74 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-8c-windows-20110217.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/jpeglib_3p-update-jpeglib/rev/296854/arch/CYGWIN/installer/jpeglib-8c.296854-windows-296854.tar.bz2 name windows version - 8c.295876 + 8c.296854 jsoncpp @@ -1232,16 +1256,16 @@ archive hash - afff2018e6a887c281b072eecdd9343e + 1a85cdf922d4b2e938766e543027bd3e url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-0.5.0-windows-20110208.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/jsoncpp_3p-update-jsoncpp/rev/297124/arch/CYGWIN/installer/jsoncpp-0.5.0.297124-windows-297124.tar.bz2 name windows version - 0.5.0 + 0.5.0.297124 kdu @@ -1286,16 +1310,16 @@ archive hash - 6d80d35524e1c0c32d3385014d02d48c + a0e5c050a4975c81611d9f1862ac57fb url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-kdu-private/rev/256978/arch/CYGWIN/installer/kdu-7.0.0-windows-20120515.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/kdu_3p-update-kdu/rev/296932/arch/CYGWIN/installer/kdu-7.2.296932-windows-296932.tar.bz2 name windows version - 7.2.295789 + 7.2.296932 libhunspell @@ -1340,16 +1364,16 @@ archive hash - 6a140e5620826aa5e587b4157f57b389 + ada0ad726842d902c09ab20a7ad5ac8f url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-hunspell/rev/259874/arch/CYGWIN/installer/libhunspell-1.3.2-windows-20120616.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/hunspell_3p-update-hunspell/rev/296916/arch/CYGWIN/installer/libhunspell-1.3.2.296916-windows-296916.tar.bz2 name windows version - 1.3.2.295044 + 1.3.2.296916 libndofdev @@ -1394,16 +1418,16 @@ archive hash - 3a4bec9562ed6ac53e85abcb1afc5fc0 + 1c40c22fb7b84ccccefbf797e2478ec4 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libndofdev-0.1-windows-20110223.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libndofdev_3p-update-libndofdev/rev/297264/arch/CYGWIN/installer/libndofdev-0.1.297264-windows-297264.tar.bz2 name windows version - 0.1.295599 + 0.1.297264 libpng @@ -1743,12 +1767,8 @@ mesa - copyright - Copyright (C) 1999-2007 Brian Paul All Rights Reserved. - description - Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics. license - Core libraries are MIT license, some of the demo programs vary. + mesa license_file LICENSES/mesa.txt name @@ -1760,21 +1780,23 @@ archive hash - 60e1cad8e315793649cd871533479f5d + 1f600840463c7327ea17486821425750 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/mesa_3p-update-mesa/rev/297283/arch/Linux/installer/mesa-7.11.1.297283-linux-297283.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-linux-20100930.tar.bz2 name linux - version - 7.11.1.297283 nvapi + copyright + Copyright © 2012 NVIDIA Corporation. All rights reserved. + description + NVAPI provides an interface to NVIDIA devices. license - NVAPI + NVIDIA Corporation Software License Agreement – NVAPI SDK license_file LICENSES/NVAPI_SDK_License_Agreement.pdf name @@ -1786,14 +1808,16 @@ archive hash - baf519d36dffe4e4a59471450e391d01 + 9e30c9e228d6a825b6774b97ff052973 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-nvapi/rev/267102/arch/CYGWIN/installer/nvapi-304-windows-20121116.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/nvapi_3p-update-nvapi/rev/295118/arch/CYGWIN/installer/nvapi-304-windows-295118.tar.bz2 name windows + version + 304 ogg_vorbis @@ -1838,16 +1862,16 @@ archive hash - 25da868a1204203cfd31b449dad24d6d + f358717739c288ec7401d6d1936ef878 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-ogvorbis/rev/292448/arch/CYGWIN/installer/ogg_vorbis-1.2.2-1.3.2-windows-292448.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oggvorbis_3p-update-oggvorbis/rev/296878/arch/CYGWIN/installer/ogg_vorbis-1.2.2-1.3.2.296878-windows-296878.tar.bz2 name windows version - 1.2.2-1.3.2.295493 + 1.2.2-1.3.2.296878 openal @@ -1882,18 +1906,18 @@ archive hash - de26ec439e0ca030dcda6b960fa73e8b + ca34d3f0f014ef6b8c445b6cacf4edc7 hash_algorithm md5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-openal/rev/289850/arch/CYGWIN/installer/openal-1.12.854-1.1.0-windows-289850.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openal_3p-update-openal/rev/296861/arch/CYGWIN/installer/openal-1.12.854-1.1.0.296861-windows-296861.tar.bz2 name windows version - 1.12.854-1.1.0.295049 + 1.12.854-1.1.0.296861 openjpeg @@ -1938,16 +1962,16 @@ archive hash - ca5765af55f798724d601720afdf6953 + b35adcf74d22c128045aa87aade74736 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.4-windows-20110302.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/openjpeg_3p-update-openjpeg/rev/297018/arch/CYGWIN/installer/openjpeg-1.4.297018-windows-297018.tar.bz2 name windows version - 1.4.295265 + 1.4.297018 openssl @@ -2059,8 +2083,12 @@ quicktime + copyright + 2010 Apple + description + QuickTime 7.3 SDK for Windows license - quicktime + unknown license_file LICENSES/quicktime.txt name @@ -2072,14 +2100,16 @@ archive hash - 52e49ab6937b09882389da0dbaec17f5 + 3f8b52280cb1eff2d1acd0214bce1b16 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/quicktime-7.3-windows-20110127.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/quicktime_3p-update-quicktime/rev/296445/arch/CYGWIN/installer/quicktime-7.3-windows-296445.tar.bz2 name windows + version + 7.3 slvoice @@ -2133,7 +2163,7 @@ version - 4.5.0006.17020.296971 + 4.6.0009.20030.296971 tut @@ -2802,7 +2832,7 @@ options -G - "Visual Studio 10" + "Visual Studio 12" name @@ -2846,7 +2876,7 @@ options -G - "Visual Studio 10" + "Visual Studio 12" -DUNATTENDED:BOOL=ON -DUSE_KDU=FALSE @@ -2887,7 +2917,7 @@ options -G - "Visual Studio 10" + "Visual Studio 12" default @@ -2933,7 +2963,7 @@ options -G - "Visual Studio 10" + "Visual Studio 12" -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE @@ -2975,7 +3005,7 @@ options -G - "Visual Studio 10" + "Visual Studio 12" name @@ -3019,7 +3049,7 @@ options -G - "Visual Studio 10" + "Visual Studio 12" -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE -- cgit v1.2.3