From b9853f8e0928e7ef17f80021f9f31eb0161b6169 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Thu, 19 Aug 2010 13:31:45 +0100 Subject: VWR-20809 (SNOW-504) Do not depend on stage_thirds_party_libs for a standalone build. --- doc/contributions.txt | 3 ++- indra/cmake/Copy3rdPartyLibs.cmake | 12 +++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index e124a68df4..ac42542ebc 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -520,10 +520,11 @@ Robin Cornelius SNOW-108 SNOW-204 SNOW-484 + SNOW-504 SNOW-506 + SNOW-507 SNOW-514 SNOW-520 - SNOW-507 SNOW-585 VWR-2488 VWR-9557 diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 89422fbdb2..2dd296bf12 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -286,7 +286,7 @@ copy_if_different( ${vivox_src_dir} "${SHARED_LIB_STAGING_DIR_DEBUG}" out_targets - ${vivox_files} + ${vivox_files} ) set(third_party_targets ${third_party_targets} ${out_targets}) @@ -391,7 +391,9 @@ if(NOT EXISTS ${internal_llkdu_path}) endif (NOT EXISTS ${internal_llkdu_path}) -add_custom_target(stage_third_party_libs ALL - DEPENDS - ${third_party_targets} - ) +if(NOT STANDALONE) + add_custom_target( + stage_third_party_libs ALL + DEPENDS ${third_party_targets} + ) +endif(NOT STANDALONE) -- cgit v1.2.3 From 2a1d58fdf6222f6bf83211263990d3d8a87800c5 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Thu, 19 Aug 2010 14:22:37 +0100 Subject: VWR-20810 (SNOW-503) Quote EXE_STAGING_DIR to prevent it failing with some paths --- indra/cmake/LLAddBuildTest.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake index e8a0a949b6..a6a7989955 100644 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake @@ -107,7 +107,7 @@ INCLUDE(GoogleMock) # Setup target ADD_EXECUTABLE(PROJECT_${project}_TEST_${name} ${${name}_test_SOURCE_FILES}) - SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${EXE_STAGING_DIR}) + SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}") # # Per-codefile additional / external project dep and lib dep property extraction @@ -196,7 +196,7 @@ FUNCTION(LL_ADD_INTEGRATION_TEST message(STATUS "ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files})") endif(TEST_DEBUG) ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files}) - SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${EXE_STAGING_DIR}) + SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}") # Add link deps to the executable if(TEST_DEBUG) -- cgit v1.2.3 From 6f1d8b1d05e34fa42d93db005d012c8f8a6d25c6 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Thu, 19 Aug 2010 16:03:08 +0100 Subject: VWR-20810 (SNOW-503) Oops ... forgot the doc/contributions.txt entry (No functional change) --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/contributions.txt b/doc/contributions.txt index ac42542ebc..067f29ed55 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -150,6 +150,7 @@ blino Nakamura VWR-17 Boroondas Gupte SNOW-278 + SNOW-503 SNOW-527 SNOW-624 VWR-233 -- cgit v1.2.3 From a4d969067b3671c30721699530f53be8bdf8d480 Mon Sep 17 00:00:00 2001 From: "Christian Goetze (CG)" Date: Thu, 19 Aug 2010 09:15:51 -0700 Subject: Remove obsolete build configurations from BuildParams. --- BuildParams | 124 ------------------------------------------------------------ 1 file changed, 124 deletions(-) diff --git a/BuildParams b/BuildParams index 05cfb01b9f..40216e7606 100644 --- a/BuildParams +++ b/BuildParams @@ -18,130 +18,6 @@ S3ACL = public-read # Update Public Inworld Build Status Indicators email_status_this_is_os = true -#### P r o d u c t i o n B u i l d s #### - -# ======================================== -# Viewer Hotfix Old -# ======================================== - -# Report changes since... -viewer-hotfix-old.show_changes_since = 2-1-release - -# Build Settings -viewer-hotfix-old.build_viewer = true -viewer-hotfix-old.build_server = false -viewer-hotfix-old.build_server_tests = false -viewer-hotfix-old.build_Linux = true -viewer-hotfix-old.build_hg_bundle = true -viewer-hotfix-old.build_docs = true -#viewer-hotfix-old.build_Linux_Debug = false -#viewer-hotfix-old.build_Linux_RelWithDebInfo = false -# -# Default channels etc - set build_viewer_update_version_manager to true when needed. -viewer-hotfix-old.viewer_channel = "Second Life Release" -viewer-hotfix-old.login_channel = "Second Life Release" -viewer-hotfix-old.viewer_grid = agni -viewer-hotfix-old.build_viewer_update_version_manager = false - -# ======================================== -# Viewer Hotfix Previous -# ======================================== - -# Report changes since... -viewer-hotfix-previous.show_changes_since = 2-1-release - -# Build Settings -viewer-hotfix-previous.build_viewer = true -viewer-hotfix-previous.build_server = false -viewer-hotfix-previous.build_server_tests = false -viewer-hotfix-previous.build_Linux = true -viewer-hotfix-previous.build_hg_bundle = true -viewer-hotfix-previous.build_docs = true -#viewer-hotfix-previous.build_Linux_Debug = false -#viewer-hotfix-previous.build_Linux_RelWithDebInfo = false -# -# Default channels etc - set build_viewer_update_version_manager to true when needed. -viewer-hotfix-previous.viewer_channel = "Second Life Release" -viewer-hotfix-previous.login_channel = "Second Life Release" -viewer-hotfix-previous.viewer_grid = agni -viewer-hotfix-previous.build_viewer_update_version_manager = false - -# ======================================== -# Viewer Hotfix -# ======================================== - -# Report changes since... -viewer-hotfix.show_changes_since = 2-1-release - -# Build Settings -viewer-hotfix.build_viewer = true -viewer-hotfix.build_server = false -viewer-hotfix.build_server_tests = false -viewer-hotfix.build_Linux = true -viewer-hotfix.build_hg_bundle = true -viewer-hotfix.build_docs = true -#viewer-hotfix.build_Linux_Debug = false -#viewer-hotfix.build_Linux_RelWithDebInfo = false -# -# Default channels etc - set build_viewer_update_version_manager to true when needed. -viewer-hotfix.viewer_channel = "Second Life Release" -viewer-hotfix.login_channel = "Second Life Release" -viewer-hotfix.viewer_grid = agni -viewer-hotfix.build_viewer_update_version_manager = false - -# ======================================== -# Viewer Release -# ======================================== - -# Report changes since... -viewer-release.show_changes_since = 2-1-release - -# Build Settings -viewer-release.build_viewer = true -viewer-release.build_server = false -viewer-release.build_server_tests = false -viewer-release.build_Linux = true -viewer-release.build_hg_bundle = true -viewer-release.build_docs = true -#viewer-release.build_Linux_Debug = false -#viewer-release.build_Linux_RelWithDebInfo = false -# -# Default channels etc - set build_viewer_update_version_manager to true when needed. -viewer-release.viewer_channel = "Second Life Beta Viewer" -viewer-release.login_channel = "Second Life Beta Viewer" -viewer-release.viewer_grid = agni -viewer-release.build_viewer_update_version_manager = false - -# ======================================== -# Viewer Public -# ======================================== - -# Report changes since... -viewer-public.show_changes_since = 2-1-release - -# Build Settings -viewer-public.build_viewer = true -viewer-public.build_server = false -viewer-public.build_server_tests = false -viewer-public.build_Linux = true -viewer-public.build_hg_bundle = true -viewer-public.build_docs = true -#viewer-public.build_Linux_Debug = false -#viewer-public.build_Linux_RelWithDebInfo = false -# -# Default channels etc - set build_viewer_update_version_manager to true when needed. -viewer-public.viewer_channel = "Second Life Public Alpha" -viewer-public.login_channel = "Second Life Public Alpha" -viewer-public.viewer_grid = agni -viewer-public.build_viewer_update_version_manager = false -viewer-public_coverity.build_coverity = true -viewer-public_coverity.coverity_product = viewer - - - -#### D e v e l o p m e n t B u i l d s #### - - # ======================================== # Viewer Development # ======================================== -- cgit v1.2.3 From 9208e096935407d18b2228d8dda8802f3f0f9083 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 20 Aug 2010 06:35:03 -0400 Subject: add email for new canonical snowstorm build --- BuildParams | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BuildParams b/BuildParams index 40216e7606..95507ade0a 100644 --- a/BuildParams +++ b/BuildParams @@ -57,6 +57,9 @@ viewer-development.build_viewer_update_version_manager = false # Notifications - to configure email notices, add a setting like this: # _.email = +# Snowstorm canonical build (oz) +snowstorm_viewer-development.email = viewer-development-builds@lists.secondlife.com + # ======================================= # brad # ======================================== -- cgit v1.2.3