From 84df608ade855c9ee4e76b78a8345b7f7ad08db3 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Tue, 5 Apr 2011 14:11:28 -0400 Subject: initial pass at adding new mesh libraries to autobuild. Needs a license review and some other fixes, but autobuild configure completes successfully. --- autobuild.xml | 372 ++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 294 insertions(+), 78 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 4951be63bc..ec5d7d51ac 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -51,6 +51,54 @@ + GLOD + + license + GLOD + license_file + LICENSES/glod.txt + name + GLOD + platforms + + darwin + + archive + + hash + 3a7263246813ecf9aff5a240892f9641 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-darwin-20101007a.tar.bz2 + + name + darwin + + linux + + archive + + hash + ca7368e9a1baf266b82d910fa8f821bd + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-linux-20100920a.tar.bz2 + + name + linux + + windows + + archive + + hash + e40e1eac81dc57d8724f96fd977a3d58 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-windows-20110330.tar.bz2 + + name + windows + + + SDL license @@ -219,6 +267,54 @@ + colladadom + + license + scea + license_file + LICENSES/scea.txt + name + colladadom + platforms + + darwin + + archive + + hash + 86de85fa85aa58b5ee550a6a3c77a7d3 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/colladadom-2.1-darwin-20101117.tar.bz2 + + name + darwin + + linux + + archive + + hash + e515afc3fa4dcb00d9fb06fbb6343669 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/colladadom-2.1-linux-20101102.tar.bz2 + + name + linux + + windows + + archive + + hash + c1e79c9d3084727be35ce140db87717e + url + http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/colladadom-2.1-windows-20110223.tar.bz2 + + name + windows + + + curl license @@ -615,42 +711,6 @@ - google-perftools - - license - bsd - license_file - LICENSES/google-perftools.txt - name - google-perftools - platforms - - linux - - archive - - hash - cf513fc2eec4a414cc804cf408932a45 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_perftools-1.7-linux-20110315.tar.bz2 - - name - linux - - windows - - archive - - hash - 8108bffe1c814be9d035b47dac3d4541 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google-perftools-1.0-windows-20101001b.tar.bz2 - - name - windows - - - google_breakpad license @@ -1047,6 +1107,102 @@ + llconvexdecomposition + + license + havok + license_file + on_file + name + llconvexdecomposition + platforms + + darwin + + archive + + hash + 47ef880db4aea1a9561194c54fc28433 + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llconvexdecomposition-0.3-darwin-20101222.tar.bz2 + + name + darwin + + linux + + archive + + hash + f63424076d4fadd133950af0cf9c3564 + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llconvexdecomposition-0.3-linux-20101222.tar.bz2 + + name + linux + + windows + + archive + + hash + 5ae8bab01189c5dbbc6f383c751e031a + url + scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llconvexdecomposition-0.3-windows-20101222.tar.bz2 + + name + windows + + + + llconvexdecompositionstub + + license + lgpl + license_file + LICENSES/lgpl.txt + name + llconvexdecompositionstub + platforms + + darwin + + archive + + hash + 349fa0e287fb275bbee43ced194a1db1 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-darwin-20101015.tar.bz2 + + name + darwin + + linux + + archive + + hash + dbf4b15e74ce9042e8500720dffc461a + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-linux-20101015a.tar.bz2 + + name + linux + + windows + + archive + + hash + bba9a4dd04fda1b263f34448a044783b + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-windows-20101015.tar.bz2 + + name + windows + + + llqtwebkit license @@ -1351,6 +1507,42 @@ + pcre + + license + bsd + license_file + LICENSES/bsd.txt + name + pcre + platforms + + darwin + + archive + + hash + ef430ae3b9cdba518ad9952e99b12367 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pcre-7.6-darwin-20101102.tar.bz2 + + name + darwin + + linux + + archive + + hash + 86195b0680604fe86cfbbfb921c31dff + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pcre-7.6-linux-20101029.tar.bz2 + + name + linux + + + pth license @@ -1447,6 +1639,42 @@ + tcmalloc + + license + bsd + license_file + LICENSES/google-perftools.txt + name + google-perftools + platforms + + linux + + archive + + hash + cf513fc2eec4a414cc804cf408932a45 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_perftools-1.7-linux-20110315.tar.bz2 + + name + linux + + windows + + archive + + hash + 8108bffe1c814be9d035b47dac3d4541 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google-perftools-1.0-windows-20101001b.tar.bz2 + + name + windows + + + tut license @@ -1740,8 +1968,7 @@ name Release - - VCexpressRelWithDebInfo + VC10msbuildRelWithDebInfo configure @@ -1760,11 +1987,9 @@ name - VCexpressRelWithDebInfo + VC10msbuildRelWithDebInfo - - - VC10msbuildRelWithDebInfo + VC10msbuildRelease configure @@ -1776,18 +2001,16 @@ cmake options - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -DCMAKE_BUILD_TYPE:STRING=Release -DUNATTENDED:BOOL=OFF -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife name - VC10msbuildRelWithDebInfo + VC10msbuildRelease - - - VC10msbuildRelease + VCexpressRelWithDebInfo configure @@ -1799,16 +2022,15 @@ cmake options - -DCMAKE_BUILD_TYPE:STRING=Release + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DUNATTENDED:BOOL=OFF -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife name - VC10msbuildRelease + VCexpressRelWithDebInfo - name common @@ -2752,21 +2974,21 @@ name Release - - VCexpressRelWithDebInfo + VC10msbuildRelWithDebInfo build - arguments - - "RelWithDebInfo|Win32" - command - vcbuild.exe + msbuild.exe options - /u SecondLife.sln + /verbosity:minimal + /t:build + /p:Configuration=RelWithDebInfo + /p:Platform=Win32 + /p:"VCBuildAdditionalOptions= /useenv" + /p:"VCBuildAdditionalOptions= /incremental" configure @@ -2781,11 +3003,9 @@ name - VCexpressRelWithDebInfo + VC10msbuildRelWithDebInfo - - - VC10msbuildRelWithDebInfo + VC10msbuildRelease build @@ -2794,13 +3014,12 @@ options SecondLife.sln - /verbosity:minimal /t:build - /p:Configuration=RelWithDebInfo + /p:Configuration=Release /p:Platform=Win32 /p:"VCBuildAdditionalOptions= /useenv" /p:"VCBuildAdditionalOptions= /incremental" - + configure @@ -2814,25 +3033,23 @@ name - VC10msbuildRelWithDebInfo + VC10msbuildRelease - - - VC10msbuildRelease + VCexpressRelWithDebInfo build + arguments + + "RelWithDebInfo|Win32" + command - msbuild.exe + vcbuild.exe options + /u SecondLife.sln - /t:build - /p:Configuration=Release - /p:Platform=Win32 - /p:"VCBuildAdditionalOptions= /useenv" - /p:"VCBuildAdditionalOptions= /incremental" - + configure @@ -2846,9 +3063,8 @@ name - VC10msbuildRelease + VCexpressRelWithDebInfo - name windows -- cgit v1.3 From a738dcaa8b3d25a0c2ed0c7dc65c06ce16a69176 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Wed, 6 Apr 2011 13:52:42 -0400 Subject: tcmalloc rename --- autobuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index ec5d7d51ac..257eb6ec00 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1646,7 +1646,7 @@ license_file LICENSES/google-perftools.txt name - google-perftools + tcmalloc platforms linux -- cgit v1.3 From 1e1fde5eb15c08fb664bd2f6a6f3176e7968b475 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 6 Apr 2011 14:45:27 -0500 Subject: OPEN-58 Ditch GL package for glext.h package since glut.h isn't used anywhere. Probably don't need glext headers for mac or linux as they come in with system updates. --- autobuild.xml | 36 ++++++------------------------------ indra/cmake/OpenGL.cmake | 3 +-- 2 files changed, 7 insertions(+), 32 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index ec5d7d51ac..38a6d105b2 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3,48 +3,24 @@ installables - GL + glext license - GL + glext license_file - LICENSES/GL.txt + LICENSES/glext.txt name - GL + glext platforms - darwin - - archive - - hash - 0b7c1d43dc2b39301fef6c05948fb826 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-darwin-20101004.tar.bz2 - - name - darwin - - linux - - archive - - hash - d85d88088360aee5b67105ad93b5ad16 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-linux-20100929.tar.bz2 - - name - linux - windows archive hash - f8d98cbe78d5aafbc7aaabf840325aaf + 5de58ca0fe19abf68b25956762ee0d29 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-0.0.0-windows-20110303.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glext-68-windows-20110406.tar.bz2 name windows diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake index 661666f00d..0a3dd976b4 100644 --- a/indra/cmake/OpenGL.cmake +++ b/indra/cmake/OpenGL.cmake @@ -2,8 +2,7 @@ include(Prebuilt) if (NOT STANDALONE) - use_prebuilt_binary(GL) - # possible glh_linear should have its own .cmake file instead + use_prebuilt_binary(glext) use_prebuilt_binary(glh_linear) set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) endif (NOT STANDALONE) -- cgit v1.3 From 3e5961d1830163a23ac6e813b348e7f50967419a Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 6 Apr 2011 15:54:27 -0400 Subject: Updated llconvexdecomposition library build --- autobuild.xml | 12 ++++++------ indra/cmake/Python.cmake | 0 2 files changed, 6 insertions(+), 6 deletions(-) mode change 100644 => 100755 indra/cmake/Python.cmake (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index ec5d7d51ac..65360f1526 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1122,9 +1122,9 @@ archive hash - 47ef880db4aea1a9561194c54fc28433 + 3057f3978dff2b8e1216a19c2fa56604 url - scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llconvexdecomposition-0.3-darwin-20101222.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition-vir/rev/225838/arch/Darwin/installer/llconvexdecomposition-0.1-darwin-20110406.tar.bz2 name darwin @@ -1134,9 +1134,9 @@ archive hash - f63424076d4fadd133950af0cf9c3564 + e92c9d621b034b1bf312c60df48fc798 url - scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llconvexdecomposition-0.3-linux-20101222.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition-vir/rev/225838/arch/Linux/installer/llconvexdecomposition-0.1-linux-20110406.tar.bz2 name linux @@ -1146,9 +1146,9 @@ archive hash - 5ae8bab01189c5dbbc6f383c751e031a + d8ecfc647df41d546b1e8c697571e0ea url - scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llconvexdecomposition-0.3-windows-20101222.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition-vir/rev/225838/arch/CYGWIN/installer/llconvexdecomposition-0.1-windows-20110406.tar.bz2 name windows diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake old mode 100644 new mode 100755 -- cgit v1.3 From d490081fe29adabfd3a2dba81f5e65d90db3fb51 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 8 Apr 2011 17:12:26 -0400 Subject: changes for newer collada build --- autobuild.xml | 52 +++++++++++++++++++------------------- indra/cmake/Copy3rdPartyLibs.cmake | 4 +-- indra/cmake/LLPrimitive.cmake | 4 +-- indra/newview/CMakeLists.txt | 6 ++--- 4 files changed, 33 insertions(+), 33 deletions(-) mode change 100644 => 100755 indra/cmake/Copy3rdPartyLibs.cmake mode change 100644 => 100755 indra/cmake/LLPrimitive.cmake mode change 100644 => 100755 indra/newview/CMakeLists.txt (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index ee401cc63a..392cdbabea 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3,30 +3,6 @@ installables - glext - - license - glext - license_file - LICENSES/glext.txt - name - glext - platforms - - windows - - archive - - hash - 5de58ca0fe19abf68b25956762ee0d29 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glext-68-windows-20110406.tar.bz2 - - name - windows - - - GLOD license @@ -282,9 +258,9 @@ archive hash - c1e79c9d3084727be35ce140db87717e + 9667a5cde31fd8957e07b61f643d8404 url - http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/colladadom-2.1-windows-20110223.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226086/arch/CYGWIN/installer/colladadom-2.2-windows-20110408.tar.bz2 name windows @@ -603,6 +579,30 @@ + glext + + license + glext + license_file + LICENSES/glext.txt + name + glext + platforms + + windows + + archive + + hash + 5de58ca0fe19abf68b25956762ee0d29 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glext-68-windows-20110406.tar.bz2 + + name + windows + + + glh_linear license diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake old mode 100644 new mode 100755 index a301a8d6ba..d4c478c3c7 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -39,7 +39,7 @@ if(WINDOWS) libapriconv-1.dll ssleay32.dll libeay32.dll - libcollada14dom21-d.dll + libcollada14dom22-d.dll glod.dll ) @@ -51,7 +51,7 @@ if(WINDOWS) libapriconv-1.dll ssleay32.dll libeay32.dll - libcollada14dom21.dll + libcollada14dom22.dll glod.dll ) diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake old mode 100644 new mode 100755 index 4bdbfe46e2..4d6a84b29e --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -14,8 +14,8 @@ if (WINDOWS) set(LLPRIMITIVE_LIBRARIES debug llprimitive optimized llprimitive - debug libcollada14dom21-d - optimized libcollada14dom21 + debug libcollada14dom22-d + optimized libcollada14dom22 debug libboost_filesystem-d optimized libboost_filesystem debug libboost_system-d diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt old mode 100644 new mode 100755 index 3ed10c08ab..d70f3ec337 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1489,9 +1489,9 @@ if (WINDOWS) ${SHARED_LIB_STAGING_DIR}/Release/glod.dll ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/glod.dll ${SHARED_LIB_STAGING_DIR}/Debug/glod.dll - ${SHARED_LIB_STAGING_DIR}/Release/libcollada14dom21.dll - ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/libcollada14dom21.dll - ${SHARED_LIB_STAGING_DIR}/Debug/libcollada14dom21-d.dll + ${SHARED_LIB_STAGING_DIR}/Release/libcollada14dom22.dll + ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/libcollada14dom22.dll + ${SHARED_LIB_STAGING_DIR}/Debug/libcollada14dom22-d.dll ${SHARED_LIB_STAGING_DIR}/Release/openjpeg.dll ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/openjpeg.dll ${SHARED_LIB_STAGING_DIR}/Debug/openjpegd.dll -- cgit v1.3 From 0f245490a43544b1687558b070359ef85f15f9ab Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Fri, 8 Apr 2011 19:04:01 -0400 Subject: updating colladadom libraries to use the newly autobuilt versions. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 392cdbabea..8b94cf2077 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -234,9 +234,9 @@ archive hash - 86de85fa85aa58b5ee550a6a3c77a7d3 + 1bc84a4f4299365120914e3e4dcc5602 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/colladadom-2.1-darwin-20101117.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226114/arch/Darwin/installer/colladadom-2.2-darwin-20110408.tar.bz2 name darwin @@ -246,9 +246,9 @@ archive hash - e515afc3fa4dcb00d9fb06fbb6343669 + 07343df2fcfd6ae73c62bb4099061eb6 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/colladadom-2.1-linux-20101102.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226114/arch/Linux/installer/colladadom-2.2-linux-20110408.tar.bz2 name linux @@ -258,9 +258,9 @@ archive hash - 9667a5cde31fd8957e07b61f643d8404 + 10614d1b7857277ccf6d79e076e22f4c url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226086/arch/CYGWIN/installer/colladadom-2.2-windows-20110408.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226114/arch/CYGWIN/installer/colladadom-2.2-windows-20110408.tar.bz2 name windows -- cgit v1.3 From 235a4477abfb4875e5d08ce60251b389768319b7 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Fri, 8 Apr 2011 19:54:36 -0400 Subject: updating GLOD libraries to be 2010/autobuild compatible. Linux was manually built as our build machines are having difficulties building it. Will revisit this later. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 8b94cf2077..75b0c6823e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -18,9 +18,9 @@ archive hash - 3a7263246813ecf9aff5a240892f9641 + 1eea55da1625518390af4c315a0d43c3 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-darwin-20101007a.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/226145/arch/Darwin/installer/glod-1.0pre4-darwin-20110408.tar.bz2 name darwin @@ -30,9 +30,9 @@ archive hash - ca7368e9a1baf266b82d910fa8f821bd + 5aeb923a0a50023d0b3a6a8a81cc3d06 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-linux-20100920a.tar.bz2 + https://viewer-source-downloads.s3.amazonaws.com/install_pkgs/glod-1.0pre4-linux-20110408.tar.bz2 name linux @@ -42,9 +42,9 @@ archive hash - e40e1eac81dc57d8724f96fd977a3d58 + 7fd216bdcf9be961a78bfaef31a617f1 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-windows-20110330.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/226145/arch/CYGWIN/installer/glod-1.0pre4-windows-20110408.tar.bz2 name windows -- cgit v1.3 From a6d87cbfea7b70e88a4b875d7c9af320c6fe2948 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Fri, 8 Apr 2011 21:18:35 -0400 Subject: updated colladadom package with header files in the correct location. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 75b0c6823e..73a49d742d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -234,9 +234,9 @@ archive hash - 1bc84a4f4299365120914e3e4dcc5602 + d2b666a8eec1cadc81152ae94cad249f url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226114/arch/Darwin/installer/colladadom-2.2-darwin-20110408.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226180/arch/Darwin/installer/colladadom-2.2-darwin-20110408.tar.bz2 name darwin @@ -246,9 +246,9 @@ archive hash - 07343df2fcfd6ae73c62bb4099061eb6 + 414a7db51edbbb9e5fabb2dbea4c19a0 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226114/arch/Linux/installer/colladadom-2.2-linux-20110408.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226180/arch/Linux/installer/colladadom-2.2-linux-20110409.tar.bz2 name linux @@ -258,9 +258,9 @@ archive hash - 10614d1b7857277ccf6d79e076e22f4c + 7d8819dd334ccccc2b82747565fa6077 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226114/arch/CYGWIN/installer/colladadom-2.2-windows-20110408.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226180/arch/CYGWIN/installer/colladadom-2.2-windows-20110408.tar.bz2 name windows -- cgit v1.3 From 675e0cfd993ca6fab5843bf7ad0254e5e14254fc Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 11 Apr 2011 14:12:49 -0500 Subject: Use tcmalloc from 3p-google-perftools on windows --- autobuild.xml | 8 ++++---- scripts/messages/message_template.msg.sha1 | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 73a49d742d..d12bb1d3f7 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -42,9 +42,9 @@ archive hash - 7fd216bdcf9be961a78bfaef31a617f1 + c4ae6cddc04e0b2908a301726a53922c url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/226145/arch/CYGWIN/installer/glod-1.0pre4-windows-20110408.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/226194/arch/CYGWIN/installer/glod-1.0pre4-windows-20110408.tar.bz2 name windows @@ -1642,9 +1642,9 @@ archive hash - 8108bffe1c814be9d035b47dac3d4541 + 8308f7bd68bb7083655753b7abe7225f url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google-perftools-1.0-windows-20101001b.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226287/arch/CYGWIN/installer/google_perftools-1.7-windows-20110411.tar.bz2 name windows diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1 index 41e70011af..6486d92851 100644 --- a/scripts/messages/message_template.msg.sha1 +++ b/scripts/messages/message_template.msg.sha1 @@ -1 +1 @@ -ce3be58f4ea395c272fcfa3e6b6dad027c188e0d \ No newline at end of file +465164e1a07f63d68c4ad1f00c19805dfb6ee2d7 \ No newline at end of file -- cgit v1.3 From b13b6ef014c251b77a42e40c3fa08ccd05326f16 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Tue, 12 Apr 2011 12:07:45 -0500 Subject: New tcmalloc. --- autobuild.xml | 8 ++++---- indra/llmath/lloctree.h | 10 +--------- 2 files changed, 5 insertions(+), 13 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index d12bb1d3f7..fee61b7f2d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1630,9 +1630,9 @@ archive hash - cf513fc2eec4a414cc804cf408932a45 + e2e260409cbd9ac95bfbce929d88accb url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_perftools-1.7-linux-20110315.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226424/arch/Linux/installer/google_perftools-1.7-linux-20110412.tar.bz2 name linux @@ -1642,9 +1642,9 @@ archive hash - 8308f7bd68bb7083655753b7abe7225f + f68604547012e92db912b324c69fbeac url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226287/arch/CYGWIN/installer/google_perftools-1.7-windows-20110411.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226424/arch/CYGWIN/installer/google_perftools-1.7-windows-20110412.tar.bz2 name windows diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h index fdfc24f8b7..49e84cf1b4 100644 --- a/indra/llmath/lloctree.h +++ b/indra/llmath/lloctree.h @@ -580,19 +580,11 @@ public: } protected: - typedef enum - { - CENTER = 0, - SIZE = 1, - MAX = 2, - MIN = 3 - } eDName; - LLVector4a mCenter; LLVector4a mSize; LLVector4a mMax; LLVector4a mMin; - + oct_node* mParent; U8 mOctant; -- cgit v1.3 From 2027eb8c2bfdc7952fc613f0642192e0c807ec07 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Tue, 12 Apr 2011 12:27:03 -0500 Subject: Backed out changeset: c5a0cc9abf49 --- autobuild.xml | 8 ++++---- indra/llmath/lloctree.h | 10 +++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index fee61b7f2d..d12bb1d3f7 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1630,9 +1630,9 @@ archive hash - e2e260409cbd9ac95bfbce929d88accb + cf513fc2eec4a414cc804cf408932a45 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226424/arch/Linux/installer/google_perftools-1.7-linux-20110412.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_perftools-1.7-linux-20110315.tar.bz2 name linux @@ -1642,9 +1642,9 @@ archive hash - f68604547012e92db912b324c69fbeac + 8308f7bd68bb7083655753b7abe7225f url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226424/arch/CYGWIN/installer/google_perftools-1.7-windows-20110412.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226287/arch/CYGWIN/installer/google_perftools-1.7-windows-20110411.tar.bz2 name windows diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h index 49e84cf1b4..fdfc24f8b7 100644 --- a/indra/llmath/lloctree.h +++ b/indra/llmath/lloctree.h @@ -580,11 +580,19 @@ public: } protected: + typedef enum + { + CENTER = 0, + SIZE = 1, + MAX = 2, + MIN = 3 + } eDName; + LLVector4a mCenter; LLVector4a mSize; LLVector4a mMax; LLVector4a mMin; - + oct_node* mParent; U8 mOctant; -- cgit v1.3 From e0c509d4634960ba33be3ce744110934b381ba4d Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 12 Apr 2011 14:39:31 -0400 Subject: updated builds used for pcre, collada on mac --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index d12bb1d3f7..43d297df6d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -234,9 +234,9 @@ archive hash - d2b666a8eec1cadc81152ae94cad249f + cb307f03a17941333bee13495450107c url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226180/arch/Darwin/installer/colladadom-2.2-darwin-20110408.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226422/arch/Darwin/installer/colladadom-2.2-darwin-20110412.tar.bz2 name darwin @@ -1498,9 +1498,9 @@ archive hash - ef430ae3b9cdba518ad9952e99b12367 + cb04654cdfe93e3c8d16fef0c475e2bb url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pcre-7.6-darwin-20101102.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-pcre/rev/226370/arch/Darwin/installer/pcre-7.6-darwin-20110411.tar.bz2 name darwin -- cgit v1.3 From 12f9f521ee6baeb39b403dfe15168de7ecfd9349 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 13 Apr 2011 13:43:32 -0500 Subject: Fix for bad default setting and libpng using /GL --- autobuild.xml | 4 ++-- indra/newview/app_settings/settings.xml | 2 +- indra/newview/llpolymesh.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 43d297df6d..03db2f8d49 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1026,9 +1026,9 @@ archive hash - 735a955e6442733e2342ab12c1087488 + f194ba857ca8dd86483a3ef24535d0db url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.5.1-windows-20110221.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libpng/rev/226532/arch/CYGWIN/installer/libpng-1.5.1-windows-20110413.tar.bz2 name windows diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 37a9c7304d..73f63458a3 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7178,7 +7178,7 @@ Type Boolean Value - 1.0 + 0 RenderLocalLights diff --git a/indra/newview/llpolymesh.cpp b/indra/newview/llpolymesh.cpp index 24f84b2ddf..4b2c569cc3 100644 --- a/indra/newview/llpolymesh.cpp +++ b/indra/newview/llpolymesh.cpp @@ -768,9 +768,9 @@ LLPolyMesh::LLPolyMesh(LLPolyMeshSharedData *shared_data, LLPolyMesh *reference_ // Allocate memory without initializing every vector // NOTE: This makes asusmptions about the size of LLVector[234] int nverts = mSharedData->mNumVertices; - int nfloats = nverts * (2*4 + 3*3 + 2 + 4); - //use 16 byte aligned vertex data to make LLPolyMesh SSE friendly - mVertexData = (F32*) malloc(nfloats*4); + int nfloats = nverts * (2*4 + 3*3 + 2 + 4); + //use 16 byte aligned vertex data to make LLPolyMesh SSE friendly + mVertexData = (F32*) malloc(nfloats*4); int offset = 0; mCoords = (LLVector4*)(mVertexData + offset); offset += 4*nverts; mNormals = (LLVector4*)(mVertexData + offset); offset += 4*nverts; -- cgit v1.3 From 7b62a960d102a3e48cd3f21d000f6789b224ae85 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 13 Apr 2011 16:50:11 -0400 Subject: merge --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 03db2f8d49..e1e009ab59 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -234,9 +234,9 @@ archive hash - cb307f03a17941333bee13495450107c + 4d07ad210dbf4532e145206bd8e89a18 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226422/arch/Darwin/installer/colladadom-2.2-darwin-20110412.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226539/arch/Darwin/installer/colladadom-2.2-darwin-20110413.tar.bz2 name darwin -- cgit v1.3 From 6db302578a40bba7eaca9f4f22bb7215b77fdc3a Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 13 Apr 2011 16:58:04 -0400 Subject: newer glod, colladadom builds on mac --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index e1e009ab59..46b1fa2ff6 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -18,9 +18,9 @@ archive hash - 1eea55da1625518390af4c315a0d43c3 + 7c546f54f6ed654f713c778af3925dd4 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/226145/arch/Darwin/installer/glod-1.0pre4-darwin-20110408.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/226566/arch/Darwin/installer/glod-1.0pre4-darwin-20110413.tar.bz2 name darwin @@ -234,9 +234,9 @@ archive hash - 4d07ad210dbf4532e145206bd8e89a18 + cff08178fc9720ab37646e142edeaa6d url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226539/arch/Darwin/installer/colladadom-2.2-darwin-20110413.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226567/arch/Darwin/installer/colladadom-2.2-darwin-20110413.tar.bz2 name darwin -- cgit v1.3 From bf366253328846b60dbe85c49de08dbab96d741f Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 13 Apr 2011 16:33:41 -0500 Subject: Fix for bad fmod URL's --- autobuild.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 03db2f8d49..9b035eea66 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -452,7 +452,7 @@ hash 61ead113e6479452e6b690c84b4e9d30 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/fmod-3.75-darwin-20110222.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmod-private/rev/221852/arch/Darwin/installer/fmod-3.75-darwin-20110222.tar.bz2 name darwin @@ -464,7 +464,7 @@ hash 0c61d643db54d2e5999be8254569d8b3 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/fmod-3.75-linux-20110223.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmod-private/rev/221852/arch/Linux/installer/fmod-3.75-linux-20110223.tar.bz2 name linux @@ -476,7 +476,7 @@ hash d9a9a6ad86895353bcd63374a4c1a91d url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/fmod-3.75-windows-20110222.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmod-private/rev/221852/arch/CYGWIN/installer/fmod-3.75-windows-20110222.tar.bz2 name windows -- cgit v1.3 From dbb7cd6910f382eece23321ad4521ea015afe014 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 13 Apr 2011 16:40:20 -0500 Subject: Fix for bad kdu URLs --- autobuild.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index eb8f57e467..d1066d473e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -956,7 +956,7 @@ hash d91e1f483209cd3eba04135c6a59e829 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/kdu-6.4.1-darwin-20110218.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-kdu-private/rev/221672/arch/Darwin/installer/kdu-6.4.1-darwin-20110218.tar.bz2 name darwin @@ -968,7 +968,7 @@ hash fbf8a4f78dff986d7c16b3a0437e033e url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/kdu-6.4.1-linux-20110311.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-kdu-private/rev/223538/arch/Linux/installer/kdu-6.4.1-linux-20110311.tar.bz2 name linux @@ -980,7 +980,7 @@ hash 6cd9f36465ef73a3df34bf2b3bba2ced url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/kdu-6.4.1-windows-20110218.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-kdu-private/rev/221672/arch/CYGWIN/installer/kdu-6.4.1-windows-20110218.tar.bz2 name windows -- cgit v1.3 From 7dfa297be16716f637f8aaaf5ea53f1a2baf09bc Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 13 Apr 2011 18:08:21 -0600 Subject: update to use the latest collada lib, which is built on the 32bit pcre lib. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index d1066d473e..3d5460733d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -234,9 +234,9 @@ archive hash - cff08178fc9720ab37646e142edeaa6d + 2222b901f310c1806847293789d69ac7 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226567/arch/Darwin/installer/colladadom-2.2-darwin-20110413.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226584/arch/Darwin/installer/colladadom-2.2-darwin-20110413.tar.bz2 name darwin @@ -246,9 +246,9 @@ archive hash - 414a7db51edbbb9e5fabb2dbea4c19a0 + fb9765a9774b80e57f841dfad3438b1e url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226180/arch/Linux/installer/colladadom-2.2-linux-20110409.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226584/arch/Linux/installer/colladadom-2.2-linux-20110413.tar.bz2 name linux @@ -258,9 +258,9 @@ archive hash - 7d8819dd334ccccc2b82747565fa6077 + a9f548eb6f9aaf292508a8b09c7f2f73 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226180/arch/CYGWIN/installer/colladadom-2.2-windows-20110408.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226584/arch/CYGWIN/installer/colladadom-2.2-windows-20110413.tar.bz2 name windows -- cgit v1.3 From b4b3c4f763bb3d39c91fbabb5d1a9cb2f178aa1a Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 14 Apr 2011 11:56:33 -0500 Subject: Include glext headers on linux. --- autobuild.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 3d5460733d..841c546ae7 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -601,6 +601,18 @@ name windows + linux + + archive + + hash + 5de58ca0fe19abf68b25956762ee0d29 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glext-68-windows-20110406.tar.bz2 + + name + windows + glh_linear -- cgit v1.3 From 4d395e9e625c4a65bc30550d921e15c54e3445f3 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 14 Apr 2011 12:22:01 -0500 Subject: Linux not windows (whoops) --- autobuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 841c546ae7..d68b8270bc 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -611,7 +611,7 @@ http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glext-68-windows-20110406.tar.bz2 name - windows + linux -- cgit v1.3 From 4f3b3abb87acff98d05a7312c07689a8c8de62e8 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 14 Apr 2011 12:36:30 -0500 Subject: autobuild doesn't like comments? --- autobuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index d68b8270bc..d1bba181f1 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -607,7 +607,7 @@ hash 5de58ca0fe19abf68b25956762ee0d29 - url + url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glext-68-windows-20110406.tar.bz2 name -- cgit v1.3 From 6ec5e332fb0830559a4c335619cc77e64db15fc4 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 14 Apr 2011 13:24:21 -0500 Subject: Linux build should use 3p-google-perftools build result --- BuildParams | 1 + autobuild.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/BuildParams b/BuildParams index 9a5a6bdf41..c0edb35b09 100755 --- a/BuildParams +++ b/BuildParams @@ -94,6 +94,7 @@ mesh-development.viewer_channel = "Project Viewer - Mesh" mesh-development.login_channel = "Project Viewer - Mesh" mesh-development.viewer_grid = aditi mesh-development.build_debug_release_separately = true +mesh-development.build_CYGWIN_Debug = false mesh-development.build_viewer_update_version_manager = false # ======================================== diff --git a/autobuild.xml b/autobuild.xml index d1bba181f1..28222c8e61 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1642,9 +1642,9 @@ archive hash - cf513fc2eec4a414cc804cf408932a45 + dde928cb24d22a267004a8c17669ba65 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_perftools-1.7-linux-20110315.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226426/arch/Linux/installer/google_perftools-1.7-linux-20110412.tar.bz2 name linux -- cgit v1.3 From 77575dae62772e3de4edfb98ca3e3328ea2dc6db Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Thu, 14 Apr 2011 14:43:56 -0600 Subject: update to use 32-bit pcre lib for linux. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 28222c8e61..413d4576ae 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1522,9 +1522,9 @@ archive hash - 86195b0680604fe86cfbbfb921c31dff + 18854c815c6f960e22add25cf1ff93d4 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pcre-7.6-linux-20101029.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-pcre/rev/226572/arch/Linux/installer/pcre-7.6-linux-20110413.tar.bz2 name linux -- cgit v1.3 From 6b49a5f67cce5e08009387e62ffe778709e2cbbf Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Thu, 14 Apr 2011 15:18:49 -0600 Subject: update to the latest glod lib for linux. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 413d4576ae..c36de32dcc 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -30,9 +30,9 @@ archive hash - 5aeb923a0a50023d0b3a6a8a81cc3d06 + f09061c7eabcf701b79c883027376ef2 url - https://viewer-source-downloads.s3.amazonaws.com/install_pkgs/glod-1.0pre4-linux-20110408.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/226566/arch/Linux/installer/glod-1.0pre4-linux-20110413.tar.bz2 name linux -- cgit v1.3 From ed2f4797da8a0437c46b26bc213838ef9fa19be8 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Thu, 14 Apr 2011 17:19:25 -0600 Subject: update linux glod lib to change 226657. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index c36de32dcc..4e36c1e4d6 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -30,9 +30,9 @@ archive hash - f09061c7eabcf701b79c883027376ef2 + 18c708163d2a669bc3c030b05b4ebe61 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/226566/arch/Linux/installer/glod-1.0pre4-linux-20110413.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/226657/arch/Linux/installer/glod-1.0pre4-linux-20110414.tar.bz2 name linux -- cgit v1.3 From a0359e324130330d72f985ba8804034cf88d4931 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 15 Apr 2011 10:34:23 -0400 Subject: updated to new llconvexdecomposition build (now with 100% more vs2010) --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index d1bba181f1..a3ea3e9563 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -589,7 +589,7 @@ glext platforms - windows + linux archive @@ -599,9 +599,9 @@ http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glext-68-windows-20110406.tar.bz2 name - windows + linux - linux + windows archive @@ -611,7 +611,7 @@ http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glext-68-windows-20110406.tar.bz2 name - linux + windows @@ -1134,9 +1134,9 @@ archive hash - d8ecfc647df41d546b1e8c697571e0ea + 1447d72644ad74e74a057483b33dc0d2 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition-vir/rev/225838/arch/CYGWIN/installer/llconvexdecomposition-0.1-windows-20110406.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition-vir/rev/226659/arch/CYGWIN/installer/llconvexdecomposition-0.1-windows-20110414.tar.bz2 name windows -- cgit v1.3 From fcfb70f01d46e5a7f7716c81ce7ad9667a99e3ed Mon Sep 17 00:00:00 2001 From: prep linden Date: Fri, 15 Apr 2011 10:47:44 -0400 Subject: License update --- autobuild.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index d12bb1d3f7..8b3f824d39 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -224,7 +224,7 @@ license scea license_file - LICENSES/scea.txt + LICENSES/collada.txt name colladadom platforms @@ -740,7 +740,7 @@ license bsd license_file - LICENSES/gmock.txt + LICENSES/googlemock.txt name googlemock platforms @@ -1488,7 +1488,7 @@ license bsd license_file - LICENSES/bsd.txt + LICENSES/pcre-license.txt name pcre platforms -- cgit v1.3 From 298d71b4d9896de9a55a895b7afef307e69a2edc Mon Sep 17 00:00:00 2001 From: prep linden Date: Fri, 15 Apr 2011 11:02:57 -0400 Subject: License update --- autobuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index ee6737db8b..4020410b0c 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -824,7 +824,7 @@ license lgpl license_file - LICENSES/gtk.txt + LICENSES/gtk-atk-pango-glib.txt name gtk-atk-pango-glib platforms -- cgit v1.3 From c81ae1a3fa0021b7452d70171d5b6939e8b9e309 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 15 Apr 2011 11:04:09 -0400 Subject: removed separate stub lib, since llconvexdecomposition is going public and includes the stub --- autobuild.xml | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) mode change 100644 => 100755 autobuild.xml (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml old mode 100644 new mode 100755 index fabf646c74..709ffc859d --- a/autobuild.xml +++ b/autobuild.xml @@ -1143,54 +1143,6 @@ - llconvexdecompositionstub - - license - lgpl - license_file - LICENSES/lgpl.txt - name - llconvexdecompositionstub - platforms - - darwin - - archive - - hash - 349fa0e287fb275bbee43ced194a1db1 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-darwin-20101015.tar.bz2 - - name - darwin - - linux - - archive - - hash - dbf4b15e74ce9042e8500720dffc461a - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-linux-20101015a.tar.bz2 - - name - linux - - windows - - archive - - hash - bba9a4dd04fda1b263f34448a044783b - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-windows-20101015.tar.bz2 - - name - windows - - - llqtwebkit license -- cgit v1.3 From f9f84794726ad9a62d1f9750226cab964199fff2 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Fri, 15 Apr 2011 14:25:32 -0600 Subject: update collada lib for linux to 226716 --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 4e36c1e4d6..ea6e1cf655 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -246,9 +246,9 @@ archive hash - fb9765a9774b80e57f841dfad3438b1e + d05be8fc196e9ce7b6636b931cf13dff url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226584/arch/Linux/installer/colladadom-2.2-linux-20110413.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226716/arch/Linux/installer/colladadom-2.2-linux-20110415.tar.bz2 name linux -- cgit v1.3 From b6ae8b1156923f3c4d96ffdf96dc881ac4e63be0 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 15 Apr 2011 17:12:07 -0400 Subject: moved to public llconvexdecomposition builds --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 93e1684481..2c2ac0ce2c 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1110,9 +1110,9 @@ archive hash - 3057f3978dff2b8e1216a19c2fa56604 + bfa0e1ce006302f6d90b712b20e2d96e url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition-vir/rev/225838/arch/Darwin/installer/llconvexdecomposition-0.1-darwin-20110406.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecomposition/rev/226714/arch/Darwin/installer/llconvexdecomposition-0.1-darwin-20110415.tar.bz2 name darwin @@ -1122,9 +1122,9 @@ archive hash - e92c9d621b034b1bf312c60df48fc798 + d6207290496f4b464996924b6319932e url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition-vir/rev/225838/arch/Linux/installer/llconvexdecomposition-0.1-linux-20110406.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecomposition/rev/226714/arch/Linux/installer/llconvexdecomposition-0.1-linux-20110415.tar.bz2 name linux @@ -1134,9 +1134,9 @@ archive hash - 1447d72644ad74e74a057483b33dc0d2 + 9f8579663eeac8ed5cfc6390560f0e24 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition-vir/rev/226659/arch/CYGWIN/installer/llconvexdecomposition-0.1-windows-20110414.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecomposition/rev/226714/arch/CYGWIN/installer/llconvexdecomposition-0.1-windows-20110415.tar.bz2 name windows -- cgit v1.3 From a357815604757eede6489ae81387abe5d866d7cf Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 20 Apr 2011 18:10:33 -0600 Subject: update the collada lib of Mac to the rev 227230 to fix the missed minizip problem. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index c79701adfd..7d63aa9209 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -234,9 +234,9 @@ archive hash - 2222b901f310c1806847293789d69ac7 + 480b27a0cb39a4adfcdeabef895de3e1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226584/arch/Darwin/installer/colladadom-2.2-darwin-20110413.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/227230/arch/Darwin/installer/colladadom-2.2-darwin-20110420.tar.bz2 name darwin -- cgit v1.3 From 58b48137ca1f414286836d567b9f0651880c5995 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 21 Apr 2011 16:35:09 -0500 Subject: Touch up autobuild xml from merge. --- autobuild.xml | 1464 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 715 insertions(+), 749 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 83405a8e0a..5fdd0a7f3b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1736,771 +1736,737 @@ - package_description + package_description + + name + viewer_development + platforms - name - viewer_development - platforms + common - common + configurations - configurations - - Debug - - build - - - configure - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=Debug - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - - - name - Debug - - DebugOS - - configure - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=Debug - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - -DINSTALL_PROPRIETARY=FALSE - - arguments - - ../indra - - - name - DebugOS - - RelWithDebInfo - - build - - - configure - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - - - name - RelWithDebInfo - - RelWithDebInfoOS - - configure - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - -DINSTALL_PROPRIETARY=FALSE - - arguments - - ../indra - - - name - RelWithDebInfoOS - - Release - - build - - - configure - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=Release - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - -DINSTALL_PROPRIETARY=FALSE - -DUSE_PRECOMPILED_HEADERS=ON - -DLL_RELEASE_FOR_DOWNLOAD:BOOL=TRUE - - - name - Release - - VC10msbuildRelWithDebInfo - - configure - - arguments - - ../indra - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo - -DUNATTENDED:BOOL=OFF - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - - - name - VC10msbuildRelWithDebInfo - - VC10msbuildRelease - - configure - - arguments - - ../indra - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=Release - -DINSTALL_PROPRIETARY=FALSE - -DLL_RELEASE_FOR_DOWNLOAD:BOOL=YES - - name - VC10msbuildRelease - - VCexpressRelWithDebInfo - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo - VCexpressRelWithDebInfo - - name - common + Debug + + build + + + configure + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=Debug + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + Debug + + DebugOS + + configure + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=Debug + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + -DINSTALL_PROPRIETARY=FALSE + + arguments + + ../indra + + + name + DebugOS + + RelWithDebInfo + + build + + + configure + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + RelWithDebInfo + + RelWithDebInfoOS + + configure + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + -DINSTALL_PROPRIETARY=FALSE + + arguments + + ../indra + + + name + RelWithDebInfoOS + + Release + + build + + + configure + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=Release + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + -DINSTALL_PROPRIETARY=FALSE + -DUSE_PRECOMPILED_HEADERS=ON + -DLL_RELEASE_FOR_DOWNLOAD:BOOL=TRUE + + + name + Release + + ReleaseOS + + configure + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=Release + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + -DINSTALL_PROPRIETARY=FALSE + -DLL_RELEASE_FOR_DOWNLOAD:BOOL=YES + + arguments + + ../indra + + + name + ReleaseOS + - darwin + name + common + + darwin + + build_directory + build-darwin-i386 + configurations - build_directory - build-darwin-i386 - configurations - - Debug - - build - - arguments - - | - grep - -v - setenv - - command - xcodebuild - options - - -configuration Debug - -project SecondLife.xcodeproj - - - configure - - arguments - - ../indra - - options - - -G - 'Xcode' - - - name - Debug - - DebugOS - - build - - command - xcodebuild - options - - -configuration Debug - -project SecondLife.xcodeproj - - - configure - - options - - -G - 'Xcode' - - - name - DebugOS - - RelWithDebInfo - - build - - arguments - - | - grep - -v - setenv - - command - xcodebuild - options - - -configuration RelWithDebInfo - -project SecondLife.xcodeproj - - - configure - - arguments - - ../indra - - options - - -G - 'Xcode' - - - default - True - name - RelWithDebInfo - - RelWithDebInfoOS - - build - - command - xcodebuild - options - - -configuration RelWithDebInfo - -project SecondLife.xcodeproj - - - configure - - options - - -G - 'Xcode' - - - name - RelWithDebInfoOS - - Release - - build - - arguments - - | - grep - -v - setenv - - command - xcodebuild - options - - -configuration Release - -project SecondLife.xcodeproj - - - configure - - arguments - - ../indra - - options - - -G - 'Xcode' - - - name - Release - - ReleaseOS - - build - - command - xcodebuild - options - - -configuration Release - -project SecondLife.xcodeproj - - - configure - - options - - -G - 'Xcode' - - - name - ReleaseOS - - - name - darwin + Debug + + build + + arguments + + | + grep + -v + setenv + + command + xcodebuild + options + + -configuration Debug + -project SecondLife.xcodeproj + + + configure + + arguments + + ../indra + + options + + -G + 'Xcode' + + + name + Debug + + DebugOS + + build + + command + xcodebuild + options + + -configuration Debug + -project SecondLife.xcodeproj + + + configure + + options + + -G + 'Xcode' + + + name + DebugOS + + RelWithDebInfo + + build + + arguments + + | + grep + -v + setenv + + command + xcodebuild + options + + -configuration RelWithDebInfo + -project SecondLife.xcodeproj + + + configure + + arguments + + ../indra + + options + + -G + 'Xcode' + + + default + True + name + RelWithDebInfo + + RelWithDebInfoOS + + build + + command + xcodebuild + options + + -configuration RelWithDebInfo + -project SecondLife.xcodeproj + + + configure + + options + + -G + 'Xcode' + + + name + RelWithDebInfoOS + + Release + + build + + arguments + + | + grep + -v + setenv + + command + xcodebuild + options + + -configuration Release + -project SecondLife.xcodeproj + + + configure + + arguments + + ../indra + + options + + -G + 'Xcode' + + + name + Release + + ReleaseOS + + build + + command + xcodebuild + options + + -configuration Release + -project SecondLife.xcodeproj + + + configure + + options + + -G + 'Xcode' + + + name + ReleaseOS + - linux + name + darwin + + linux + + build_directory + build-linux-i686 + configurations - build_directory - build-linux-i686 - configurations - - Debug - - build - - command - make - options - - -j 12 - - - configure - - arguments - - ../indra - - options - - -G - 'Unix Makefiles' - - - name - Debug - - DebugOS - - build - - command - make - options - - -j 2 - - - configure - - options - - -G - 'Unix Makefiles' - - - name - DebugOS - - RelWithDebInfo - - build - - command - make - options - - -j 12 - - - configure - - arguments - - ../indra - - options - - -G - 'Unix Makefiles' - - - default - True - name - RelWithDebInfo - - RelWithDebInfoOS - - build - - command - make - options - - -j 2 - - - configure - - options - - -G - 'Unix Makefiles' - - - name - RelWithDebInfoOS - - Release - - build - - command - make - options - - -j 12 - - - configure - - arguments - - ../indra - - options - - -G - 'Unix Makefiles' - - - name - Release - - ReleaseOS - - build - - command - make - options - - -j 2 - - - configure - - options - - -G - 'Unix Makefiles' - - - name - ReleaseOS + Debug + + build + + command + make + options + + -j 12 + + + configure + + arguments + + ../indra + + options + + -G + 'Unix Makefiles' + + + name + Debug + + DebugOS + + build + + command + make + options + + -j 2 + + + configure + + options + + -G + 'Unix Makefiles' + + + name + DebugOS + + RelWithDebInfo + + build + + command + make + options + + -j 12 + + + configure + + arguments + + ../indra + + options + + -G + 'Unix Makefiles' + default + True + name + RelWithDebInfo + + RelWithDebInfoOS + + build - build - - - name - default + command + make + options + + -j 2 + + configure + + options + + -G + 'Unix Makefiles' + + + name + RelWithDebInfoOS + + Release + + build + + command + make + options + + -j 12 + + + configure + + arguments + + ../indra + + options + + -G + 'Unix Makefiles' + + + name + Release + + ReleaseOS + + build + + command + make + options + + -j 2 + + + configure + + options + + -G + 'Unix Makefiles' + + + name + ReleaseOS + + default + + build + + + name + default - name - linux - windows + name + linux + + windows + + build_directory + build-vc100 + configurations - build_directory - build-vc100 - configurations - - Debug - - build - - arguments - - SecondLife.sln - - command - BuildConsole - options - - /build - "/cfg=Debug|Win32" - - - configure - - arguments - - ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution - SecondLife.sln - --config - Debug - --startup - secondlife-bin - - options - - -G - "Visual Studio 10" - - - name - Debug - - DebugOS - - build - - arguments - - SecondLife.sln - - command - msbuild.exe - options - - /p:Configuration=Debug - /p:Platform=Win32 - /t:Build - /p:useenv=true - /verbosity:minimal - /toolsversion:4.0 - /p:"VCBuildAdditionalOptions= /incremental" - - - configure - - options - - -G - "Visual Studio 10" - -DUNATTENDED:BOOL=ON - -DUSE_PRECOMPILED_HEADERS=ON - -DINSTALL_PROPRIETARY=TRUE - -DUSE_KDU=FALSE - -DFMOD=FALSE - - - name - DebugOS - - RelWithDebInfo - - build - - arguments - - SecondLife.sln - - command - BuildConsole - options - - /build - "/cfg=RelWithDebInfo|Win32" - - - configure - - arguments - - ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution - SecondLife.sln - --config - RelWithDebInfo - --startup - secondlife-bin - - options - - -G - "Visual Studio 10" - - - default - True - name - RelWithDebInfo - - RelWithDebInfoOS - - build - - arguments - - SecondLife.sln - - command - msbuild.exe - options - - /p:Configuration=RelWithDebInfo - /p:Platform=Win32 - /t:Build - /p:useenv=true - /verbosity:minimal - /toolsversion:4.0 - /p:"VCBuildAdditionalOptions= /incremental" - - - configure - - options - - -G - "Visual Studio 10" - -DUNATTENDED:BOOL=ON - -DUSE_PRECOMPILED_HEADERS=ON - -DINSTALL_PROPRIETARY=TRUE - -DUSE_KDU=FALSE - -DFMOD=FALSE - - - name - RelWithDebInfoOS - - Release - - build - - arguments - - SecondLife.sln - - command - BuildConsole - options - - /build - "/cfg=Release|Win32" - "/CL_ADD=/m:1" - - - configure - - arguments - - ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution - SecondLife.sln - --config - Release - --startup - secondlife-bin - - options - - -G - "Visual Studio 10" - - - name - Release - - VC10msbuildRelWithDebInfo - - build - - msbuild.exe - SecondLife.sln - /verbosity:minimal - /t:build - /p:Configuration=RelWithDebInfo - /p:Platform=Win32 - /p:"VCBuildAdditionalOptions= /useenv" - /p:"VCBuildAdditionalOptions= /incremental" - - VC10msbuildRelWithDebInfo - VC10msbuildRelease - command - msbuild.exe - options - - /p:Configuration=Release - - VC10msbuildRelease - VCexpressRelWithDebInfo - arguments - - "RelWithDebInfo|Win32" - - vcbuild.exe - /u - /p:useenv=true - /verbosity:minimal - /toolsversion:4.0 - - - configure - - options - - -G - "Visual Studio 10" - -DUNATTENDED:BOOL=ON - -DUSE_PRECOMPILED_HEADERS=ON - -DINSTALL_PROPRIETARY=TRUE - -DUSE_KDU=FALSE - -DFMOD=FALSE - - - name - VCexpressRelWithDebInfo - - - name - windows + Debug + + build + + arguments + + SecondLife.sln + + command + BuildConsole + options + + /build + "/cfg=Debug|Win32" + + + configure + + arguments + + ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + Debug + --startup + secondlife-bin + + options + + -G + "Visual Studio 10" + + + name + Debug + + DebugOS + + build + + arguments + + SecondLife.sln + + command + msbuild.exe + options + + /p:Configuration=Debug + /p:Platform=Win32 + /t:Build + /p:useenv=true + /verbosity:minimal + /toolsversion:4.0 + /p:"VCBuildAdditionalOptions= /incremental" + + + configure + + options + + -G + "Visual Studio 10" + -DUNATTENDED:BOOL=ON + -DUSE_PRECOMPILED_HEADERS=ON + -DINSTALL_PROPRIETARY=TRUE + -DUSE_KDU=FALSE + -DFMOD=FALSE + + + name + DebugOS + + RelWithDebInfo + + build + + arguments + + SecondLife.sln + + command + BuildConsole + options + + /build + "/cfg=RelWithDebInfo|Win32" + + + configure + + arguments + + ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + RelWithDebInfo + --startup + secondlife-bin + + options + + -G + "Visual Studio 10" + + + default + True + name + RelWithDebInfo + + RelWithDebInfoOS + + build + + arguments + + SecondLife.sln + + command + msbuild.exe + options + + /p:Configuration=RelWithDebInfo + /p:Platform=Win32 + /t:Build + /p:useenv=true + /verbosity:minimal + /toolsversion:4.0 + /p:"VCBuildAdditionalOptions= /incremental" + + + configure + + options + + -G + "Visual Studio 10" + -DUNATTENDED:BOOL=ON + -DUSE_PRECOMPILED_HEADERS=ON + -DINSTALL_PROPRIETARY=TRUE + -DUSE_KDU=FALSE + -DFMOD=FALSE + + + name + RelWithDebInfoOS + + Release + + build + + arguments + + SecondLife.sln + + command + BuildConsole + options + + /build + "/cfg=Release|Win32" + "/CL_ADD=/m:1" + + + configure + + arguments + + ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + Release + --startup + secondlife-bin + + options + + -G + "Visual Studio 10" + + + name + Release + + ReleaseOS + + build + + arguments + + SecondLife.sln + + command + msbuild.exe + options + + /p:Configuration=Release + /p:Platform=Win32 + /t:Build + /p:useenv=true + /verbosity:minimal + /toolsversion:4.0 + /p:"VCBuildAdditionalOptions= /incremental" + + + configure + + options + + -G + "Visual Studio 10" + -DUNATTENDED:BOOL=ON + -DUSE_PRECOMPILED_HEADERS=ON + -DINSTALL_PROPRIETARY=TRUE + -DUSE_KDU=FALSE + -DFMOD=FALSE + + + name + ReleaseOS + + name + windows - type - autobuild - version - 1.2 + type + autobuild + version + 1.2 + -- cgit v1.3 From ac40560782a61d95dacc492bd52ea3955206cb4b Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 21 Apr 2011 18:07:31 -0400 Subject: reversing the elimination of the stub build of convexdecomp, as we still need the binary version, even with the full LL source being available. This is because the binary package of the full version is not redistributable due to having the havok binaries in it. --- autobuild.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 7d63aa9209..04b45ce5df 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1143,6 +1143,54 @@ + llconvexdecompositionstub + + license + lgpl + license_file + LICENSES/lgpl.txt + name + llconvexdecompositionstub + platforms + + darwin + + archive + + hash + 349fa0e287fb275bbee43ced194a1db1 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-darwin-20101015.tar.bz2 + + name + darwin + + linux + + archive + + hash + dbf4b15e74ce9042e8500720dffc461a + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-linux-20101015a.tar.bz2 + + name + linux + + windows + + archive + + hash + bba9a4dd04fda1b263f34448a044783b + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-windows-20101015.tar.bz2 + + name + windows + + + llqtwebkit license -- cgit v1.3 From 33eb030bc043274c061fbe8cfa22b5f33d43e3e8 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Fri, 22 Apr 2011 00:05:04 -0500 Subject: Update llconvexdecompositionstub for new package layout. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 33cc180384..a81cf5275d 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1158,9 +1158,9 @@ archive hash - 349fa0e287fb275bbee43ced194a1db1 + 506779a74c527c1a2bf93addb58c3e48 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-darwin-20101015.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/227397/arch/Darwin/installer/llconvexdecompositionstub-0.3-darwin-20110421.tar.bz2 name darwin @@ -1170,9 +1170,9 @@ archive hash - dbf4b15e74ce9042e8500720dffc461a + be40b4d5ce1303f8818d294584b8c6a3 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-linux-20101015a.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/227397/arch/Linux/installer/llconvexdecompositionstub-0.3-linux-20110422.tar.bz2 name linux @@ -1182,9 +1182,9 @@ archive hash - bba9a4dd04fda1b263f34448a044783b + 6f65d135e16e64dec91323bad0710406 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-windows-20101015.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/227397/arch/CYGWIN/installer/llconvexdecompositionstub-0.3-windows-20110421.tar.bz2 name windows -- cgit v1.3 From 0349d1f29197ca00c9eb7278d97bd56ea4d2050a Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Fri, 22 Apr 2011 01:17:19 -0500 Subject: Update convex decomp stub to include latest api changes. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index a81cf5275d..b3a7071e29 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1158,9 +1158,9 @@ archive hash - 506779a74c527c1a2bf93addb58c3e48 + bc1388fc28dbb3bba1fe7cb8d09f49b4 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/227397/arch/Darwin/installer/llconvexdecompositionstub-0.3-darwin-20110421.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/227399/arch/Darwin/installer/llconvexdecompositionstub-0.3-darwin-20110421.tar.bz2 name darwin @@ -1170,9 +1170,9 @@ archive hash - be40b4d5ce1303f8818d294584b8c6a3 + 3295bd4a0514b7c15dda9044f40c175e url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/227397/arch/Linux/installer/llconvexdecompositionstub-0.3-linux-20110422.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/227399/arch/Linux/installer/llconvexdecompositionstub-0.3-linux-20110422.tar.bz2 name linux @@ -1182,9 +1182,9 @@ archive hash - 6f65d135e16e64dec91323bad0710406 + 92f1dff3249024c1534b55343ed79ea3 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/227397/arch/CYGWIN/installer/llconvexdecompositionstub-0.3-windows-20110421.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/227399/arch/CYGWIN/installer/llconvexdecompositionstub-0.3-windows-20110421.tar.bz2 name windows -- cgit v1.3 From 67be82ad370601b00d70909669a80d06db62b404 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 28 Apr 2011 11:00:27 -0400 Subject: updated llconvexdecomposition for version linked with vs2010 havok --- autobuild.xml | 1428 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 714 insertions(+), 714 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index f4e7189166..fd5bc060fc 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1134,9 +1134,9 @@ archive hash - 9f8579663eeac8ed5cfc6390560f0e24 + 95a1d483f3d01f480b55801e841b2151 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecomposition/rev/226714/arch/CYGWIN/installer/llconvexdecomposition-0.1-windows-20110415.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecomposition/rev/227989/arch/CYGWIN/installer/llconvexdecomposition-0.1-windows-20110428.tar.bz2 name windows @@ -1784,739 +1784,739 @@ - package_description - - name - viewer_development - platforms + package_description - common + name + viewer_development + platforms - configurations + common - Debug - - build - - - configure - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=Debug - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife + configurations + + Debug + + build + + + configure + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=Debug + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=TRUE - - - name - Debug - - DebugOS - - configure - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=Debug - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - -DINSTALL_PROPRIETARY=FALSE - - arguments - - ../indra - - - name - DebugOS - - RelWithDebInfo - - build - - - configure - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + Debug + + DebugOS + + configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=Debug + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + -DINSTALL_PROPRIETARY=FALSE + + + name + DebugOS + + RelWithDebInfo + + build + + + configure + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=TRUE - - - name - RelWithDebInfo - - RelWithDebInfoOS - - configure - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - -DINSTALL_PROPRIETARY=FALSE - - arguments - - ../indra - - - name - RelWithDebInfoOS - - Release - - build - - - configure - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=Release - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - -DUSE_PRECOMPILED_HEADERS=ON - -DLL_RELEASE_FOR_DOWNLOAD:BOOL=TRUE + + + name + RelWithDebInfo + + RelWithDebInfoOS + + configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + -DINSTALL_PROPRIETARY=FALSE + + + name + RelWithDebInfoOS + + Release + + build + + + configure + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=Release + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + -DUSE_PRECOMPILED_HEADERS=ON + -DLL_RELEASE_FOR_DOWNLOAD:BOOL=TRUE -DINSTALL_PROPRIETARY=TRUE - - - name - Release - - ReleaseOS - - configure - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=Release - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - -DINSTALL_PROPRIETARY=FALSE - -DLL_RELEASE_FOR_DOWNLOAD:BOOL=YES - - arguments - - ../indra - - - name - ReleaseOS - + + + name + Release + + ReleaseOS + + configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=Release + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + -DINSTALL_PROPRIETARY=FALSE + -DLL_RELEASE_FOR_DOWNLOAD:BOOL=YES + + + name + ReleaseOS + + + name + common - name - common - - darwin - - build_directory - build-darwin-i386 - configurations + darwin - Debug - - build - - arguments - - | - grep - -v - setenv - - command - xcodebuild - options - - -configuration Debug - -project SecondLife.xcodeproj - - - configure - - arguments - - ../indra - - options - - -G - 'Xcode' - - - name - Debug - - DebugOS - - build - - command - xcodebuild - options - - -configuration Debug - -project SecondLife.xcodeproj - - - configure - - options - - -G - 'Xcode' - - - name - DebugOS - - RelWithDebInfo - - build - - arguments - - | - grep - -v - setenv - - command - xcodebuild - options - - -configuration RelWithDebInfo - -project SecondLife.xcodeproj - - - configure - - arguments - - ../indra - - options - - -G - 'Xcode' - - - default - True - name - RelWithDebInfo - - RelWithDebInfoOS - - build - - command - xcodebuild - options - - -configuration RelWithDebInfo - -project SecondLife.xcodeproj - - - configure - - options - - -G - 'Xcode' - - - name - RelWithDebInfoOS - - Release - - build - - arguments - - | - grep - -v - setenv - - command - xcodebuild - options - - -configuration Release - -project SecondLife.xcodeproj - - - configure - - arguments - - ../indra - - options - - -G - 'Xcode' - - - name - Release - - ReleaseOS - - build - - command - xcodebuild - options - - -configuration Release - -project SecondLife.xcodeproj - - - configure - - options - - -G - 'Xcode' - - - name - ReleaseOS - + build_directory + build-darwin-i386 + configurations + + Debug + + build + + arguments + + | + grep + -v + setenv + + command + xcodebuild + options + + -configuration Debug + -project SecondLife.xcodeproj + + + configure + + arguments + + ../indra + + options + + -G + 'Xcode' + + + name + Debug + + DebugOS + + build + + command + xcodebuild + options + + -configuration Debug + -project SecondLife.xcodeproj + + + configure + + options + + -G + 'Xcode' + + + name + DebugOS + + RelWithDebInfo + + build + + arguments + + | + grep + -v + setenv + + command + xcodebuild + options + + -configuration RelWithDebInfo + -project SecondLife.xcodeproj + + + configure + + arguments + + ../indra + + options + + -G + 'Xcode' + + + default + True + name + RelWithDebInfo + + RelWithDebInfoOS + + build + + command + xcodebuild + options + + -configuration RelWithDebInfo + -project SecondLife.xcodeproj + + + configure + + options + + -G + 'Xcode' + + + name + RelWithDebInfoOS + + Release + + build + + arguments + + | + grep + -v + setenv + + command + xcodebuild + options + + -configuration Release + -project SecondLife.xcodeproj + + + configure + + arguments + + ../indra + + options + + -G + 'Xcode' + + + name + Release + + ReleaseOS + + build + + command + xcodebuild + options + + -configuration Release + -project SecondLife.xcodeproj + + + configure + + options + + -G + 'Xcode' + + + name + ReleaseOS + + + name + darwin - name - darwin - - linux - - build_directory - build-linux-i686 - configurations + linux - Debug - - build - - command - make - options - - -j 12 - - - configure - - arguments - - ../indra - - options - - -G - 'Unix Makefiles' - - - name - Debug - - DebugOS - - build - - command - make - options - - -j 2 - - - configure - - options - - -G - 'Unix Makefiles' - - - name - DebugOS - - RelWithDebInfo - - build - - command - make - options - - -j 12 - - - configure - - arguments - - ../indra - - options - - -G - 'Unix Makefiles' - + build_directory + build-linux-i686 + configurations + + Debug + + build + + command + make + options + + -j 12 + + + configure + + arguments + + ../indra + + options + + -G + 'Unix Makefiles' + + + name + Debug + + DebugOS + + build + + command + make + options + + -j 2 + + + configure + + options + + -G + 'Unix Makefiles' + + + name + DebugOS + + RelWithDebInfo + + build + + command + make + options + + -j 12 + + + configure + + arguments + + ../indra + + options + + -G + 'Unix Makefiles' + + + default + True + name + RelWithDebInfo + + RelWithDebInfoOS + + build + + command + make + options + + -j 2 + + + configure + + options + + -G + 'Unix Makefiles' + + + name + RelWithDebInfoOS + + Release + + build + + command + make + options + + -j 12 + + + configure + + arguments + + ../indra + + options + + -G + 'Unix Makefiles' + + + name + Release + + ReleaseOS + + build + + command + make + options + + -j 2 + + + configure + + options + + -G + 'Unix Makefiles' + + + name + ReleaseOS default - True - name - RelWithDebInfo - - RelWithDebInfoOS - - build - command - make - options - - -j 2 - + build + + + name + default - configure - - options - - -G - 'Unix Makefiles' - - - name - RelWithDebInfoOS - - Release - - build - - command - make - options - - -j 12 - - - configure - - arguments - - ../indra - - options - - -G - 'Unix Makefiles' - - - name - Release - - ReleaseOS - - build - - command - make - options - - -j 2 - - - configure - - options - - -G - 'Unix Makefiles' - - - name - ReleaseOS - - default - - build - - - name - default + name + linux - name - linux - - windows - - build_directory - build-vc100 - configurations + windows - Debug - - build - - arguments - - SecondLife.sln - - command - BuildConsole - options - - /build - "/cfg=Debug|Win32" - - - configure - - arguments - - ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution - SecondLife.sln - --config - Debug - --startup - secondlife-bin - - options - - -G - "Visual Studio 10" - - - name - Debug - - DebugOS - - build - - arguments - - SecondLife.sln - - command - msbuild.exe - options - - /p:Configuration=Debug - /p:Platform=Win32 - /t:Build - /p:useenv=true - /verbosity:minimal - /toolsversion:4.0 - /p:"VCBuildAdditionalOptions= /incremental" - - - configure - - options - - -G - "Visual Studio 10" - -DUNATTENDED:BOOL=ON - -DUSE_PRECOMPILED_HEADERS=ON - -DINSTALL_PROPRIETARY=TRUE - -DUSE_KDU=FALSE - -DFMOD=FALSE - - - name - DebugOS - - RelWithDebInfo - - build - - arguments - - SecondLife.sln - - command - BuildConsole - options - - /build - "/cfg=RelWithDebInfo|Win32" - - - configure - - arguments - - ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution - SecondLife.sln - --config - RelWithDebInfo - --startup - secondlife-bin - - options - - -G - "Visual Studio 10" - + build_directory + build-vc100 + configurations + + Debug + + build + + arguments + + SecondLife.sln + + command + BuildConsole + options + + /build + "/cfg=Debug|Win32" + + + configure + + arguments + + ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + Debug + --startup + secondlife-bin + + options + + -G + "Visual Studio 10" + + + name + Debug + + DebugOS + + build + + arguments + + SecondLife.sln + + command + msbuild.exe + options + + /p:Configuration=Debug + /p:Platform=Win32 + /t:Build + /p:useenv=true + /verbosity:minimal + /toolsversion:4.0 + /p:"VCBuildAdditionalOptions= /incremental" + + + configure + + options + + -G + "Visual Studio 10" + -DUNATTENDED:BOOL=ON + -DUSE_PRECOMPILED_HEADERS=ON + -DINSTALL_PROPRIETARY=TRUE + -DUSE_KDU=FALSE + -DFMOD=FALSE + + + name + DebugOS + + RelWithDebInfo + + build + + arguments + + SecondLife.sln + + command + BuildConsole + options + + /build + "/cfg=RelWithDebInfo|Win32" + + + configure + + arguments + + ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + RelWithDebInfo + --startup + secondlife-bin + + options + + -G + "Visual Studio 10" + + + default + True + name + RelWithDebInfo + + RelWithDebInfoOS + + build + + arguments + + SecondLife.sln + + command + msbuild.exe + options + + /p:Configuration=RelWithDebInfo + /p:Platform=Win32 + /t:Build + /p:useenv=true + /verbosity:minimal + /toolsversion:4.0 + /p:"VCBuildAdditionalOptions= /incremental" + + + configure + + options + + -G + "Visual Studio 10" + -DUNATTENDED:BOOL=ON + -DUSE_PRECOMPILED_HEADERS=ON + -DINSTALL_PROPRIETARY=TRUE + -DUSE_KDU=FALSE + -DFMOD=FALSE + + + name + RelWithDebInfoOS + + Release + + build + + arguments + + SecondLife.sln + + command + BuildConsole + options + + /build + "/cfg=Release|Win32" + "/CL_ADD=/m:1" + + + configure + + arguments + + ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + Release + --startup + secondlife-bin + + options + + -G + "Visual Studio 10" + + + name + Release + + ReleaseOS + + build + + arguments + + SecondLife.sln + + command + msbuild.exe + options + + /p:Configuration=Release + /p:Platform=Win32 + /t:Build + /p:useenv=true + /verbosity:minimal + /toolsversion:4.0 + /p:"VCBuildAdditionalOptions= /incremental" + + + configure + + options + + -G + "Visual Studio 10" + -DUNATTENDED:BOOL=ON + -DUSE_PRECOMPILED_HEADERS=ON + -DINSTALL_PROPRIETARY=TRUE + -DUSE_KDU=FALSE + -DFMOD=FALSE + + + name + ReleaseOS - default - True - name - RelWithDebInfo - - RelWithDebInfoOS - - build - - arguments - - SecondLife.sln - - command - msbuild.exe - options - - /p:Configuration=RelWithDebInfo - /p:Platform=Win32 - /t:Build - /p:useenv=true - /verbosity:minimal - /toolsversion:4.0 - /p:"VCBuildAdditionalOptions= /incremental" - - - configure - - options - - -G - "Visual Studio 10" - -DUNATTENDED:BOOL=ON - -DUSE_PRECOMPILED_HEADERS=ON - -DINSTALL_PROPRIETARY=TRUE - -DUSE_KDU=FALSE - -DFMOD=FALSE - - - name - RelWithDebInfoOS - - Release - - build - - arguments - - SecondLife.sln - - command - BuildConsole - options - - /build - "/cfg=Release|Win32" - "/CL_ADD=/m:1" - - - configure - - arguments - - ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution - SecondLife.sln - --config - Release - --startup - secondlife-bin - - options - - -G - "Visual Studio 10" - - - name - Release - - ReleaseOS - - build - - arguments - - SecondLife.sln - - command - msbuild.exe - options - - /p:Configuration=Release - /p:Platform=Win32 - /t:Build - /p:useenv=true - /verbosity:minimal - /toolsversion:4.0 - /p:"VCBuildAdditionalOptions= /incremental" - - - configure - - options - - -G - "Visual Studio 10" - -DUNATTENDED:BOOL=ON - -DUSE_PRECOMPILED_HEADERS=ON - -DINSTALL_PROPRIETARY=TRUE - -DUSE_KDU=FALSE - -DFMOD=FALSE - - - name - ReleaseOS + name + windows - name - windows + type + autobuild + version + 1.2 - type - autobuild - version - 1.2 - -- cgit v1.3 From a8ba89eb41b5b0eabecf1d78cf0d5ac9f1b11117 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Tue, 3 May 2011 18:15:00 -0700 Subject: Fix for CHOP-619. Found a general solution to our vs2010 precompiled headers problems and eliminated all our special cases for handling them. --- autobuild.xml | 3 --- build.sh | 1 - indra/cmake/00-Common.cmake | 7 +++++++ indra/cmake/Variables.cmake | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 7686b48cf5..5ced928668 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2125,7 +2125,6 @@ -G "Visual Studio 10" -DUNATTENDED:BOOL=ON - -DUSE_PRECOMPILED_HEADERS=ON -DINSTALL_PROPRIETARY=TRUE -DUSE_KDU=FALSE -DFMOD=FALSE @@ -2203,7 +2202,6 @@ -G "Visual Studio 10" -DUNATTENDED:BOOL=ON - -DUSE_PRECOMPILED_HEADERS=ON -DINSTALL_PROPRIETARY=TRUE -DUSE_KDU=FALSE -DFMOD=FALSE @@ -2280,7 +2278,6 @@ -G "Visual Studio 10" -DUNATTENDED:BOOL=ON - -DUSE_PRECOMPILED_HEADERS=ON -DINSTALL_PROPRIETARY=TRUE -DUSE_KDU=FALSE -DFMOD=FALSE diff --git a/build.sh b/build.sh index d112e5ea1c..b281814059 100755 --- a/build.sh +++ b/build.sh @@ -58,7 +58,6 @@ pre_build() "$AUTOBUILD" configure -c $variant -- \ -DPACKAGE:BOOL=ON \ -DRELEASE_CRASH_REPORTING:BOOL=ON \ - -DUSE_PRECOMPILED_HEADERS=FALSE \ -DVIEWER_CHANNEL:STRING="\"$viewer_channel\"" \ -DVIEWER_LOGIN_CHANNEL:STRING="\"$viewer_login_channel\"" \ -DGRID:STRING="\"$viewer_grid\"" \ diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 15b827b217..faffdc8ccd 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -36,6 +36,13 @@ if (WINDOWS) # Don't build DLLs. set(BUILD_SHARED_LIBS OFF) + # for "backwards compatibility", cmake sneaks in the Zm1000 option which royally + # screws incredibuild. this hack disables it. + # for details see: http://connect.microsoft.com/VisualStudio/feedback/details/368107/clxx-fatal-error-c1027-inconsistent-values-for-ym-between-creation-and-use-of-precompiled-headers + # http://www.ogre3d.org/forums/viewtopic.php?f=2&t=60015 + # http://www.cmake.org/pipermail/cmake/2009-September/032143.html + string(REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP -D_SCL_SECURE_NO_WARNINGS=1" CACHE STRING "C++ compiler debug options" FORCE) set(CMAKE_CXX_FLAGS_RELWITHDEBINFO diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 03428691cf..2f23e7c307 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -151,7 +151,7 @@ For more information, please see JIRA DEV-14943 - Cmake Linux cannot build both endif (LINUX AND SERVER AND VIEWER) -set(USE_PRECOMPILED_HEADERS OFF CACHE BOOL "Enable use of precompiled header directives where supported.") +set(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Enable use of precompiled header directives where supported.") source_group("CMake Rules" FILES CMakeLists.txt) -- cgit v1.3 From 36c671cf15e8889df4f173cf455896b7c9a115e1 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 4 May 2011 12:12:42 -0500 Subject: STORM-1210 Update PCRE libs for mac and linux. --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 04f789ef01..e289af1205 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1510,9 +1510,9 @@ archive hash - cb04654cdfe93e3c8d16fef0c475e2bb + 0566e5ea38e2ba2362fe8e0a695d67e4 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-pcre/rev/226370/arch/Darwin/installer/pcre-7.6-darwin-20110411.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-pcre/rev/228816/arch/Darwin/installer/pcre-7.6-darwin-20110504.tar.bz2 name darwin @@ -1522,9 +1522,9 @@ archive hash - 18854c815c6f960e22add25cf1ff93d4 + 6e390bc796ee2381b414e6d599b37690 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-pcre/rev/226572/arch/Linux/installer/pcre-7.6-linux-20110413.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-pcre/rev/228816/arch/Linux/installer/pcre-7.6-linux-20110504.tar.bz2 name linux -- cgit v1.3 From 5eed546adfbd43d6814f7a0edeb32f00331a366a Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 4 May 2011 12:45:40 -0500 Subject: STORM-1210 Public URLs for pcre --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index e289af1205..24759dd71b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1510,9 +1510,9 @@ archive hash - 0566e5ea38e2ba2362fe8e0a695d67e4 + a8e74694a0f4248228c13c845ed0a6f8 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-pcre/rev/228816/arch/Darwin/installer/pcre-7.6-darwin-20110504.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-pcre/rev/228822/arch/Darwin/installer/pcre-7.6-darwin-20110504.tar.bz2 name darwin @@ -1522,9 +1522,9 @@ archive hash - 6e390bc796ee2381b414e6d599b37690 + bb0abe962b3b8208ed2dab0424aab33d url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-pcre/rev/228816/arch/Linux/installer/pcre-7.6-linux-20110504.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-pcre/rev/228822/arch/Linux/installer/pcre-7.6-linux-20110504.tar.bz2 name linux -- cgit v1.3 From 8245e381cb1657cbfcf434659b4aaa6cd155a3ae Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 4 May 2011 12:54:07 -0500 Subject: STORM-1210 Make llconvexdecomposition private --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 24759dd71b..fb2562aabc 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1110,9 +1110,9 @@ archive hash - bfa0e1ce006302f6d90b712b20e2d96e + 6e45ad68506cd1ba49fd35a3201f0478 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecomposition/rev/226714/arch/Darwin/installer/llconvexdecomposition-0.1-darwin-20110415.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition/rev/228821/arch/Darwin/installer/llconvexdecomposition-0.1-darwin-20110504.tar.bz2 name darwin @@ -1122,9 +1122,9 @@ archive hash - d6207290496f4b464996924b6319932e + 00ff5144612c2e261a0811a4503ce3ba url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecomposition/rev/226714/arch/Linux/installer/llconvexdecomposition-0.1-linux-20110415.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition/rev/228821/arch/Linux/installer/llconvexdecomposition-0.1-linux-20110504.tar.bz2 name linux @@ -1134,9 +1134,9 @@ archive hash - 95a1d483f3d01f480b55801e841b2151 + a4635dcbbe0915ce023dd41d3b848d4c url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecomposition/rev/227989/arch/CYGWIN/installer/llconvexdecomposition-0.1-windows-20110428.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition/rev/228821/arch/CYGWIN/installer/llconvexdecomposition-0.1-windows-20110504.tar.bz2 name windows -- cgit v1.3 From 343ffb9d512702fff76e542575a0eff79ea62204 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 5 May 2011 19:23:55 -0400 Subject: Remove Pth library from viewer build. This library was only needed on the Mac, and only with the OS X 10.4 SDK. As of October 2010, we no longer build the viewer with that SDK. The 10.5 SDK we're currently using directly supports the functionality for which we originally brought in Pth. --- autobuild.xml | 24 - indra/cmake/Pth.cmake | 21 - indra/llcommon/CMakeLists.txt | 3 - indra/newview/licenses-mac.txt | 510 --------------------- .../newview/skins/default/xui/en/floater_about.xml | 1 - indra/viewer_components/login/CMakeLists.txt | 9 - install.xml | 47 -- 7 files changed, 615 deletions(-) delete mode 100644 indra/cmake/Pth.cmake (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 7686b48cf5..53a2e59b29 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1351,30 +1351,6 @@ - pth - - license - lgpl - license_file - LICENSES/pth.txt - name - pth - platforms - - darwin - - archive - - hash - 2172379794217d0ffba0db09b2ac17bf - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pth-2.0.7-darwin-20110303.tar.bz2 - - name - darwin - - - quicktime license diff --git a/indra/cmake/Pth.cmake b/indra/cmake/Pth.cmake deleted file mode 100644 index a28f6ec696..0000000000 --- a/indra/cmake/Pth.cmake +++ /dev/null @@ -1,21 +0,0 @@ -# -*- cmake -*- -include(Prebuilt) - -set(PTH_FIND_QUIETLY ON) -set(PTH_FIND_REQUIRED ON) - -if (STANDALONE) -# ?? How would I construct FindPTH.cmake? This file was cloned from -# CURL.cmake, which uses include(FindCURL), but there's no FindCURL.cmake? -# include(FindPTH) -else (STANDALONE) - # This library is only needed to support Boost.Coroutine, and only on Mac. - if (DARWIN) - use_prebuilt_binary(pth) - set(PTH_LIBRARIES pth) - set(PTH_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) - else (DARWIN) - set(PTH_LIBRARIES) - set(PTH_INCLUDE_DIRS) - endif (DARWIN) -endif (STANDALONE) diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 800bf8eba9..2963fa15af 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -7,7 +7,6 @@ include(00-Common) include(LLCommon) include(Linking) include(Boost) -include(Pth) include(LLSharedLibs) include(GoogleBreakpad) include(GooglePerfTools) @@ -18,7 +17,6 @@ include_directories( ${EXPAT_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} - ${PTH_INCLUDE_DIRS} ) # add_executable(lltreeiterators lltreeiterators.cpp) @@ -287,7 +285,6 @@ target_link_libraries( ${WINDOWS_LIBRARIES} ${BOOST_PROGRAM_OPTIONS_LIBRARY} ${BOOST_REGEX_LIBRARY} - ${PTH_LIBRARIES} ${GOOGLE_PERFTOOLS_LIBRARIES} ) diff --git a/indra/newview/licenses-mac.txt b/indra/newview/licenses-mac.txt index 1324fa1a86..af80bff5d9 100644 --- a/indra/newview/licenses-mac.txt +++ b/indra/newview/licenses-mac.txt @@ -315,516 +315,6 @@ This product includes cryptographic software written by Eric Young Hudson (tjh@cryptsoft.com). -=========== -Pth License -=========== - ____ _ _ - | _ \| |_| |__ ``Ian Fleming was a UNIX fan! - | |_) | __| '_ \ How do I know? Well, James Bond - | __/| |_| | | | had the (license to kill) number 007, - |_| \__|_| |_| i.e., he could execute anyone!'' - - GNU Pth - The GNU Portable Threads - - LICENSE - ======= - - This library is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - For some people, it is not clear, what is the real intention of the - author by using the GNU Lesser General Public License (LGPL) as the - distribution license for GNU Pth. This is, because the LGPL and the - GPL can be (and are often) interpreted very differently and some - interpretations seem to be not compatible with others. So an explicit - clarification for the use of the LGPL for GNU Pth from the authors - point of view might be useful. - - The author places this library under the LGPL to make sure that it - can be used both commercially and non-commercially provided that - modifications to the code base are always donated back to the official - code base under the same license conditions. Please keep in mind that - especially using this library in code not staying under the GPL or - the LGPL _is_ allowed and that any taint or license creap into code - that uses the library is not the authors intention. It is just the - case that _including_ this library into the source tree of other - applications is a little bit more inconvinient because of the LGPL. - But it has to be this way for good reasons. And keep in mind that - inconvinient doesn't mean not allowed or even impossible. - - Even if you want to use this library in some BSD-style licensed - packages, this _is_ possible as long as you are a little bit - carefully. Usually this means you have to make sure that the code is - still clearly separated into the source tree and that modifications to - this source area are done under the conditions of the LGPL. Read below - for more details on the conditions. Contact the author if you have - more questions. - - The license text of the GNU Lesser General Public License follows: - __________________________________________________________________________ - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - ======================= Original SSLeay License ======================= diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index f5365be11f..6a1a600696 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -150,7 +150,6 @@ jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (U jpeglib Copyright (C) 1991-1998, Thomas G. Lane. ogg/vorbis Copyright (C) 2001, Xiphophorus OpenSSL Copyright (C) 1998-2002 The OpenSSL Project. -Pth Copyright (C) 1999-2006 Ralf S. Engelschall <rse@gnu.org> SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) xmlrpc-epi Copyright (C) 2000 Epinions, Inc. diff --git a/indra/viewer_components/login/CMakeLists.txt b/indra/viewer_components/login/CMakeLists.txt index fe64926da6..7720619df3 100644 --- a/indra/viewer_components/login/CMakeLists.txt +++ b/indra/viewer_components/login/CMakeLists.txt @@ -9,13 +9,11 @@ endif(LL_TESTS) include(LLCommon) include(LLMath) include(LLXML) -include(Pth) include_directories( ${LLCOMMON_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} - ${PTH_INCLUDE_DIRS} ) set(login_SOURCE_FILES @@ -42,7 +40,6 @@ target_link_libraries(lllogin ${LLCOMMON_LIBRARIES} ${LLMATH_LIBRARIES} ${LLXML_LIBRARIES} - ${PTH_LIBRARIES} ) if(LL_TESTS) @@ -50,11 +47,5 @@ if(LL_TESTS) lllogin.cpp ) - set_source_files_properties( - lllogin.cpp - PROPERTIES - LL_TEST_ADDITIONAL_LIBRARIES "${PTH_LIBRARIES}" - ) - LL_ADD_PROJECT_UNIT_TESTS(lllogin "${lllogin_TEST_SOURCE_FILES}") endif(LL_TESTS) diff --git a/install.xml b/install.xml index 9658a4195a..889386b336 100644 --- a/install.xml +++ b/install.xml @@ -1252,53 +1252,6 @@ anguage Infrstructure (CLI) international standard - pth - - copyright - Copyright (c) 1999-2006 Ralf S. Engelschall <rse@gnu.org> - description - Portable cooperative threads package, used to support Boost.Coroutine on Mac OS X 10.4 - license - lgpl - packages - - darwin - - md5sum - 216cb6217a06c64dfae30a55ab8b975c - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pth-2.0.7-darwin-20090923.tar.bz2 - - linux - - md5sum - c5c2f73847c126e679d925beab48c7d4 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pth-2.0.7-linux-20090427.tar.bz2 - - linux32 - - md5sum - c5c2f73847c126e679d925beab48c7d4 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pth-2.0.7-linux32-20090427.tar.bz2 - - linux64 - - md5sum - c5c2f73847c126e679d925beab48c7d4 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pth-2.0.7-linux64-20090427.tar.bz2 - - windows - - md5sum - c5c2f73847c126e679d925beab48c7d4 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pth-2.0.7-windows-20090427.tar.bz2 - - - pulseaudio copyright -- cgit v1.3 From 32bce7512476f85b37a9a36cae1fb576e8ce040b Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Tue, 10 May 2011 17:22:34 -0700 Subject: New build of ogg-vorbis package to fix VWR-25727. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index a31d280b6f..0b1871b526 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1182,9 +1182,9 @@ archive hash - 57f32a1a670f06a4dc036eb1164ad9d7 + e849bc2b779fb7cc5e81aeb021a542c0 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg_vorbis-1.1.3-1.2.0-darwin-20110222.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ogvorbis/rev/229529/arch/Darwin/installer/ogg_vorbis-1.2.2-1.3.2-darwin-20110510.tar.bz2 name darwin @@ -1194,9 +1194,9 @@ archive hash - 17c000ceef32c0623d038b4c73791bee + 71eaa462eb0bf8842277a3436483a354 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg_vorbis-1.1.3-1.2.0-linux-20110307.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ogvorbis/rev/229529/arch/Linux/installer/ogg_vorbis-1.2.2-1.3.2-linux-20110511.tar.bz2 name linux @@ -1206,9 +1206,9 @@ archive hash - c8fccf7eeb25fd45cb7e04399c0b83ee + 291dbba89dd8162b76f2c2d82e908c6f url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg_vorbis-1.1.3-1.2.0-windows-20110222.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ogvorbis/rev/229529/arch/CYGWIN/installer/ogg_vorbis-1.2.2-1.3.2-windows-20110510.tar.bz2 name windows -- cgit v1.3 From bd37b14e9217935b9d70faf04c835c9d4aeda9c7 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Tue, 17 May 2011 17:25:38 -0400 Subject: BUILDFIX: copy/paste error in mesh autobuild.xml causes configure to fail. copy/paste error in autobuild.xml caused INSTALL_PROPRIETARY to be set to TRUE for OS builds. This causes configure to fail as llconvexdecomposition is not available to OS devs. Changing INSTALL_PROPRIETARY to false for OS devs so that llconvexdecompositionstub is used instead. problem only affects windows builds. --- autobuild.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 0e4db1bdca..94c2fe1b9d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2317,7 +2317,6 @@ -G "Visual Studio 10" -DUNATTENDED:BOOL=ON - -DINSTALL_PROPRIETARY=TRUE -DUSE_KDU=FALSE -DFMOD=FALSE -- cgit v1.3 From 9075e1104fd8238991f42b90e51b77d3497db02a Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 17 May 2011 19:26:18 -0400 Subject: fix merge error in open source configurations to disable proprietary components --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 94c2fe1b9d..d908344df9 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2393,7 +2393,7 @@ -G "Visual Studio 10" -DUNATTENDED:BOOL=ON - -DINSTALL_PROPRIETARY=TRUE + -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE -DFMOD=FALSE @@ -2469,7 +2469,7 @@ -G "Visual Studio 10" -DUNATTENDED:BOOL=ON - -DINSTALL_PROPRIETARY=TRUE + -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE -DFMOD=FALSE -- cgit v1.3 From b1803a8cb9a12807f6cf287f2fa9223af1ae6040 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Thu, 19 May 2011 17:25:42 -0600 Subject: fix for SH-1185: uploading large mesh file sometimes fails and locks up viewer. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 0e4db1bdca..c2196fcf21 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -18,9 +18,9 @@ archive hash - 7c546f54f6ed654f713c778af3925dd4 + 930bdd987a321eda1838caba8cd6098f url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/226566/arch/Darwin/installer/glod-1.0pre4-darwin-20110413.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/230348/arch/Darwin/installer/glod-1.0pre4-darwin-20110519.tar.bz2 name darwin @@ -30,9 +30,9 @@ archive hash - 18c708163d2a669bc3c030b05b4ebe61 + fb33b6cac2e6b98f93c5efa2af2e5a00 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/226657/arch/Linux/installer/glod-1.0pre4-linux-20110414.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/230348/arch/Linux/installer/glod-1.0pre4-linux-20110519.tar.bz2 name linux @@ -42,9 +42,9 @@ archive hash - c4ae6cddc04e0b2908a301726a53922c + 388cf0e292f756b4bb37696622f0bbc5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/226194/arch/CYGWIN/installer/glod-1.0pre4-windows-20110408.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/230348/arch/CYGWIN/installer/glod-1.0pre4-windows-20110519.tar.bz2 name windows -- cgit v1.3