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