From f9399c80caa656998020a122f617d6c26942cc53 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 23 Sep 2014 16:28:34 -0400 Subject: minimal hacks to autobuild.xml to allow configure to finish --- autobuild.xml | 300 +++++++++++++++++++++++--------------------- indra/cmake/Audio.cmake | 2 +- indra/cmake/GLOD.cmake | 2 +- indra/cmake/Havok.cmake | 2 +- indra/cmake/NDOF.cmake | 2 +- indra/cmake/Prebuilt.cmake | 2 - indra/cmake/XmlRpcEpi.cmake | 2 +- 7 files changed, 161 insertions(+), 151 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index b9a95b1b3d..580b1f008b 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -3,54 +3,6 @@ installables - GLOD - - license - GLOD - license_file - LICENSES/glod.txt - name - GLOD - platforms - - darwin - - archive - - hash - e6071abd822c0688390382a26f8a782c - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/267984/arch/Darwin/installer/glod-1.0pre4-darwin-20121211.tar.bz2 - - name - darwin - - linux - - archive - - hash - 176736c52b3cde6ca8e7d9e173d91731 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/268002/arch/Linux/installer/glod-1.0pre4-linux-20121212.tar.bz2 - - name - linux - - windows - - archive - - hash - 842208365f5b108dac4c7c733b99da9c - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/232684/arch/CYGWIN/installer/glod-1.0pre4-windows-20110610.tar.bz2 - - name - windows - - - SDL license @@ -339,14 +291,14 @@ - dbusglib + dbus_glib license AFL2.1 license_file LICENSES/dbus-glib.txt name - dbusglib + dbus_glib platforms linux @@ -373,43 +325,21 @@ dictionaries platforms - darwin - - archive - - hash - 06a6c49eb1873e95623d3d2d07aee903 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-dictionaries/rev/259873/arch/Darwin/installer/dictionaries-1-darwin-20120616.tar.bz2 - - name - darwin - - linux - - archive - - hash - 4f0ca21d27e0cd0b002149062b0a4b25 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-dictionaries/rev/259873/arch/Linux/installer/dictionaries-1-linux-20120616.tar.bz2 - - name - linux - - windows + common archive hash - 7520d75f6af325328322201c888191d4 + 1f300f7b8600a18cd4c958841bfa2a95 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-dictionaries/rev/259873/arch/CYGWIN/installer/dictionaries-1-windows-20120616.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-dictionaries/rev/292421/arch/Linux/installer/dictionaries-1-common-292421.tar.bz2 name - windows + common + version + 1 elfio @@ -665,8 +595,12 @@ glh_linear + copyright + Copyright (c) 2000 Cass Everitt + description + glh - is a platform-indepenedent C++ OpenGL helper library license - glh_linear + Copyright (c) 2000 NVIDIA CorporationMIT license_file LICENSES/glh_linear.txt name @@ -678,9 +612,11 @@ archive hash - 366f940f2634b0e05954646927620bfd + d09b3732d416823c22738643912fbe1f + hash_algorithm + md5 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-darwin-20101004.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-glh_linear/rev/289814/arch/Darwin/installer/glh_linear-0.0.0-darwin-289814.tar.bz2 name darwin @@ -690,9 +626,11 @@ archive hash - 1b1f1e9975e3a671c9faf32fcf4b6d43 + f59c17c2115889bf4339bff0fcd5256e + hash_algorithm + md5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glh_linear/rev/263308/arch/Linux/installer/glh_linear-0.0.0-linux-20120810.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-glh_linear/rev/289814/arch/Linux/installer/glh_linear-0.0.0-linux-289814.tar.bz2 name linux @@ -702,19 +640,79 @@ archive hash - 57f8be28bbaa2505ae3b59deb2c77cdf + a97f8377bcd13c1f56450ea6d394b3a2 + hash_algorithm + md5 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-windows-20101011.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-glh_linear/rev/289814/arch/CYGWIN/installer/glh_linear-0.0.0-windows-289814.tar.bz2 name windows + version + 0.0.0 + + glod + + license + GLOD Open-Source License Version 1.0 + license_file + LICENSES/GLOD.txt + name + glod + platforms + + darwin + + archive + + hash + 363838752f3f2656ce3c5efaeee40b96 + hash_algorithm + md5 + url + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-glod/rev/292477/arch/Darwin/installer/glod-1.0pre4-darwin-292477.tar.bz2 + + name + darwin + + linux + + archive + + hash + dce9a44a6c3dbd2ea35dca2e8cf74db4 + hash_algorithm + md5 + url + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-glod/rev/292477/arch/Linux/installer/glod-1.0pre4-linux-292477.tar.bz2 + + name + linux + + windows + + archive + + hash + 22fb3b3dcd433792e20ceada808ba54f + hash_algorithm + md5 + url + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-glod/rev/292477/arch/CYGWIN/installer/glod-1.0pre4-windows-292477.tar.bz2 + + name + windows + + + version + 1.0pre4 glui license - lgpl + ZLIB license_file LICENSES/glui.txt name @@ -733,6 +731,18 @@ name darwin + linux + + archive + + hash + ce746c9d80802127c7a14ee89ea6d5bc + url + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-glui/rev/292474/arch/Linux/installer/glui-2.36-linux-292474.tar.bz2 + + name + linux + windows archive @@ -939,14 +949,14 @@ - havok-source + havok_source license havok-ares license_file LICENSES/havok.txt name - havok-source + havok_source platforms darwin @@ -1179,6 +1189,54 @@ + libndofdev + + license + linden + license_file + LICENSES/libndofdev.txt + name + libndofdev + platforms + + darwin + + archive + + hash + 674d37d2ba76a2df7f18c47bf50b5d03 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libndofdev-0.1-darwin-20110308.tar.bz2 + + name + darwin + + linux + + archive + + hash + 9bf7a96c1d2fadb180fda91740c945c6 + url + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libndofdev-linux/rev/233137/arch/Linux/installer/libndofdev-0.3-linux-20110617.tar.bz2 + + name + linux + + windows + + archive + + hash + 3a4bec9562ed6ac53e85abcb1afc5fc0 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libndofdev-0.1-windows-20110223.tar.bz2 + + name + windows + + + libpng license @@ -1501,54 +1559,6 @@ - ndofdev - - license - linden - license_file - LICENSES/libndofdev.txt - name - ndofdev - platforms - - darwin - - archive - - hash - 674d37d2ba76a2df7f18c47bf50b5d03 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libndofdev-0.1-darwin-20110308.tar.bz2 - - name - darwin - - linux - - archive - - hash - 9bf7a96c1d2fadb180fda91740c945c6 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libndofdev-linux/rev/233137/arch/Linux/installer/libndofdev-0.3-linux-20110617.tar.bz2 - - name - linux - - windows - - archive - - hash - 3a4bec9562ed6ac53e85abcb1afc5fc0 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libndofdev-0.1-windows-20110223.tar.bz2 - - name - windows - - - nvapi license @@ -1573,14 +1583,14 @@ - ogg-vorbis + ogg_vorbis license ogg-vorbis license_file LICENSES/ogg-vorbis.txt name - ogg-vorbis + ogg_vorbis platforms darwin @@ -1907,14 +1917,14 @@ version 2008.11.30 - xmlrpc-epi + xmlrpc_epi license xmlrpc-epi license_file LICENSES/xmlrpc-epi.txt name - xmlrpc-epi + xmlrpc_epi platforms darwin @@ -2004,14 +2014,16 @@ - orig_ver - 1.2 package_description + copyright + Copyright (c) 2014, Linden Research, Inc. description Second Life Viewer license LGPL + license_file + docs/LICENSE-source.txt name Second Life Viewer platforms @@ -2759,8 +2771,8 @@ windows - version - 1.0 + version_file + VERSION.txt type autobuild diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake index 876b7f82a8..f95439245a 100755 --- a/indra/cmake/Audio.cmake +++ b/indra/cmake/Audio.cmake @@ -8,7 +8,7 @@ if (USESYSTEMLIBS) pkg_check_modules(VORBISENC REQUIRED vorbisenc) pkg_check_modules(VORBISFILE REQUIRED vorbisfile) else (USESYSTEMLIBS) - use_prebuilt_binary(ogg-vorbis) + use_prebuilt_binary(ogg_vorbis) set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS}) set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS}) diff --git a/indra/cmake/GLOD.cmake b/indra/cmake/GLOD.cmake index 3683768af9..a347eb6fee 100755 --- a/indra/cmake/GLOD.cmake +++ b/indra/cmake/GLOD.cmake @@ -2,7 +2,7 @@ include(Prebuilt) if (NOT USESYSTEMLIBS) - use_prebuilt_binary(GLOD) + use_prebuilt_binary(glod) endif (NOT USESYSTEMLIBS) set(GLOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake index 8b7f01d20b..49740d6a81 100755 --- a/indra/cmake/Havok.cmake +++ b/indra/cmake/Havok.cmake @@ -3,7 +3,7 @@ if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES") -use_prebuilt_binary(havok-source) +use_prebuilt_binary(havok_source) set(Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Source) list(APPEND Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Demo) diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake index e72845db53..8bad96f6b5 100755 --- a/indra/cmake/NDOF.cmake +++ b/indra/cmake/NDOF.cmake @@ -8,7 +8,7 @@ if (NDOF) set(NDOF_FIND_REQUIRED ON) include(FindNDOF) else (USESYSTEMLIBS) - use_prebuilt_binary(ndofdev) + use_prebuilt_binary(libndofdev) if (WINDOWS) set(NDOF_LIBRARY libndofdev) diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake index e548805148..5d82c9015e 100755 --- a/indra/cmake/Prebuilt.cmake +++ b/indra/cmake/Prebuilt.cmake @@ -33,13 +33,11 @@ macro (use_prebuilt_binary _binary) if(DEBUG_PREBUILT) message("cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install --install-dir=${AUTOBUILD_INSTALL_DIR} - --skip-license-check ${_binary} ") endif(DEBUG_PREBUILT) execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}" install --install-dir=${AUTOBUILD_INSTALL_DIR} - --skip-license-check ${_binary} WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" RESULT_VARIABLE ${_binary}_installed diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake index 3a0caa0a06..09215f7bee 100755 --- a/indra/cmake/XmlRpcEpi.cmake +++ b/indra/cmake/XmlRpcEpi.cmake @@ -7,7 +7,7 @@ set(XMLRPCEPI_FIND_REQUIRED ON) if (USESYSTEMLIBS) include(FindXmlRpcEpi) else (USESYSTEMLIBS) - use_prebuilt_binary(xmlrpc-epi) + use_prebuilt_binary(xmlrpc_epi) if (WINDOWS) set(XMLRPCEPI_LIBRARIES debug xmlrpc-epid -- cgit v1.2.3