livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge buildcleanup

master
Oz Linden 2015-06-25 12:13:10 -04:00
parent 00c69c5b1a e23228fef2
commit aa630cac08
8 changed files with 1660 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
autobuild.xml
View File

@ -2470,6 +2470,25 @@
<key>name</key>
<string>ReleaseOS</string>
</map>
<key>Doxygen</key>
<map>
<key>build</key>
<map>
<key>arguments</key>
<array>
<string>Doxyfile</string>
</array>
<key>command</key>
<string>doxygen</string>
</map>
<key>configure</key>
<map>
<key>command</key>
<string>cmake</string>
</map>
<key>name</key>
<string>Doxygen</string>
</map>
</map>
<key>name</key>
<string>common</string>
@ -2480,6 +2499,28 @@
<string>build-darwin-i386</string>
<key>configurations</key>
<map>
<key>Doxygen</key>
<map>
<key>build</key>
<map>
</map>
<key>configure</key>
<map>
<key>options</key>
<array>
<string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
<string>-DWORD_SIZE:STRING=32</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string>
</array>
<key>arguments</key>
<array>
<string>../indra</string>
</array>
</map>
<key>name</key>
<string>Doxygen</string>
</map>
<key>RelWithDebInfo</key>
<map>
<key>build</key>
@ -2596,6 +2637,26 @@
<string>build-linux-i686</string>
<key>configurations</key>
<map>
<key>Doxygen</key>
<map>
<key>build</key>
<map>
</map>
<key>configure</key>
<map>
<key>arguments</key>
<array>
<string>../indra</string>
</array>
<key>options</key>
<array>
<string>-G</string>
<string>'Unix Makefiles'</string>
</array>
</map>
<key>name</key>
<string>Doxygen</string>
</map>
<key>RelWithDebInfo</key>
<map>
<key>build</key>

6
build.sh
View File

@ -173,6 +173,12 @@ build()
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
if [ "x$arch" = x ]
then

2
doc/LICENSE-logos.txt
View File

@ -11,7 +11,7 @@ summary, see http://creativecommons.org/licenses/by-sa/3.0/.
Notwithstanding the foregoing, all of Linden Lab's trademarks, including
but not limited to the Second Life brand name and Second Life Eye-in-Hand
logo, are subject to our trademark policy at
http://secondlife.com/corporate/trademark/.
http://secondlife.com/corporate/brand/trademark/.
If you distribute any copies or adaptations of the Second Life viewer
artwork or any other works in these files, you must include this Notice

4
doc/LICENSE-source.txt
View File

@ -7,7 +7,9 @@ you under the terms of the GNU Lesser General Public License, version 2.1
("LGPL"), unless you have obtained a separate licensing agreement
("Other License"), formally executed by you and Linden Lab. Terms of
the GPL can be found in doc/LGPL-license.txt in this distribution, or
online at http://secondlife.com/developers/opensource/lgplv2_1
online at
https://wiki.secondlife.com/wiki/Linden_Lab_Official:GNU_Lesser_General_Public_License,_version_2.1
By copying, modifying or distributing this software, you acknowledge
that you have read and understood your obligations described above,

13
indra/CMakeLists.txt
View File

@ -96,3 +96,16 @@ if (LL_TESTS)
# individual apps can add themselves as dependencies
add_subdirectory(${INTEGRATION_TESTS_PREFIX}integration_tests)
endif (LL_TESTS)
# add a target to generate API documentation with Doxygen
find_package(Doxygen)
if(DOXYGEN_FOUND)
find_program(PERL perl) # I am not sure if this is really needed or not
GET_FILENAME_COMPONENT(DOXYGEN_TOP_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR} PATH)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
add_custom_target(doc
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Generating API documentation with Doxygen" VERBATIM
)
endif(DOXYGEN_FOUND)

1557
indra/Doxyfile.in Normal file
View File

File diff suppressed because it is too large Load Diff

19
indra/newview/llappviewer.h
View File

@ -1,6 +1,18 @@
/**
* @file llappviewer.h
* @brief The LLAppViewer class declaration
* @mainpage Second Life Viewer
*
* 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://hg.secondlife.com/viewer-development
*
* @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

3
indra/newview/lltexturefetch.cpp
View File

@ -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