Skip to content
Snippets Groups Projects
Commit b3352767 authored by Oz Linden's avatar Oz Linden
Browse files

Replace hg.secondlife.com with bitbucket.org/lindenlab/viewer-release

Incorporate viewer channel and version into doxygen output
Use the autobuild configuration as a variant to build doxygen docs.
Upload doxygen docs as a tarball if generated.
parent 510f46df
No related branches found
No related tags found
No related merge requests found
...@@ -173,12 +173,6 @@ build() ...@@ -173,12 +173,6 @@ build()
fi fi
} }
if "$AUTOBUILD" build -c Doxygen
then
echo true >"$build_dir"/build_ok
else
echo false >"$build_dir"/build_ok
fi
# Check to see if we were invoked from the wrapper, if not, re-exec ourselves from there # Check to see if we were invoked from the wrapper, if not, re-exec ourselves from there
if [ "x$arch" = x ] if [ "x$arch" = x ]
then then
...@@ -423,6 +417,11 @@ then ...@@ -423,6 +417,11 @@ then
upload_stub_installers "$build_dir_stubs" upload_stub_installers "$build_dir_stubs"
fi fi
end_section Upload Installer end_section Upload Installer
elif [ "$last_built_variant" = "Doxygen" ]
then
cd "$build_dir/doxygen/html"
tar cjf viewer-doxygen.tar.bz2 .
upload_item docs viewer-doxygen.tar.bz2 binary/octet-stream
else else
echo skipping upload of installer echo skipping upload of installer
fi fi
......
...@@ -25,13 +25,13 @@ DOXYFILE_ENCODING = UTF-8 ...@@ -25,13 +25,13 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project. # by quotes) that should identify the project.
PROJECT_NAME = SecondLifeViewer PROJECT_NAME = "@VIEWER_CHANNEL@"
# The PROJECT_NUMBER tag can be used to enter a project or revision number. # The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = PROJECT_NUMBER = @VIEWER_SHORT_VERSION@.@VIEWER_VERSION_REVISION@
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put. # base path where the generated documentation will be put.
......
/** /**
* @mainpage Second Life Viewer * @mainpage
* *
* This is the sources for the Second Life Viewer; * This is the sources for the Second Life Viewer;
* information on the open source project is at * information on the open source project is at
* https://wiki.secondlife.com/wiki/Open_Source_Portal * https://wiki.secondlife.com/wiki/Open_Source_Portal
* *
* The Mercurial repository for the trunk version is at * The Mercurial repository for the trunk version is at
* https://hg.secondlife.com/viewer-development * https://bitbucket.org/lindenlab/viewer-release
* *
* @section source-license Source License * @section source-license Source License
* @verbinclude LICENSE-source.txt * @verbinclude LICENSE-source.txt
......
...@@ -55,7 +55,7 @@ LLWindowListener::LLWindowListener(LLViewerWindow *window, const KeyboardGetter& ...@@ -55,7 +55,7 @@ LLWindowListener::LLWindowListener(LLViewerWindow *window, const KeyboardGetter&
"Given [\"keysym\"], [\"keycode\"] or [\"char\"], inject the specified "; "Given [\"keysym\"], [\"keycode\"] or [\"char\"], inject the specified ";
std::string keyExplain = std::string keyExplain =
"(integer keycode values, or keysym string from any addKeyName() call in\n" "(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 = std::string mask =
"Specify optional [\"mask\"] as an array containing any of \"CTL\", \"ALT\",\n" "Specify optional [\"mask\"] as an array containing any of \"CTL\", \"ALT\",\n"
"\"SHIFT\" or \"MAC_CONTROL\"; the corresponding modifier bits will be combined\n" "\"SHIFT\" or \"MAC_CONTROL\"; the corresponding modifier bits will be combined\n"
...@@ -70,7 +70,7 @@ LLWindowListener::LLWindowListener(LLViewerWindow *window, const KeyboardGetter& ...@@ -70,7 +70,7 @@ LLWindowListener::LLWindowListener(LLViewerWindow *window, const KeyboardGetter&
"(button values \"LEFT\", \"MIDDLE\", \"RIGHT\")\n"; "(button values \"LEFT\", \"MIDDLE\", \"RIGHT\")\n";
std::string paramsExplain = std::string paramsExplain =
"[\"path\"] is as for LLUI::resolvePath(), described in\n" "[\"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 omit [\"path\"], you must specify both [\"x\"] and [\"y\"].\n"
"If you specify [\"path\"] without both [\"x\"] and [\"y\"], will synthesize (x, 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" "in the center of the LLView selected by [\"path\"].\n"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment