From f23bd166fc27bc7b17f54e657c5919f275730fbd Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 5 Apr 2011 16:48:05 -0400 Subject: remove obsolete workaround configurations --- autobuild.xml | 99 +++++++++++------------------------------------------------ 1 file changed, 18 insertions(+), 81 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index a31d280b6f..1a9788047e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1740,8 +1740,7 @@ name Release - - VCexpressRelWithDebInfo + VC10msbuildRelWithDebInfo configure @@ -1760,11 +1759,9 @@ name - VCexpressRelWithDebInfo + VC10msbuildRelWithDebInfo - - - VC10msbuildRelWithDebInfo + VC10msbuildRelease configure @@ -1776,18 +1773,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 +1794,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,7 +2746,16 @@ name Release - + VC10msbuildRelWithDebInfo + + name + VC10msbuildRelWithDebInfo + + VC10msbuildRelease + + name + VC10msbuildRelease + VCexpressRelWithDebInfo build @@ -2783,72 +2786,6 @@ name VCexpressRelWithDebInfo - - - VC10msbuildRelWithDebInfo - - build - - command - msbuild.exe - options - - SecondLife.sln - /verbosity:minimal - /t:build - /p:Configuration=RelWithDebInfo - /p:Platform=Win32 - /p:"VCBuildAdditionalOptions= /useenv" - /p:"VCBuildAdditionalOptions= /incremental" - - - configure - - options - - -G - "Visual Studio 10" - -DSTANDALONE:BOOL=FALSE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE - - - name - VC10msbuildRelWithDebInfo - - - - VC10msbuildRelease - - build - - command - msbuild.exe - options - - SecondLife.sln - /t:build - /p:Configuration=Release - /p:Platform=Win32 - /p:"VCBuildAdditionalOptions= /useenv" - /p:"VCBuildAdditionalOptions= /incremental" - - - configure - - options - - -G - "Visual Studio 10" - -DSTANDALONE:BOOL=FALSE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE - - - name - VC10msbuildRelease - - name windows -- cgit v1.2.3 From 8d452969dbfd5513186425511f7b4eb211278887 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 5 Apr 2011 17:03:40 -0400 Subject: remove unused configurations for standalone, and change open source configuration names from "OpenSource" prefix to "OS" suffix --- autobuild.xml | 593 ++++++++-------------------------------------------------- 1 file changed, 76 insertions(+), 517 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 1a9788047e..a6444b0b86 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1598,7 +1598,7 @@ name Debug - OpenSourceDebug + DebugOS configure @@ -1613,61 +1613,13 @@ name - OpenSourceDebug + DebugOS - OpenSourceRelWithDebInfo - - configure - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo - -DUNATTENDED:BOOL=OFF - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - - - name - OpenSourceRelWithDebInfo - - OpenSourceRelease - - configure - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=Release - -DUNATTENDED:BOOL=OFF - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - - - name - OpenSourceRelease - - OpenSourceStandAloneDebug + RelWithDebInfo - configure + build - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=Debug - -DUNATTENDED:BOOL=OFF - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - - name - OpenSourceStandAloneDebug - - OpenSourceStandAloneRelWithDebInfo - configure command @@ -1681,30 +1633,10 @@ name - OpenSourceStandAloneRelWithDebInfo + RelWithDebInfo - OpenSourceStandAloneRelease + RelWithDebInfoOS - configure - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=Release - -DUNATTENDED:BOOL=OFF - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - - - name - OpenSourceStandAloneRelease - - RelWithDebInfo - - build - - configure command @@ -1718,7 +1650,7 @@ name - RelWithDebInfo + RelWithDebInfoOS Release @@ -1740,35 +1672,10 @@ name Release - VC10msbuildRelWithDebInfo + ReleaseOS 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 @@ -1780,28 +1687,7 @@ name - VC10msbuildRelease - - VCexpressRelWithDebInfo - - configure - - arguments - - ../indra - - command - cmake - options - - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo - -DUNATTENDED:BOOL=OFF - -DWORD_SIZE:STRING=32 - -DROOT_PROJECT_NAME:STRING=SecondLife - - - name - VCexpressRelWithDebInfo + ReleaseOS name @@ -1850,7 +1736,7 @@ name Debug - OpenSourceDebug + DebugOS build @@ -1878,102 +1764,19 @@ name - OpenSourceDebug + DebugOS - OpenSourceRelWithDebInfo - - build - - command - xcodebuild - options - - -configuration RelWithDebInfo - -project SecondLife.xcodeproj - - - configure - - arguments - - ../indra - - options - - -G - 'Xcode' - -DSTANDALONE:BOOL=FALSE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE - - - name - OpenSourceRelWithDebInfo - - OpenSourceRelease - - build - - command - xcodebuild - options - - -configuration Release - -project SecondLife.xcodeproj - - - configure - - arguments - - ../indra - - options - - -G - 'Xcode' - -DSTANDALONE:BOOL=FALSE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE - - - name - OpenSourceRelease - - OpenSourceStandAloneDebug + RelWithDebInfo build - - command - xcodebuild - options - - -configuration Debug - -project SecondLife.xcodeproj - - - configure arguments - ../indra - - options - - -G - 'Xcode' - -DSTANDALONE:BOOL=TRUE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE + | + grep + -v + setenv - - name - OpenSourceStandAloneDebug - - OpenSourceStandAloneRelWithDebInfo - - build - command xcodebuild options @@ -1992,15 +1795,17 @@ -G 'Xcode' - -DSTANDALONE:BOOL=TRUE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE + -DSTANDALONE:BOOL=OFF + -DINSTALL_PROPRIETARY=TRUE + -DFMOD=TRUE + default + True name - OpenSourceStandAloneRelWithDebInfo + RelWithDebInfo - OpenSourceStandAloneRelease + RelWithDebInfoOS build @@ -2008,7 +1813,7 @@ xcodebuild options - -configuration Release + -configuration RelWithDebInfo -project SecondLife.xcodeproj @@ -2022,15 +1827,15 @@ -G 'Xcode' - -DSTANDALONE:BOOL=TRUE + -DSTANDALONE:BOOL=FALSE -DINSTALL_PROPRIETARY=FALSE -DFMOD=FALSE name - OpenSourceStandAloneRelease + RelWithDebInfoOS - RelWithDebInfo + Release build @@ -2045,7 +1850,7 @@ xcodebuild options - -configuration RelWithDebInfo + -configuration Release -project SecondLife.xcodeproj @@ -2064,22 +1869,13 @@ -DFMOD=TRUE - default - True name - RelWithDebInfo + Release - Release + ReleaseOS build - arguments - - | - grep - -v - setenv - command xcodebuild options @@ -2098,13 +1894,13 @@ -G 'Xcode' - -DSTANDALONE:BOOL=OFF - -DINSTALL_PROPRIETARY=TRUE - -DFMOD=TRUE + -DSTANDALONE:BOOL=FALSE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE name - Release + ReleaseOS name @@ -2145,7 +1941,7 @@ name Debug - OpenSourceDebug + DebugOS build @@ -2172,9 +1968,9 @@ name - OpenSourceDebug + DebugOS - OpenSourceRelWithDebInfo + RelWithDebInfo build @@ -2195,15 +1991,17 @@ -G 'Unix Makefiles' - -DSTANDALONE:BOOL=FALSE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE + -DSTANDALONE:BOOL=OFF + -DINSTALL_PROPRIETARY=TRUE + -DFMOD=TRUE + default + True name - OpenSourceRelWithDebInfo + RelWithDebInfo - OpenSourceRelease + RelWithDebInfoOS build @@ -2230,96 +2028,9 @@ name - OpenSourceRelease + RelWithDebInfoOS - OpenSourceStandAloneDebug - - build - - command - make - options - - -j 12 - - - configure - - arguments - - ../indra - - options - - -G - 'Unix Makefiles' - -DSTANDALONE:BOOL=TRUE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE - - - name - OpenSourceStandAloneDebug - - OpenSourceStandAloneRelWithDebInfo - - build - - command - make - options - - -j 12 - - - configure - - arguments - - ../indra - - options - - -G - 'Unix Makefiles' - -DSTANDALONE:BOOL=TRUE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE - - - name - OpenSourceStandAloneRelWithDebInfo - - OpenSourceStandAloneRelease - - build - - command - make - options - - -j 12 - - - configure - - arguments - - ../indra - - options - - -G - 'Unix Makefiles' - -DSTANDALONE:BOOL=TRUE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE - - - name - OpenSourceStandAloneRelease - - RelWithDebInfo + Release build @@ -2345,12 +2056,10 @@ -DFMOD=TRUE - default - True name - RelWithDebInfo + Release - Release + ReleaseOS build @@ -2371,13 +2080,13 @@ -G 'Unix Makefiles' - -DSTANDALONE:BOOL=OFF - -DINSTALL_PROPRIETARY=TRUE - -DFMOD=TRUE + -DSTANDALONE:BOOL=FALSE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE name - Release + ReleaseOS default @@ -2439,7 +2148,7 @@ name Debug - OpenSourceDebug + DebugOS build @@ -2479,77 +2188,9 @@ name - OpenSourceDebug - - OpenSourceRelWithDebInfo - - build - - arguments - - SecondLife.sln - - command - devenv.com - options - - /build - RelWithDebInfo - - - configure - - arguments - - ../indra - - options - - -G - "Visual Studio 10" - -DSTANDALONE:BOOL=FALSE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE - - - name - OpenSourceRelWithDebInfo - - OpenSourceRelease - - build - - arguments - - SecondLife.sln - - command - devenv.com - options - - /build - Release - - - configure - - arguments - - ../indra - - options - - -G - "Visual Studio 10" - -DSTANDALONE:BOOL=FALSE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE - - - name - OpenSourceRelease + DebugOS - OpenSourceStandAloneDebug + RelWithDebInfo build @@ -2558,11 +2199,11 @@ SecondLife.sln command - devenv.com + BuildConsole options /build - Debug + "/cfg=RelWithDebInfo|Win32" configure @@ -2583,15 +2224,17 @@ -G "Visual Studio 10" - -DSTANDALONE:BOOL=TRUE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE + -DSTANDALONE:BOOL=OFF + -DINSTALL_PROPRIETARY=TRUE + -DFMOD=TRUE + default + True name - OpenSourceStandAloneDebug + RelWithDebInfo - OpenSourceStandAloneRelWithDebInfo + RelWithDebInfoOS build @@ -2617,91 +2260,13 @@ -G "Visual Studio 10" - -DSTANDALONE:BOOL=TRUE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE - - - name - OpenSourceStandAloneRelWithDebInfo - - OpenSourceStandAloneRelease - - build - - arguments - - SecondLife.sln - - command - devenv.com - options - - /build - Release - - - configure - - arguments - - ../indra - - options - - -G - "Visual Studio 10" - -DSTANDALONE:BOOL=TRUE + -DSTANDALONE:BOOL=FALSE -DINSTALL_PROPRIETARY=FALSE -DFMOD=FALSE name - OpenSourceStandAloneRelease - - 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" - -DSTANDALONE:BOOL=OFF - -DINSTALL_PROPRIETARY=TRUE - -DFMOD=TRUE - - - default - True - name - RelWithDebInfo + RelWithDebInfoOS Release @@ -2746,34 +2311,28 @@ name Release - VC10msbuildRelWithDebInfo - - name - VC10msbuildRelWithDebInfo - - VC10msbuildRelease - - name - VC10msbuildRelease - - VCexpressRelWithDebInfo + ReleaseOS build arguments - "RelWithDebInfo|Win32" + SecondLife.sln command - vcbuild.exe + devenv.com options - /u - SecondLife.sln + /build + Release configure + arguments + + ../indra + options -G @@ -2784,7 +2343,7 @@ name - VCexpressRelWithDebInfo + ReleaseOS name -- cgit v1.2.3 From 8f0d59cab387b266ce777a0487effeb5da89f1f1 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 6 Apr 2011 05:46:45 -0400 Subject: OPEN-50 (partial): refactor cmake switches to common configurations and default values --- autobuild.xml | 69 ++++++--------------------------------------- indra/cmake/Variables.cmake | 1 + 2 files changed, 10 insertions(+), 60 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index a6444b0b86..d78ef2325a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1590,7 +1590,6 @@ options -DCMAKE_BUILD_TYPE:STRING=Debug - -DUNATTENDED:BOOL=OFF -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife @@ -1607,9 +1606,11 @@ options -DCMAKE_BUILD_TYPE:STRING=Debug - -DUNATTENDED:BOOL=OFF -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife + -DINSTALL_PROPRIETARY=FALSE + -DUSE_PRECOMPILED_HEADERS=ON + -DFMOD=FALSE name @@ -1627,7 +1628,6 @@ options -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo - -DUNATTENDED:BOOL=OFF -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife @@ -1644,9 +1644,11 @@ options -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo - -DUNATTENDED:BOOL=OFF -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife + -DINSTALL_PROPRIETARY=FALSE + -DUSE_PRECOMPILED_HEADERS=ON + -DFMOD=FALSE name @@ -1664,7 +1666,6 @@ options -DCMAKE_BUILD_TYPE:STRING=Release - -DUNATTENDED:BOOL=OFF -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife @@ -1681,9 +1682,11 @@ options -DCMAKE_BUILD_TYPE:STRING=Release - -DUNATTENDED:BOOL=OFF -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife + -DINSTALL_PROPRIETARY=FALSE + -DUSE_PRECOMPILED_HEADERS=ON + -DFMOD=FALSE name @@ -1728,9 +1731,6 @@ -G 'Xcode' - -DSTANDALONE:BOOL=OFF - -DINSTALL_PROPRIETARY=TRUE - -DFMOD=TRUE name @@ -1758,9 +1758,6 @@ -G 'Xcode' - -DSTANDALONE:BOOL=FALSE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE name @@ -1795,9 +1792,6 @@ -G 'Xcode' - -DSTANDALONE:BOOL=OFF - -DINSTALL_PROPRIETARY=TRUE - -DFMOD=TRUE default @@ -1827,9 +1821,6 @@ -G 'Xcode' - -DSTANDALONE:BOOL=FALSE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE name @@ -1864,9 +1855,6 @@ -G 'Xcode' - -DSTANDALONE:BOOL=OFF - -DINSTALL_PROPRIETARY=TRUE - -DFMOD=TRUE name @@ -1894,9 +1882,6 @@ -G 'Xcode' - -DSTANDALONE:BOOL=FALSE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE name @@ -1933,9 +1918,6 @@ -G 'Unix Makefiles' - -DSTANDALONE:BOOL=OFF - -DINSTALL_PROPRIETARY=TRUE - -DFMOD=TRUE name @@ -1962,9 +1944,6 @@ -G 'Unix Makefiles' - -DSTANDALONE:BOOL=FALSE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE name @@ -1991,9 +1970,6 @@ -G 'Unix Makefiles' - -DSTANDALONE:BOOL=OFF - -DINSTALL_PROPRIETARY=TRUE - -DFMOD=TRUE default @@ -2022,9 +1998,6 @@ -G 'Unix Makefiles' - -DSTANDALONE:BOOL=FALSE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE name @@ -2051,9 +2024,6 @@ -G 'Unix Makefiles' - -DSTANDALONE:BOOL=OFF - -DINSTALL_PROPRIETARY=TRUE - -DFMOD=TRUE name @@ -2080,9 +2050,6 @@ -G 'Unix Makefiles' - -DSTANDALONE:BOOL=FALSE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE name @@ -2140,9 +2107,6 @@ -G "Visual Studio 10" - -DSTANDALONE:BOOL=OFF - -DINSTALL_PROPRIETARY=TRUE - -DFMOD=TRUE name @@ -2182,9 +2146,6 @@ -G "Visual Studio 10" - -DSTANDALONE:BOOL=FALSE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE name @@ -2224,9 +2185,6 @@ -G "Visual Studio 10" - -DSTANDALONE:BOOL=OFF - -DINSTALL_PROPRIETARY=TRUE - -DFMOD=TRUE default @@ -2260,9 +2218,6 @@ -G "Visual Studio 10" - -DSTANDALONE:BOOL=FALSE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE name @@ -2303,9 +2258,6 @@ -G "Visual Studio 10" - -DSTANDALONE:BOOL=OFF - -DINSTALL_PROPRIETARY=TRUE - -DFMOD=TRUE name @@ -2337,9 +2289,6 @@ -G "Visual Studio 10" - -DSTANDALONE:BOOL=FALSE - -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE name diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 77dd34d122..8c9c375790 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -135,6 +135,7 @@ set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside") set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") +set(UNATTENDED OFF CACHE BOOL "Should be set to ON for building with VC Express editions.") if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) set(SERVER ON CACHE BOOL "Build Second Life server software.") -- cgit v1.2.3 From 31576e2d51214b5f535d9dc01a72f702cdc734a0 Mon Sep 17 00:00:00 2001 From: "niel@nirvana.planescape.home" Date: Wed, 6 Apr 2011 23:26:05 +0100 Subject: OPEN-50 Changing windows build command from 'devenv.com', to 'msbuild.exe' along with associated options and arguments. --- autobuild.xml | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index d78ef2325a..b90c6ec2f3 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2121,26 +2121,23 @@ SecondLife.sln command - devenv.com + msbuild.exe options - /build - Debug + /p:Configuration=Debug + /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 - Debug - --startup - secondlife-bin options @@ -2201,11 +2198,16 @@ SecondLife.sln command - devenv.com + msbuild.exe options - /build - RelWithDebInfo + /p:Configuration=RelWithDebInfo + /p:Platform=Win32 + /t:Build + /p:useenv=true + /verbosity:minimal + /toolsversion:4.0 + /p:"VCBuildAdditionalOptions= /incremental" configure @@ -2272,11 +2274,16 @@ SecondLife.sln command - devenv.com + msbuild.exe options - /build - Release + /p:Configuration=Release + /p:Platform=Win32 + /t:Build + /p:useenv=true + /verbosity:minimal + /toolsversion:4.0 + /p:"VCBuildAdditionalOptions= /incremental" configure -- cgit v1.2.3 From 8cf15f1778e941f8aa33442095f1ad37f793a855 Mon Sep 17 00:00:00 2001 From: "niel@nirvana.planescape.home" Date: Thu, 7 Apr 2011 12:41:43 +0100 Subject: OPEN-50 Adding UNATTENDED=ON to Windows' configurations so that the viewer can be built by all users out-of-the-box. OS Devs with full VS can switch it on if they want, however this is not needed any more for Open Source builds. --- autobuild.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/autobuild.xml b/autobuild.xml index b90c6ec2f3..f71a2621ba 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2143,6 +2143,7 @@ -G "Visual Studio 10" + -DUNATTENDED:BOOL=ON name @@ -2220,6 +2221,7 @@ -G "Visual Studio 10" + -DUNATTENDED:BOOL=ON name @@ -2296,6 +2298,7 @@ -G "Visual Studio 10" + -DUNATTENDED:BOOL=ON name -- cgit v1.2.3 From b996d6cb6a2c1a98a25007cf68050231b55186ea Mon Sep 17 00:00:00 2001 From: "niel@nirvana.planescape.home" Date: Thu, 7 Apr 2011 12:54:17 +0100 Subject: OPEN-50 Moving common configuration arguments to the common entries. --- autobuild.xml | 48 ++++++++++++------------------------------------ 1 file changed, 12 insertions(+), 36 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index f71a2621ba..c14e24d904 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1612,6 +1612,10 @@ -DUSE_PRECOMPILED_HEADERS=ON -DFMOD=FALSE + arguments + + ../indra + name DebugOS @@ -1650,6 +1654,10 @@ -DUSE_PRECOMPILED_HEADERS=ON -DFMOD=FALSE + arguments + + ../indra + name RelWithDebInfoOS @@ -1688,6 +1696,10 @@ -DUSE_PRECOMPILED_HEADERS=ON -DFMOD=FALSE + arguments + + ../indra + name ReleaseOS @@ -1750,10 +1762,6 @@ configure - arguments - - ../indra - options -G @@ -1813,10 +1821,6 @@ configure - arguments - - ../indra - options -G @@ -1874,10 +1878,6 @@ configure - arguments - - ../indra - options -G @@ -1936,10 +1936,6 @@ configure - arguments - - ../indra - options -G @@ -1990,10 +1986,6 @@ configure - arguments - - ../indra - options -G @@ -2042,10 +2034,6 @@ configure - arguments - - ../indra - options -G @@ -2135,10 +2123,6 @@ configure - arguments - - SecondLife.sln - options -G @@ -2213,10 +2197,6 @@ configure - arguments - - ../indra - options -G @@ -2290,10 +2270,6 @@ configure - arguments - - ../indra - options -G -- cgit v1.2.3 From fa5852a71002eccf6d8083307faac1c51090399b Mon Sep 17 00:00:00 2001 From: "niel@nirvana.planescape.home" Date: Thu, 7 Apr 2011 14:27:39 +0100 Subject: OPEN-50 Changed the default number of job slots, for Linux configurations, to a level (2) that all should be able to manage. --- autobuild.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index c14e24d904..3fc0ab5edf 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1931,7 +1931,7 @@ make options - -j 12 + -j 2 configure @@ -1981,7 +1981,7 @@ make options - -j 12 + -j 2 configure @@ -2029,7 +2029,7 @@ make options - -j 12 + -j 2 configure -- cgit v1.2.3 From 86a66cea7482428f8314a49d1b8ea2a1b2bad687 Mon Sep 17 00:00:00 2001 From: "niel@nirvana.planescape.home" Date: Sat, 9 Apr 2011 16:44:02 +0100 Subject: OPEN-50 Adding missing options for VC Release build --- autobuild.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/autobuild.xml b/autobuild.xml index 3fc0ab5edf..76e551938a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1676,6 +1676,9 @@ -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 -- cgit v1.2.3 From d4ac1fec779437136d19421076ee7fdf3575207f Mon Sep 17 00:00:00 2001 From: "niel@nirvana.planescape.home" Date: Mon, 11 Apr 2011 21:04:02 +0100 Subject: OPEN-50 Moved USE_PRECOMPILED_HEADERS=ON from common, to Windows only settings as it doesn't appear to be used by others. --- autobuild.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 76e551938a..4acad499a9 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1609,7 +1609,6 @@ -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=FALSE - -DUSE_PRECOMPILED_HEADERS=ON -DFMOD=FALSE arguments @@ -1651,7 +1650,6 @@ -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=FALSE - -DUSE_PRECOMPILED_HEADERS=ON -DFMOD=FALSE arguments @@ -1696,7 +1694,6 @@ -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=FALSE - -DUSE_PRECOMPILED_HEADERS=ON -DFMOD=FALSE arguments @@ -2131,6 +2128,7 @@ -G "Visual Studio 10" -DUNATTENDED:BOOL=ON + -DUSE_PRECOMPILED_HEADERS=ON name @@ -2205,6 +2203,7 @@ -G "Visual Studio 10" -DUNATTENDED:BOOL=ON + -DUSE_PRECOMPILED_HEADERS=ON name @@ -2278,6 +2277,7 @@ -G "Visual Studio 10" -DUNATTENDED:BOOL=ON + -DUSE_PRECOMPILED_HEADERS=ON name -- cgit v1.2.3 From a32080afac1316154282e4ad2361af6bdce5e2a5 Mon Sep 17 00:00:00 2001 From: "niel@nirvana.planescape.home" Date: Mon, 11 Apr 2011 21:24:04 +0100 Subject: OPEN-50 Removing unnecessary FMOD=FALSE from common. INSTALL_PROPRIETARY=FALSE covers this. --- autobuild.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 4acad499a9..1352e92ecc 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1609,7 +1609,6 @@ -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE arguments @@ -1650,7 +1649,6 @@ -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE arguments @@ -1694,7 +1692,6 @@ -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=FALSE - -DFMOD=FALSE arguments -- cgit v1.2.3 From 8fbe2bc2d6eebb6d225e59e25fae36137bca0418 Mon Sep 17 00:00:00 2001 From: "niel@nirvana.planescape.home" Date: Mon, 11 Apr 2011 21:27:24 +0100 Subject: OPEN-50 Adding settings to Windows for controlling proprietary libs. This allows quictime to be used. Additionally, once a solution for FMOD is found this can also be enabled. --- autobuild.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/autobuild.xml b/autobuild.xml index 1352e92ecc..c5ec4b98ea 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2126,6 +2126,9 @@ "Visual Studio 10" -DUNATTENDED:BOOL=ON -DUSE_PRECOMPILED_HEADERS=ON + -DINSTALL_PROPRIETARY=TRUE + -DUSE_KDU=FALSE + -DFMOD=FALSE name @@ -2201,6 +2204,9 @@ "Visual Studio 10" -DUNATTENDED:BOOL=ON -DUSE_PRECOMPILED_HEADERS=ON + -DINSTALL_PROPRIETARY=TRUE + -DUSE_KDU=FALSE + -DFMOD=FALSE name @@ -2275,6 +2281,9 @@ "Visual Studio 10" -DUNATTENDED:BOOL=ON -DUSE_PRECOMPILED_HEADERS=ON + -DINSTALL_PROPRIETARY=TRUE + -DUSE_KDU=FALSE + -DFMOD=FALSE name -- cgit v1.2.3 From 36d528e5dfb8ff8d5a349a023c2ebb95c5efb158 Mon Sep 17 00:00:00 2001 From: "niel@nirvana.planescape.home" Date: Mon, 11 Apr 2011 21:29:50 +0100 Subject: OPEN-50 Adding LL_RELEASE_FOR_DOWNLOAD to ReleaseOS's common settings. --- autobuild.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/autobuild.xml b/autobuild.xml index c5ec4b98ea..a9ab71da29 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1692,6 +1692,7 @@ -DWORD_SIZE:STRING=32 -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=FALSE + -DLL_RELEASE_FOR_DOWNLOAD:BOOL=YES arguments -- cgit v1.2.3 -- cgit v1.2.3 From 4ce6d2d909b2298f0165cb90247b3a59ab286c94 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 19 Apr 2011 14:02:29 -0400 Subject: increment viewer version to 2.6.6 --- indra/llcommon/llversionviewer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index bd6df962a1..df5afcbf1c 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,7 +29,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 6; -const S32 LL_VERSION_PATCH = 5; +const S32 LL_VERSION_PATCH = 6; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; -- cgit v1.2.3