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(-) 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(-) 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(+) 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(-) 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 e611e35e033e99f619b0e4938f6879c8e387efd5 Mon Sep 17 00:00:00 2001 From: sabin_linden Date: Wed, 15 Apr 2015 01:05:18 +0000 Subject: Fake commit to check against codeticket failure on new build machine. --- BuildParams | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BuildParams b/BuildParams index 74bd2b4923..bfcb48b6cc 100755 --- a/BuildParams +++ b/BuildParams @@ -4,7 +4,7 @@ # https://wiki.secondlife.com/wiki/Automated_Build_System -# Global setting for now... +# Global setting for now.... Darwin.symbolfiles = "newview/Release/secondlife-symbols-darwin.tar.bz2" CYGWIN.symbolfiles = "newview/Release/secondlife-symbols-windows.tar.bz2" Linux.symbolfiles = "newview/secondlife-symbols-linux.tar.bz2" -- cgit v1.2.3