From e7dc84df0d71cd544bc8b8cb8d49133bef19ade8 Mon Sep 17 00:00:00 2001 From: "Christian Goetze (CG)" Date: Mon, 13 Sep 2010 13:18:49 -0700 Subject: Add debug output to "indra/cmake/run_build_test.py". --- indra/cmake/run_build_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py index 104585c195..dca206f51f 100644 --- a/indra/cmake/run_build_test.py +++ b/indra/cmake/run_build_test.py @@ -86,6 +86,7 @@ def main(command, libpath=[], vars={}): # Now rebuild the path string. This way we use a minimum of separators # -- and we avoid adding a pointless separator when libpath is empty. os.environ[var] = os.pathsep.join(dirs) + print "%s = %r" % (var, os.environ[var]) # Now handle arbitrary environment variables. The tricky part is ensuring # that all the keys and values we try to pass are actually strings. if vars: -- cgit v1.2.3 From e0da08da6942139424aab07f8ed05845b2238be6 Mon Sep 17 00:00:00 2001 From: "Christian Goetze (CG)" Date: Mon, 13 Sep 2010 13:44:17 -0700 Subject: Clean up the LD_LIBRARY_PATH list prior to re-assembling it into a string. --- indra/cmake/run_build_test.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py index dca206f51f..1236604b21 100644 --- a/indra/cmake/run_build_test.py +++ b/indra/cmake/run_build_test.py @@ -83,6 +83,11 @@ def main(command, libpath=[], vars={}): # Append the sequence in libpath print "%s += %r" % (var, libpath) dirs.extend(libpath) + # Filter out some useless pieces + clean_dirs = [] + for dir in dirs: + if dir and dir not in ('', '.'): + clean_dirs.append(dir) # Now rebuild the path string. This way we use a minimum of separators # -- and we avoid adding a pointless separator when libpath is empty. os.environ[var] = os.pathsep.join(dirs) -- cgit v1.2.3 From 3a8a3301f94032af315f11e55148c6f82f6d7d73 Mon Sep 17 00:00:00 2001 From: "Christian Goetze (CG)" Date: Mon, 13 Sep 2010 14:05:53 -0700 Subject: Prepend passed in path arguments, except when they are system paths. --- indra/cmake/run_build_test.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py index 1236604b21..e377aeef48 100644 --- a/indra/cmake/run_build_test.py +++ b/indra/cmake/run_build_test.py @@ -82,15 +82,23 @@ def main(command, libpath=[], vars={}): dirs = os.environ.get(var, "").split(os.pathsep) # Append the sequence in libpath print "%s += %r" % (var, libpath) - dirs.extend(libpath) + for dir in libpath: + # append system paths at the end + if dir in ('/lib', '/usr/lib'): + dirs.append(dir) + # prepend non-system paths + else: + dirs.insert(0, dir) + # Filter out some useless pieces clean_dirs = [] for dir in dirs: if dir and dir not in ('', '.'): clean_dirs.append(dir) + # Now rebuild the path string. This way we use a minimum of separators # -- and we avoid adding a pointless separator when libpath is empty. - os.environ[var] = os.pathsep.join(dirs) + os.environ[var] = os.pathsep.join(clean_dirs) print "%s = %r" % (var, os.environ[var]) # Now handle arbitrary environment variables. The tricky part is ensuring # that all the keys and values we try to pass are actually strings. -- cgit v1.2.3 From c4d86b9e4eadca778349ea50f1f0be8a4335eca0 Mon Sep 17 00:00:00 2001 From: "Christian Goetze (CG)" Date: Mon, 13 Sep 2010 14:51:31 -0700 Subject: Include libexpat.so.1 in the list of libs to copy. --- indra/cmake/Copy3rdPartyLibs.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 2dd296bf12..95ed5d6bc8 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -221,6 +221,7 @@ elseif(LINUX) libcrypto.so.0.9.7 libdb-4.2.so libexpat.so + libexpat.so.1 libgmock_main.so libgmock.so.0 libgmodule-2.0.so -- cgit v1.2.3 From e41058e92a0ac401206bd979ffc46a5acda17a37 Mon Sep 17 00:00:00 2001 From: "Christian Goetze (CG)" Date: Mon, 13 Sep 2010 15:32:45 -0700 Subject: Add a CG BuildParams section for lenny build testing. --- BuildParams | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/BuildParams b/BuildParams index f70488d942..87e2b64efc 100644 --- a/BuildParams +++ b/BuildParams @@ -78,6 +78,14 @@ brad-parabuild.email = brad@lindenlab.com brad-parabuild.build_server = false brad-parabuild.build_server_tests = false +# ======================================== +# CG +# ======================================== + +cg_viewer-development_lenny.build_Darwin = false +cg_viewer-development_lenny.build_CYGWIN = false +cg_viewer-development_lenny.collect_metrics = true + # ======================================== # gooey # ======================================== -- cgit v1.2.3 From b57ce686acf292ad71ab4979cd19d5b348077c1b Mon Sep 17 00:00:00 2001 From: "Christian Goetze (CG)" Date: Tue, 14 Sep 2010 13:40:09 -0700 Subject: Swap out the order of detecting build failure and grepping for teamcity test result errors --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 878aa45ce3..b2b0433d05 100755 --- a/build.sh +++ b/build.sh @@ -251,13 +251,13 @@ then begin_section "Build$variant" build_dir=`build_dir_$arch $variant` build_dir_stubs="$build_dir/win_setup/$variant" - tee -a $build_log < "$build_dir/build.log" | grep --line-buffered "^##teamcity" if `cat "$build_dir/build_ok"` then echo so far so good. else record_failure "Parallel build of \"$variant\" failed." fi + tee -a $build_log < "$build_dir/build.log" | grep --line-buffered "^##teamcity" end_section "Build$variant" done end_section WaitParallel -- cgit v1.2.3 From cbed6ecd2be9849aae900ef17070d7bd2aa9542c Mon Sep 17 00:00:00 2001 From: "Christian Goetze (CG)" Date: Wed, 15 Sep 2010 11:36:11 -0700 Subject: Place test service messages into their own block. --- build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index b2b0433d05..39bd7aa53f 100755 --- a/build.sh +++ b/build.sh @@ -222,7 +222,10 @@ do fi else begin_section "Build$variant" - build "$variant" "$build_dir" 2>&1 | tee -a "$build_log" | grep --line-buffered "^##teamcity" + build "$variant" "$build_dir" > "$build_log" 2>&1 + begin_section Tests + grep --line-buffered "^##teamcity" "$build_log" + end_section Tests if `cat "$build_dir/build_ok"` then echo so far so good. @@ -257,7 +260,9 @@ then else record_failure "Parallel build of \"$variant\" failed." fi + begin_section Tests tee -a $build_log < "$build_dir/build.log" | grep --line-buffered "^##teamcity" + end_section Tests end_section "Build$variant" done end_section WaitParallel -- cgit v1.2.3 From 938e8cdb43430aff2ae7479b5f57fc3aef686095 Mon Sep 17 00:00:00 2001 From: "Christian Goetze (CG)" Date: Wed, 15 Sep 2010 16:37:08 -0700 Subject: Use CMAKE_VERBOSE_MAKEFILE:BOOL=TRUE --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 39bd7aa53f..88faf12473 100755 --- a/build.sh +++ b/build.sh @@ -63,7 +63,8 @@ pre_build() -DVIEWER_LOGIN_CHANNEL:STRING="$login_channel" \ -DINSTALL_PROPRIETARY:BOOL=ON \ -DLOCALIZESETUP:BOOL=ON \ - -DPACKAGE:BOOL=ON + -DPACKAGE:BOOL=ON \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE end_section "Pre$variant" } -- cgit v1.2.3 From eb219e05d9486772df6eb36145f819f125241be4 Mon Sep 17 00:00:00 2001 From: "Christian Goetze (CG)" Date: Wed, 15 Sep 2010 17:56:51 -0700 Subject: Reduce built variants to one, build serially --- BuildParams | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BuildParams b/BuildParams index 87e2b64efc..a4315df555 100644 --- a/BuildParams +++ b/BuildParams @@ -84,6 +84,9 @@ brad-parabuild.build_server_tests = false cg_viewer-development_lenny.build_Darwin = false cg_viewer-development_lenny.build_CYGWIN = false +cg_viewer-development_lenny.build_Linux_Debug = false +cg_viewer-development_lenny.build_Linux_RelWithDebInfo = false +cg_viewer-development_lenny.build_link_parallel = false cg_viewer-development_lenny.collect_metrics = true # ======================================== -- cgit v1.2.3 From 79ea7b43743b8b9ec768ebb3f3212a147bb9f846 Mon Sep 17 00:00:00 2001 From: "Christian Goetze (CG)" Date: Thu, 16 Sep 2010 12:03:01 -0700 Subject: Try building all variants now. --- BuildParams | 2 -- 1 file changed, 2 deletions(-) diff --git a/BuildParams b/BuildParams index a4315df555..cfd129b3fa 100644 --- a/BuildParams +++ b/BuildParams @@ -84,8 +84,6 @@ brad-parabuild.build_server_tests = false cg_viewer-development_lenny.build_Darwin = false cg_viewer-development_lenny.build_CYGWIN = false -cg_viewer-development_lenny.build_Linux_Debug = false -cg_viewer-development_lenny.build_Linux_RelWithDebInfo = false cg_viewer-development_lenny.build_link_parallel = false cg_viewer-development_lenny.collect_metrics = true -- cgit v1.2.3 From 73ba940ffe00f361c370214e47af188082d83a7e Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Thu, 16 Sep 2010 22:10:20 +0300 Subject: A little refactoring. Removed unused code and xml data which were once used for date in status bar. --- indra/newview/llstatusbar.cpp | 74 ---------------------- indra/newview/llstatusbar.h | 7 +- .../skins/default/xui/en/panel_status_bar.xml | 8 --- 3 files changed, 1 insertion(+), 88 deletions(-) diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index b622e98971..2c15ff9aed 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -107,10 +107,6 @@ const S32 TEXT_HEIGHT = 18; static void onClickVolume(void*); -std::vector LLStatusBar::sDays; -std::vector LLStatusBar::sMonths; -const U32 LLStatusBar::MAX_DATE_STRING_LENGTH = 2000; - LLStatusBar::LLStatusBar(const LLRect& rect) : LLPanel(), mTextTime(NULL), @@ -127,10 +123,6 @@ LLStatusBar::LLStatusBar(const LLRect& rect) // status bar can possible overlay menus? setMouseOpaque(FALSE); - // size of day of the weeks and year - sDays.reserve(7); - sMonths.reserve(12); - mBalanceTimer = new LLFrameTimer(); mHealthTimer = new LLFrameTimer(); @@ -169,9 +161,6 @@ BOOL LLStatusBar::postBuild() { gMenuBarView->setRightMouseDownCallback(boost::bind(&show_navbar_context_menu, _1, _2, _3)); - // build date necessary data (must do after panel built) - setupDate(); - mTextTime = getChild("TimeText" ); getChild("buyL")->setCommitCallback( @@ -517,69 +506,6 @@ void LLStatusBar::onClickMediaToggle(void* data) LLViewerMedia::setAllMediaEnabled(enable); } -// sets the static variables necessary for the date -void LLStatusBar::setupDate() -{ - // fill the day array with what's in the xui - std::string day_list = getString("StatBarDaysOfWeek"); - size_t length = day_list.size(); - - // quick input check - if(length < MAX_DATE_STRING_LENGTH) - { - // tokenize it and put it in the array - std::string cur_word; - for(size_t i = 0; i < length; ++i) - { - if(day_list[i] == ':') - { - sDays.push_back(cur_word); - cur_word.clear(); - } - else - { - cur_word.append(1, day_list[i]); - } - } - sDays.push_back(cur_word); - } - - // fill the day array with what's in the xui - std::string month_list = getString( "StatBarMonthsOfYear" ); - length = month_list.size(); - - // quick input check - if(length < MAX_DATE_STRING_LENGTH) - { - // tokenize it and put it in the array - std::string cur_word; - for(size_t i = 0; i < length; ++i) - { - if(month_list[i] == ':') - { - sMonths.push_back(cur_word); - cur_word.clear(); - } - else - { - cur_word.append(1, month_list[i]); - } - } - sMonths.push_back(cur_word); - } - - // make sure we have at least 7 days and 12 months - if(sDays.size() < 7) - { - sDays.resize(7); - } - - if(sMonths.size() < 12) - { - sMonths.resize(12); - } -} - // static void LLStatusBar::onClickStatGraph(void* data) { diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h index c8c86dfd8c..8840db2c4a 100644 --- a/indra/newview/llstatusbar.h +++ b/indra/newview/llstatusbar.h @@ -85,9 +85,7 @@ public: LLPanelNearByMedia* getNearbyMediaPanel() { return mPanelNearByMedia; } private: - // simple method to setup the part that holds the date - void setupDate(); - + void onClickBuyCurrency(); void onVolumeChanged(const LLSD& newvalue); @@ -117,9 +115,6 @@ private: LLFrameTimer* mHealthTimer; LLPanelVolumePulldown* mPanelVolumePulldown; LLPanelNearByMedia* mPanelNearByMedia; - static std::vector sDays; - static std::vector sMonths; - static const U32 MAX_DATE_STRING_LENGTH; }; // *HACK: Status bar owns your cached money balance. JC diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 43513e1ab6..4ccd7b3629 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -13,14 +13,6 @@ top="19" tab_stop="false" width="1000"> - - Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday - - - January:February:March:April:May:June:July:August:September:October:November:December - Packet Loss -- cgit v1.2.3 From 7f693051a2d7b15006349eea6ddb431f02b5e9f7 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Thu, 16 Sep 2010 22:48:37 +0300 Subject: STORM-154 FIXED Resized Group Info panel buttons to prevent Group Call button label truncation. Removed commented out button and extra layout stack from panel_group_info_sidetray.xml Resized buttons to use remaining free space when Create Group button is invisible. --- .../default/xui/en/panel_group_info_sidetray.xml | 64 ++++------------------ 1 file changed, 11 insertions(+), 53 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index 2a3add161a..3ded5c6678 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -177,36 +177,16 @@ background_visible="true" - - - - + width="297">