Vadim ProductEngine avatar Vadim ProductEngine committed 13ece49 Merge

Merge from default branch

Comments (0)

Files changed (4)

 # 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
 # ========================================
 # Notifications - to configure email notices, add a setting like this:
 # <username>_<reponame>.email = <email-address>
 
+# Snowstorm canonical build (oz)
+snowstorm_viewer-development.email = viewer-development-builds@lists.secondlife.com
+
 # =======================================
 # brad
 # ========================================

doc/contributions.txt

 	VWR-17
 Boroondas Gupte
 	SNOW-278
+	SNOW-503
 	SNOW-527
 	SNOW-624
 	VWR-233
 	SNOW-108
 	SNOW-204
 	SNOW-484
+	SNOW-504
 	SNOW-506
+	SNOW-507
 	SNOW-514
 	SNOW-520
-	SNOW-507
 	SNOW-585
 	VWR-2488
 	VWR-9557

indra/cmake/Copy3rdPartyLibs.cmake

     ${vivox_src_dir}
     "${SHARED_LIB_STAGING_DIR_DEBUG}"
     out_targets 
-   ${vivox_files}
+    ${vivox_files}
     )
 set(third_party_targets ${third_party_targets} ${out_targets})
 
 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)

indra/cmake/LLAddBuildTest.cmake

 
     # 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
     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)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.