diff options
| -rwxr-xr-x | autobuild.xml | 7 | ||||
| -rwxr-xr-x | build.sh | 2 | ||||
| -rwxr-xr-x | indra/CMakeLists.txt | 14 | ||||
| -rwxr-xr-x | indra/doxygen/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | indra/doxygen/Doxyfile.in (renamed from indra/Doxyfile.in) | 6 | ||||
| -rwxr-xr-x | indra/llcorehttp/CMakeLists.txt | 4 |
6 files changed, 43 insertions, 18 deletions
diff --git a/autobuild.xml b/autobuild.xml index 28bfca4a6e..9723372351 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -838,9 +838,9 @@ <key>archive</key> <map> <key>hash</key> - <string>c2395f77c581da0a085a352ff3566d0f</string> + <string>171b39db6d0702535b41fad5b476e39d</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/298127/arch/Darwin/installer/google_breakpad-1413.298127-darwin-298127.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/298033/arch/Darwin/installer/google_breakpad-1413.298033-darwin-298033.tar.bz2</string> </map> <key>name</key> <string>darwin</string> @@ -2388,6 +2388,9 @@ <map> <key>RelWithDebInfo</key> <map> + <key>build</key> + <map> + </map> <key>configure</key> <map> <key>arguments</key> @@ -408,7 +408,7 @@ then if [ -d "$build_dir/doxygen/html" ] then (cd "$build_dir/doxygen/html"; tar cjf "$build_dir/viewer-doxygen.tar.bz2" .) - upload_item docs viewer-doxygen.tar.bz2 binary/octet-stream + upload_item docs "$build_dir/viewer-doxygen.tar.bz2" binary/octet-stream fi *) echo "Skipping mapfile for $last_built_variant" diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 15b2329fc9..1e1d6dc585 100755 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -91,21 +91,11 @@ endif (LINUX) add_subdirectory(${VIEWER_PREFIX}newview) add_dependencies(viewer secondlife-bin) +add_subdirectory(${VIEWER_PREFIX}doxygen EXCLUDE_FROM_ALL) + if (LL_TESTS) # Define after the custom targets are created so # 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) diff --git a/indra/doxygen/CMakeLists.txt b/indra/doxygen/CMakeLists.txt new file mode 100755 index 0000000000..84188bd32f --- /dev/null +++ b/indra/doxygen/CMakeLists.txt @@ -0,0 +1,28 @@ +# -*- cmake -*- + +# cmake_minimum_required should appear before any +# other commands to guarantee full compatibility +# with the version specified +## prior to 2.8, the add_custom_target commands used in setting the version did not work correctly +cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR) + +set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING + "The root project/makefile/solution name. Defaults to SecondLife.") +project(${ROOT_PROJECT_NAME}) + +set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") + +include(Variables) + +# add a target to generate API documentation with Doxygen +find_package(Doxygen) +if(DOXYGEN_FOUND) + 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) + diff --git a/indra/Doxyfile.in b/indra/doxygen/Doxyfile.in index db31000b2d..5c600debdf 100644 --- a/indra/Doxyfile.in +++ b/indra/doxygen/Doxyfile.in @@ -38,7 +38,7 @@ PROJECT_NUMBER = @VIEWER_SHORT_VERSION@.@VIEWER_VERSION_REVISION@ # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@/doxygen +OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@ # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # 4096 sub-directories (in 2 levels) under the output directory of each output @@ -634,7 +634,7 @@ EXCLUDE_SYMBOLS = # directories that contain example code fragments that are included (see # the \include command). -EXAMPLE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/../doc +EXAMPLE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/../../doc # If the value of the EXAMPLE_PATH tag contains directories, you can use the # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp @@ -1360,7 +1360,7 @@ EXTERNAL_GROUPS = YES # The PERL_PATH should be the absolute path and name of the perl script # interpreter (i.e. the result of `which perl'). -PERL_PATH = @PERL@ +#PERL_PATH = @PERL@ #--------------------------------------------------------------------------- # Configuration options related to the dot tool diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index a0b1ea13b1..9631e960c5 100755 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -134,9 +134,13 @@ if (LL_TESTS) ${BOOST_THREAD_LIBRARY} ) + # If http_proxy is in the current environment (e.g. to fetch s3-proxy + # autobuild packages), suppress it for this integration test: it screws up + # the tests. LL_ADD_INTEGRATION_TEST(llcorehttp "${llcorehttp_TEST_SOURCE_FILES}" "${test_libs}" + "-Dhttp_proxy" ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llcorehttp_peer.py" ) |