From 5ad6b4f099f2e65b83bdd9f788ee6f7f45302e1f Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 15 Sep 2011 14:55:00 -0400 Subject: add configuration for constructing doxygen documentation --- autobuild.xml | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 49031b9f17..162967ec7a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1811,6 +1811,25 @@ name DebugOS + Doxygen + + build + + arguments + + Doxyfile + + command + doxygen + + configure + + command + cmake + + name + Doxygen + RelWithDebInfo build @@ -1957,6 +1976,28 @@ name DebugOS + Doxygen + + build + + + configure + + options + + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + -DINSTALL_PROPRIETARY=TRUE + + arguments + + ../indra + + + name + Doxygen + RelWithDebInfo build @@ -2125,6 +2166,26 @@ name DebugOS + Doxygen + + build + + + configure + + arguments + + ../indra + + options + + -G + 'Unix Makefiles' + + + name + Doxygen + RelWithDebInfo build @@ -2315,6 +2376,21 @@ name DebugOS + Doxygen + + build + + + configure + + arguments + + ..\indra + + + name + Doxygen + RelWithDebInfo build -- cgit v1.2.3 From 18892418f8c902d5b31cf7435e3958f11a64623f Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 26 Feb 2015 15:46:21 -0500 Subject: Remove RelWithDebInfoOS, ReleaseOS build configs in preparation for new universal build commands (without Incredibuild). --- autobuild.xml | 228 ---------------------------------------------------------- 1 file changed, 228 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index c123abf9cf..de70b6bc88 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -2352,27 +2352,6 @@ 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 @@ -2393,27 +2372,6 @@ 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 - - - name - ReleaseOS - name common @@ -2457,29 +2415,6 @@ name RelWithDebInfo - RelWithDebInfoOS - - build - - command - xcodebuild - options - - -configuration RelWithDebInfo - -project SecondLife.xcodeproj - - - configure - - options - - -G - 'Xcode' - - - name - RelWithDebInfoOS - Release build @@ -2513,31 +2448,6 @@ name Release - ReleaseOS - - build - - command - xcodebuild - options - - -configuration Release - -project SecondLife.xcodeproj - -DENABLE_SIGNING:BOOL=YES - -DSIGNING_IDENTITY:STRING="Developer ID Application: Linden Research, Inc." - - - configure - - options - - -G - 'Xcode' - - - name - ReleaseOS - name darwin @@ -2576,28 +2486,6 @@ name RelWithDebInfo - RelWithDebInfoOS - - build - - command - make - options - - -j 7 - - - configure - - options - - -G - 'Unix Makefiles' - - - name - RelWithDebInfoOS - Release build @@ -2624,28 +2512,6 @@ name Release - ReleaseOS - - build - - command - make - options - - -j 7 - - - configure - - options - - -G - 'Unix Makefiles' - - - name - ReleaseOS - default build @@ -2705,53 +2571,6 @@ 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 - - arguments - - ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution - SecondLife.sln - --config - RelWithDebInfo - --startup - secondlife-bin - - options - - -G - "Visual Studio 12" - -DUNATTENDED:BOOL=ON - -DINSTALL_PROPRIETARY=FALSE - -DUSE_KDU=FALSE - - - name - RelWithDebInfoOS - Release build @@ -2791,53 +2610,6 @@ 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 - - arguments - - ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution - SecondLife.sln - --config - Release - --startup - secondlife-bin - - options - - -G - "Visual Studio 12" - -DUNATTENDED:BOOL=ON - -DINSTALL_PROPRIETARY=FALSE - -DUSE_KDU=FALSE - - - name - ReleaseOS - name windows -- cgit v1.2.3 From 68797ab15c2ba6177cddfd316f69481d81aa9f59 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 27 Feb 2015 14:12:06 -0500 Subject: Remove viewer build dependency on Incredibuild. Specifically, change the 'BuildConsole' command to 'devenv', and fix command-line arguments appropriately. --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 42a72d81de..aa9ce33eb1 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -2593,11 +2593,11 @@ SecondLife.sln command - BuildConsole + devenv options /build - "/cfg=RelWithDebInfo|Win32" + "RelWithDebInfo|Win32" configure @@ -2634,11 +2634,11 @@ SecondLife.sln command - BuildConsole + devenv options /build - "/cfg=Release|Win32" + "Release|Win32" configure -- cgit v1.2.3 From 71141cc463dfef75a9991a781e0537c53f81ea3e Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 27 Feb 2015 14:29:34 -0500 Subject: Backed out changeset f753369355e8 (removing ReleaseOS, RelWithDebInfoOS) Restore the MumbleOS build configs: they differ in settings, not only in the build engine. --- autobuild.xml | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index de70b6bc88..c123abf9cf 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -2352,6 +2352,27 @@ 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 @@ -2372,6 +2393,27 @@ 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 + + + name + ReleaseOS + name common @@ -2415,6 +2457,29 @@ name RelWithDebInfo + RelWithDebInfoOS + + build + + command + xcodebuild + options + + -configuration RelWithDebInfo + -project SecondLife.xcodeproj + + + configure + + options + + -G + 'Xcode' + + + name + RelWithDebInfoOS + Release build @@ -2448,6 +2513,31 @@ name Release + ReleaseOS + + build + + command + xcodebuild + options + + -configuration Release + -project SecondLife.xcodeproj + -DENABLE_SIGNING:BOOL=YES + -DSIGNING_IDENTITY:STRING="Developer ID Application: Linden Research, Inc." + + + configure + + options + + -G + 'Xcode' + + + name + ReleaseOS + name darwin @@ -2486,6 +2576,28 @@ name RelWithDebInfo + RelWithDebInfoOS + + build + + command + make + options + + -j 7 + + + configure + + options + + -G + 'Unix Makefiles' + + + name + RelWithDebInfoOS + Release build @@ -2512,6 +2624,28 @@ name Release + ReleaseOS + + build + + command + make + options + + -j 7 + + + configure + + options + + -G + 'Unix Makefiles' + + + name + ReleaseOS + default build @@ -2571,6 +2705,53 @@ 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 + + arguments + + ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + RelWithDebInfo + --startup + secondlife-bin + + options + + -G + "Visual Studio 12" + -DUNATTENDED:BOOL=ON + -DINSTALL_PROPRIETARY=FALSE + -DUSE_KDU=FALSE + + + name + RelWithDebInfoOS + Release build @@ -2610,6 +2791,53 @@ 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 + + arguments + + ..\indra + && + ..\indra\tools\vstool\VSTool.exe + --solution + SecondLife.sln + --config + Release + --startup + secondlife-bin + + options + + -G + "Visual Studio 12" + -DUNATTENDED:BOOL=ON + -DINSTALL_PROPRIETARY=FALSE + -DUSE_KDU=FALSE + + + name + ReleaseOS + name windows -- cgit v1.2.3 From e59dbf1b23a13c6a7f1f0d9661d3dcb78ea040f2 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 3 Mar 2015 10:12:53 -0500 Subject: Align ReleaseOS / RelWithDebInfoOS more closely with Release, etc. Specifically, engage devenv rather than msbuild for ReleaseOS and RelWithDebInfoOS. Eliminate minor redundancy in configure argument for Release and RelWithDebInfo, which eliminates an egregious difference from ReleaseOS and RelWithDebInfoOS. --- autobuild.xml | 52 ++++++++++++++-------------------------------------- 1 file changed, 14 insertions(+), 38 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 52d750f64d..ea7d166bc9 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -2388,11 +2388,12 @@ RelWithDebInfo - build - - configure + arguments + + ../indra + command cmake options @@ -2429,11 +2430,12 @@ Release - build - - configure + arguments + + ../indra + command cmake options @@ -2496,10 +2498,6 @@ configure - arguments - - ../indra - options -G @@ -2554,10 +2552,6 @@ configure - arguments - - ../indra - options -G @@ -2615,10 +2609,6 @@ configure - arguments - - ../indra - options -G @@ -2665,10 +2655,6 @@ configure - arguments - - ../indra - options -G @@ -2768,16 +2754,11 @@ SecondLife.sln command - msbuild.exe + devenv options - /p:Configuration=RelWithDebInfo - /p:Platform=Win32 - /t:Build - /p:useenv=true - /verbosity:minimal - /toolsversion:4.0 - /p:"VCBuildAdditionalOptions= /incremental" + /build + "RelWithDebInfo|Win32" configure @@ -2854,16 +2835,11 @@ SecondLife.sln command - msbuild.exe + devenv options - /p:Configuration=Release - /p:Platform=Win32 - /t:Build - /p:useenv=true - /verbosity:minimal - /toolsversion:4.0 - /p:"VCBuildAdditionalOptions= /incremental" + /build + "Release|Win32" configure -- cgit v1.2.3 From 9fec6866e45cbb1edb52f28673b19c3f5fd75d19 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 27 Apr 2015 17:14:28 -0400 Subject: Update viewer with colladadom build 301342. This colladadom build includes the most recent changeset: https://bitbucket.org/lindenlab/3p-update-colladadom/commits/041c29e0715ee58cac10dca84ad8b93446bf5cc4 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index ea7d166bc9..4741cba13c 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -212,9 +212,9 @@ archive hash - 66849777a83cb69cec3c06b07da7cd3d + 6c59c06016aa86a52e90bd538a98548c url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/297450/arch/Darwin/installer/colladadom-2.3.297450-darwin-297450.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/301342/arch/Darwin/installer/colladadom-2.3.301342-darwin-301342.tar.bz2 name darwin @@ -224,9 +224,9 @@ archive hash - d627c2a679f3afb8d3e090d42f53cd2e + a3e47fff933490871b4b612756fcf88d url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/297450/arch/Linux/installer/colladadom-2.3.297450-linux-297450.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/301342/arch/Linux/installer/colladadom-2.3.301342-linux-301342.tar.bz2 name linux @@ -236,16 +236,16 @@ archive hash - 220897a1893a188aa9d31efb48909878 + 6463b20e6f3a0a685c67d5d0f8277710 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/297450/arch/CYGWIN/installer/colladadom-2.3.297450-windows-297450.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/301342/arch/CYGWIN/installer/colladadom-2.3.301342-windows-301342.tar.bz2 name windows version - 2.3.297450 + 2.3.301342 curl -- cgit v1.2.3 From b981e10dda1506581a8abc74286c9cadeb7bd447 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 28 Apr 2015 17:57:19 -0400 Subject: DRTVWR-398: Update viewer to colladadom build 301371. This colladadom build removes the vestigial LICENSES/minizip.txt, which was colliding with the minizip.txt installed by the zlib package, which is the minizip actually used by colladadom these days. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 4741cba13c..144a55cd37 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -212,9 +212,9 @@ archive hash - 6c59c06016aa86a52e90bd538a98548c + 40bd4dd220749a7f0fc8e4d62e61b4a2 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/301342/arch/Darwin/installer/colladadom-2.3.301342-darwin-301342.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/301371/arch/Darwin/installer/colladadom-2.3.301371-darwin-301371.tar.bz2 name darwin @@ -224,9 +224,9 @@ archive hash - a3e47fff933490871b4b612756fcf88d + 7ff636034665555e4b3d918d86ef9566 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/301342/arch/Linux/installer/colladadom-2.3.301342-linux-301342.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/301371/arch/Linux/installer/colladadom-2.3.301371-linux-301371.tar.bz2 name linux @@ -236,16 +236,16 @@ archive hash - 6463b20e6f3a0a685c67d5d0f8277710 + 24e1fac1fd6feef7915c958687fd7c56 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/301342/arch/CYGWIN/installer/colladadom-2.3.301342-windows-301342.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/301371/arch/CYGWIN/installer/colladadom-2.3.301371-windows-301371.tar.bz2 name windows version - 2.3.301342 + 2.3.301371 curl -- cgit v1.2.3 From b013d8023805a7493b5f5c33cee1f981939625a6 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 28 Apr 2015 19:50:08 -0400 Subject: MAINT-5164: Standardize viewer on breakpad 298127 for all platforms. --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 144a55cd37..f973fdb5c9 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -838,9 +838,9 @@ archive hash - 171b39db6d0702535b41fad5b476e39d + c2395f77c581da0a085a352ff3566d0f url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/298033/arch/Darwin/installer/google_breakpad-1413.298033-darwin-298033.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/298127/arch/Darwin/installer/google_breakpad-1413.298127-darwin-298127.tar.bz2 name darwin @@ -850,9 +850,9 @@ archive hash - 0bf69fbc829d964820b798a0494278c9 + e294e6ca721e271b4bae8046cfbc3c9b url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/298033/arch/Linux/installer/google_breakpad-1413.298033-linux-298033.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/298127/arch/Linux/installer/google_breakpad-1413.298127-linux-298127.tar.bz2 name linux -- cgit v1.2.3 From 6a21d34b8286a578283a11382f039f8f5194f489 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 28 Apr 2015 19:54:41 -0400 Subject: MAINT-5164: Standardize viewer on jsoncpp 297580 for all platforms. --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index f973fdb5c9..17f17be042 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1164,9 +1164,9 @@ archive hash - b25a4f480e07c670ffef00c3da578f87 + 8084ced172704ff09b364f7af82a2d6f url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/jsoncpp_3p-update-jsoncpp/rev/297281/arch/Darwin/installer/jsoncpp-0.5.0.297281-darwin-297281.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/jsoncpp_3p-update-jsoncpp/rev/297580/arch/Darwin/installer/jsoncpp-0.5.0.297580-darwin-297580.tar.bz2 name darwin @@ -1176,9 +1176,9 @@ archive hash - 5b3b5dbf0c82c1046482a74ce9e11c38 + 910bf12e4b4635170e462b739887cda9 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/jsoncpp_3p-update-jsoncpp/rev/297281/arch/Linux/installer/jsoncpp-0.5.0.297281-linux-297281.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/jsoncpp_3p-update-jsoncpp/rev/297580/arch/Linux/installer/jsoncpp-0.5.0.297580-linux-297580.tar.bz2 name linux -- cgit v1.2.3 From b4c020bf9d83654ac64df069c2b65820be5e480a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 29 Apr 2015 11:46:25 -0400 Subject: MAINT-5164: Standardize viewer on libpng 301387 for all platforms. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 17f17be042..66fc937f68 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1368,9 +1368,9 @@ archive hash - 14cb5c8686a472e9e60179e46cd196f7 + 0d134c36fcd87d00d91c99291906dde9 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/297708/arch/Darwin/installer/libpng-1.6.8.297708-darwin-297708.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/301387/arch/Darwin/installer/libpng-1.6.8.301387-darwin-301387.tar.bz2 name darwin @@ -1380,9 +1380,9 @@ archive hash - 6dec32fc2527f8cafd616f9271ff3478 + 744e22c5fcaaf3483a60e29f217daa9c url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/297051/arch/Linux/installer/libpng-1.6.8.297051-linux-297051.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/301387/arch/Linux/installer/libpng-1.6.8.301387-linux-301387.tar.bz2 name linux @@ -1392,16 +1392,16 @@ archive hash - 09eb65e66e0230ab01e57e643647a4f1 + 391158e9b5d92a8b69aeb7478144d2de url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/297708/arch/CYGWIN/installer/libpng-1.6.8.297708-windows-297708.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libpng_3p-update-libpng/rev/301387/arch/CYGWIN/installer/libpng-1.6.8.301387-windows-301387.tar.bz2 name windows version - 1.6.8.297708 + 1.6.8.301387 libuuid -- cgit v1.2.3 From fcabdf93a37906fa549d9eaef1547ef8a167551e Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 30 Apr 2015 15:46:55 -0400 Subject: MAINT-5164: update viewer to SDL build 301425 which consumes libpng build 301387. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 66fc937f68..8104c38b28 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -22,9 +22,9 @@ archive hash - 459cdc8d7c19a8025f98f61db95622ff + fe724581a16ff7bf3f2e261b8c4ee80e url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/sdl_3p-update-sdl/rev/297546/arch/Linux/installer/SDL-1.2.15-linux-297546.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/sdl_3p-update-sdl/rev/301425/arch/Linux/installer/SDL-1.2.15-linux-301425.tar.bz2 name linux -- cgit v1.2.3 From 20cc191cdedc092b83b7cc0e786326c104646e4b Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 30 Apr 2015 18:38:08 -0400 Subject: MAINT-5164: Standardize viewer on havok-source 301432 for all platforms. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 8104c38b28..4aa921cc6b 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1056,9 +1056,9 @@ archive hash - 5c5b4820999ae9e398801d6a46f45897 + 0d586709c1a2e4cf433390bbdd2498ed url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/297312/arch/Darwin/installer/havok_source-2012.1-darwin-297312.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/301432/arch/Darwin/installer/havok_source-2012.1-darwin-301432.tar.bz2 name darwin @@ -1068,9 +1068,9 @@ archive hash - 6b0f41ddddfa60d8424d8a2e0bc2077d + 02c85c2c63c8d002b31382f866ca143b url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/296959/arch/Linux/installer/havok_source-2012.1-linux-296959.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/301432/arch/Linux/installer/havok_source-2012.1-linux-301432.tar.bz2 name linux @@ -1080,9 +1080,9 @@ archive hash - ab30ae74a665950d73ea559f019ff358 + ac8a27020182510fd404177e4a97b70f url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/297566/arch/CYGWIN/installer/havok_source-2012.1-windows-297566.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/havok-source_3p-update-havok-source/rev/301432/arch/CYGWIN/installer/havok_source-2012.1-windows-301432.tar.bz2 name windows -- cgit v1.2.3 From 5fb626c1604e846d4510594587d05ee572b904b3 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 30 Apr 2015 22:33:19 -0400 Subject: MAINT-5164: Update viewer to open-libndofdev build 301464. This open-libndofdev folds in the newer SDL build. --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 4aa921cc6b..4c4ff5a0d4 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1814,9 +1814,9 @@ archive hash - b1245d467d5914a266efa16afeb55406 + 65f58cc0b17ebd29fe2b8bccc6bcbf64 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libndofdev_3p-update-libndofdev/rev/297553/arch/Linux/installer/open_libndofdev-0.3-linux-297553.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libndofdev_3p-update-libndofdev/rev/301464/arch/Linux/installer/open_libndofdev-0.3-linux-301464.tar.bz2 name linux -- cgit v1.2.3 From d24de6c395ed6badccc5e898e209e4431bd1d2d3 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Fri, 8 May 2015 11:45:29 -0700 Subject: Update viewer to new CURL libs. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 4c4ff5a0d4..8972c4ceb0 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -266,9 +266,9 @@ archive hash - d1c5125650a339a5209f429c70f4d395 + 89db4a1aa22599cf377ae49630b7b5b1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/297172/arch/Darwin/installer/curl-7.38.0.297172-darwin-297172.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/301717/arch/Darwin/installer/curl-7.42.1.301717-darwin-301717.tar.bz2 name darwin @@ -278,9 +278,9 @@ archive hash - ee6c089ee193e551040d610befc5d1c1 + de9e0c855ff6ee30c9e027a70bbef032 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/297172/arch/Linux/installer/curl-7.38.0.297172-linux-297172.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/301717/arch/Linux/installer/curl-7.42.1.301717-linux-301717.tar.bz2 name linux @@ -290,16 +290,16 @@ archive hash - fdeca7cbc074a88d2701d74a31d21bd8 + 98d15713de8c439b7f54cc14f2df07ac url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/297172/arch/CYGWIN/installer/curl-7.38.0.297172-windows-297172.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/curl_3p-update-curl/rev/301717/arch/CYGWIN/installer/curl-7.42.1.301717-windows-301717.tar.bz2 name windows version - 7.38.0.297172 + 7.42.1.301717 db -- cgit v1.2.3 From a6e5553e7429d32f0e1a145db8a680d99ee5013d Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 10 Jul 2015 12:24:18 -0400 Subject: revert breakpad for darwin to previous version --- autobuild.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 28bfca4a6e..9723372351 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -838,9 +838,9 @@ archive hash - c2395f77c581da0a085a352ff3566d0f + 171b39db6d0702535b41fad5b476e39d url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/298127/arch/Darwin/installer/google_breakpad-1413.298127-darwin-298127.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/298033/arch/Darwin/installer/google_breakpad-1413.298033-darwin-298033.tar.bz2 name darwin @@ -2388,6 +2388,9 @@ RelWithDebInfo + build + + configure arguments -- cgit v1.2.3 From 51fbdbe2a6ba27394f6938c965acbc0470a0870d Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 5 Nov 2015 17:38:55 -0500 Subject: correct doxygen configuration --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 3eab52608b..e73ebce825 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -2476,7 +2476,7 @@ arguments - Doxyfile + doxygen/Doxyfile command doxygen @@ -2508,7 +2508,7 @@ options - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -DCMAKE_BUILD_TYPE:STRING=Release -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=TRUE -- cgit v1.2.3 From aca2085e0e136178733d6fee91aab39bd2c58cbe Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 5 Apr 2016 13:50:16 -0400 Subject: upgrade llphysicsextenstions to work around a new clang recursion check --- autobuild.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 6c29d5cb18..43bad77d25 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1528,11 +1528,11 @@ archive hash - 468e88a527e610804c3eecf07f4ed70b + 01a7cc9d0e56238a9abedd7a41ccd0a3 hash_algorithm md5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/298369/arch/Darwin/installer/llphysicsextensions_source-1.0.298369-darwin-298369.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions/rev/313564/arch/Darwin/installer/llphysicsextensions_source-1.0.313564-darwin-313564.tar.bz2 name darwin @@ -1542,9 +1542,9 @@ archive hash - 793964e49c935b414c4bdbb8a0d14ad1 + c94dc7ab6efe59c0d5d04fc447257c57 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/298369/arch/Linux/installer/llphysicsextensions_source-1.0.298369-linux-298369.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions/rev/313564/arch/Linux/installer/llphysicsextensions_source-1.0.313564-linux-313564.tar.bz2 name linux @@ -1554,16 +1554,16 @@ archive hash - 922aad5261aac150e5ce3c094e57f373 + 4a9dbeb437d0e1546b93d16073ff1442 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/298369/arch/CYGWIN/installer/llphysicsextensions_source-1.0.298369-windows-298369.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions/rev/313564/arch/CYGWIN/installer/llphysicsextensions_source-1.0.313564-windows-313564.tar.bz2 name windows version - 1.0.298369 + 1.0.313564 llphysicsextensions_stub @@ -1582,11 +1582,11 @@ archive hash - 1175977a191ffc936fd0ccca433c8278 + c8c6e5867d1ead7ad452a3359b22cf44 hash_algorithm md5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/298370/arch/Darwin/installer/llphysicsextensions_stub-1.0.298370-darwin-298370.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions/rev/313563/arch/Darwin/installer/llphysicsextensions_stub-1.0.313563-darwin-313563.tar.bz2 name darwin @@ -1596,9 +1596,9 @@ archive hash - d13d7927692eab2d6a63e36166b72a8a + e99afb25a4fd5b08c5cd3060ae9c1d59 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/298370/arch/Linux/installer/llphysicsextensions_stub-1.0.298370-linux-298370.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions/rev/313563/arch/Linux/installer/llphysicsextensions_stub-1.0.313563-linux-313563.tar.bz2 name linux @@ -1608,16 +1608,16 @@ archive hash - 9594f6fd79ee924fe675a4a23e30516e + 6f4307a35c692e44b872125d7932df8e url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/298370/arch/CYGWIN/installer/llphysicsextensions_stub-1.0.298370-windows-298370.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions/rev/313563/arch/CYGWIN/installer/llphysicsextensions_stub-1.0.313563-windows-313563.tar.bz2 name windows version - 1.0.298370 + 1.0.313563 mesa -- cgit v1.2.3 From 56ca48390535f543456a0b59365b428198414d4f Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 21 Apr 2016 12:56:23 -0400 Subject: correct llphysicsextensions package for windows --- autobuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 43bad77d25..072dfa678a 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1554,7 +1554,7 @@ archive hash - 4a9dbeb437d0e1546b93d16073ff1442 + e760be34addeb0cd6e2ec43394834bac url http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions/rev/313564/arch/CYGWIN/installer/llphysicsextensions_source-1.0.313564-windows-313564.tar.bz2 -- cgit v1.2.3