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