diff options
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 20 | ||||
| -rwxr-xr-x | indra/newview/llappviewer.h | 19 | ||||
| -rwxr-xr-x | indra/newview/lltexturefetch.cpp | 3 | ||||
| -rwxr-xr-x | indra/newview/llwindowlistener.cpp | 4 |
4 files changed, 26 insertions, 20 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 001cdf2de4..0d49823c9c 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1335,16 +1335,14 @@ source_group("CMake Rules" FILES ViewerInstall.cmake) # the viewer_version.txt file created here is for passing to viewer_manifest and autobuild # the summary.json file is created for the benefit of the TeamCity builds, where # it is used to provide descriptive information to the build results page -add_custom_target(generate_viewer_version ALL - COMMAND printf '${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}' > ${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt - COMMAND printf '{"Type":"viewer","Version":"${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}"}' > ${CMAKE_BINARY_DIR}/summary.json - COMMENT Generating viewer_version.txt for manifest processing - ) +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt" + "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}\n") +file(WRITE "${CMAKE_BINARY_DIR}/summary.json" + "{\"Type\":\"viewer\",\"Version\":\"${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}\"}\n") set_source_files_properties( llversioninfo.cpp tests/llversioninfo_test.cpp PROPERTIES - DEPENDS generate_viewer_version # dummy dependency to force recompile every time COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}" # see BuildVersion.cmake ) @@ -1702,8 +1700,6 @@ if (WINDOWS) LINK_FLAGS_RELEASE "/FORCE:MULTIPLE /MAP\"secondlife-bin.MAP\" /OPT:REF /LARGEADDRESSAWARE" ) - add_dependencies(${VIEWER_BINARY_NAME} generate_viewer_version) - if(USE_PRECOMPILED_HEADERS) set_target_properties( ${VIEWER_BINARY_NAME} @@ -2028,8 +2024,6 @@ if (LINUX) llcommon ) - add_dependencies(${VIEWER_BINARY_NAME} generate_viewer_version) - add_custom_command( OUTPUT ${product}.tar.bz2 COMMAND ${PYTHON_EXECUTABLE} @@ -2113,8 +2107,6 @@ if (DARWIN) "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app/Contents/Info.plist" ) - add_dependencies(${VIEWER_BINARY_NAME} generate_viewer_version) - add_custom_command( TARGET ${VIEWER_BINARY_NAME} POST_BUILD COMMAND ${PYTHON_EXECUTABLE} @@ -2147,7 +2139,6 @@ if (DARWIN) if (PACKAGE) add_custom_target(llpackage ALL DEPENDS ${VIEWER_BINARY_NAME}) - add_dependencies(llpackage generate_viewer_version) add_custom_command( TARGET llpackage POST_BUILD @@ -2231,8 +2222,7 @@ if (PACKAGE) DEPENDS generate_breakpad_symbols.py VERBATIM) - add_custom_target(generate_breakpad_symbols DEPENDS "${VIEWER_SYMBOL_FILE}") - add_dependencies(generate_breakpad_symbols "${VIEWER_BINARY_NAME}" "${VIEWER_COPY_MANIFEST}") + add_custom_target(generate_breakpad_symbols DEPENDS "${VIEWER_SYMBOL_FILE}" "${VIEWER_BINARY_NAME}" "${VIEWER_COPY_MANIFEST}") add_dependencies(llpackage generate_breakpad_symbols) endif(RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) endif (PACKAGE) diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 718871138e..311e548cfb 100755 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -1,6 +1,18 @@ /** - * @file llappviewer.h - * @brief The LLAppViewer class declaration + * @mainpage + * + * This is the sources for the Second Life Viewer; + * information on the open source project is at + * https://wiki.secondlife.com/wiki/Open_Source_Portal + * + * The Mercurial repository for the trunk version is at + * https://bitbucket.org/lindenlab/viewer-release + * + * @section source-license Source License + * @verbinclude LICENSE-source.txt + * + * @section artwork-license Artwork License + * @verbinclude LICENSE-logos.txt * * $LicenseInfo:firstyear=2007&license=viewerlgpl$ * Second Life Viewer Source Code @@ -22,6 +34,9 @@ * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ + * + * @file llappviewer.h + * @brief The LLAppViewer class declaration */ #ifndef LL_LLAPPVIEWER_H diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index fab4203ec3..e62b0607d1 100755 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -656,6 +656,7 @@ private: * is required to distribute data and perform global actions. * In pseudo-UML, it looks like: * + * @verbatim * Main Thread1 * . . * . . @@ -698,7 +699,6 @@ private: * . . * . . * - * * Key: * * SRE - Set Region Enqueued. Enqueue a 'Set Region' command in @@ -723,6 +723,7 @@ private: * global pointers used to find the 'current stats'. * RSC - Read Stats Collector. Extract collector data cloning it * (i.e. deep copy) when necessary. + * @endverbatim * */ class LLTextureFetch::TFRequest // : public LLQueuedThread::QueuedRequest diff --git a/indra/newview/llwindowlistener.cpp b/indra/newview/llwindowlistener.cpp index 734018cfc2..5367262bb6 100755 --- a/indra/newview/llwindowlistener.cpp +++ b/indra/newview/llwindowlistener.cpp @@ -55,7 +55,7 @@ LLWindowListener::LLWindowListener(LLViewerWindow *window, const KeyboardGetter& "Given [\"keysym\"], [\"keycode\"] or [\"char\"], inject the specified "; std::string keyExplain = "(integer keycode values, or keysym string from any addKeyName() call in\n" - "http://hg.secondlife.com/viewer-development/src/tip/indra/llwindow/llkeyboard.cpp )\n"; + "http://bitbucket.org/lindenlab/viewer-release/src/tip/indra/llwindow/llkeyboard.cpp )\n"; std::string mask = "Specify optional [\"mask\"] as an array containing any of \"CTL\", \"ALT\",\n" "\"SHIFT\" or \"MAC_CONTROL\"; the corresponding modifier bits will be combined\n" @@ -70,7 +70,7 @@ LLWindowListener::LLWindowListener(LLViewerWindow *window, const KeyboardGetter& "(button values \"LEFT\", \"MIDDLE\", \"RIGHT\")\n"; std::string paramsExplain = "[\"path\"] is as for LLUI::resolvePath(), described in\n" - "http://hg.secondlife.com/viewer-development/src/tip/indra/llui/llui.h\n" + "http://bitbucket.org/lindenlab/viewer-release/src/tip/indra/llui/llui.h\n" "If you omit [\"path\"], you must specify both [\"x\"] and [\"y\"].\n" "If you specify [\"path\"] without both [\"x\"] and [\"y\"], will synthesize (x, y)\n" "in the center of the LLView selected by [\"path\"].\n" |