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.2.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.2.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 ++++++------------------------------ 1 file changed, 6 insertions(+), 30 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 -- cgit v1.2.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 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (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 -- cgit v1.2.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 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (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 -- cgit v1.2.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.2.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.2.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.2.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 ++++---- 1 file changed, 4 insertions(+), 4 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 -- cgit v1.2.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 ++++---- 1 file changed, 4 insertions(+), 4 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 -- cgit v1.2.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 ++++---- 1 file changed, 4 insertions(+), 4 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 -- cgit v1.2.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.2.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 ++-- 1 file changed, 2 insertions(+), 2 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 -- cgit v1.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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 --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') 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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.3