diff options
| -rw-r--r-- | autobuild.xml | 593 | 
1 files 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 @@                <key>name</key>                <string>Debug</string>              </map> -            <key>OpenSourceDebug</key> +            <key>DebugOS</key>              <map>                <key>configure</key>                <map> @@ -1613,61 +1613,13 @@                  </array>                </map>                <key>name</key> -              <string>OpenSourceDebug</string> +              <string>DebugOS</string>              </map> -            <key>OpenSourceRelWithDebInfo</key> -            <map> -              <key>configure</key> -              <map> -                <key>command</key> -                <string>cmake</string> -                <key>options</key> -                <array> -                  <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string> -                  <string>-DUNATTENDED:BOOL=OFF</string> -                  <string>-DWORD_SIZE:STRING=32</string> -                  <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> -                </array> -              </map> -              <key>name</key> -              <string>OpenSourceRelWithDebInfo</string> -            </map> -            <key>OpenSourceRelease</key> -            <map> -              <key>configure</key> -              <map> -                <key>command</key> -                <string>cmake</string> -                <key>options</key> -                <array> -                  <string>-DCMAKE_BUILD_TYPE:STRING=Release</string> -                  <string>-DUNATTENDED:BOOL=OFF</string> -                  <string>-DWORD_SIZE:STRING=32</string> -                  <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> -                </array> -              </map> -              <key>name</key> -              <string>OpenSourceRelease</string> -            </map> -            <key>OpenSourceStandAloneDebug</key> +            <key>RelWithDebInfo</key>              <map> -              <key>configure</key> +              <key>build</key>                <map> -                <key>command</key> -                <string>cmake</string> -                <key>options</key> -                <array> -                  <string>-DCMAKE_BUILD_TYPE:STRING=Debug</string> -                  <string>-DUNATTENDED:BOOL=OFF</string> -                  <string>-DWORD_SIZE:STRING=32</string> -                  <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> -                </array>                </map> -              <key>name</key> -              <string>OpenSourceStandAloneDebug</string> -            </map> -            <key>OpenSourceStandAloneRelWithDebInfo</key> -            <map>                <key>configure</key>                <map>                  <key>command</key> @@ -1681,9 +1633,9 @@                  </array>                </map>                <key>name</key> -              <string>OpenSourceStandAloneRelWithDebInfo</string> +              <string>RelWithDebInfo</string>              </map> -            <key>OpenSourceStandAloneRelease</key> +            <key>RelWithDebInfoOS</key>              <map>                <key>configure</key>                <map> @@ -1691,26 +1643,6 @@                  <string>cmake</string>                  <key>options</key>                  <array> -                  <string>-DCMAKE_BUILD_TYPE:STRING=Release</string> -                  <string>-DUNATTENDED:BOOL=OFF</string> -                  <string>-DWORD_SIZE:STRING=32</string> -                  <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> -                </array> -              </map> -              <key>name</key> -              <string>OpenSourceStandAloneRelease</string> -            </map> -            <key>RelWithDebInfo</key> -            <map> -              <key>build</key> -              <map> -              </map> -              <key>configure</key> -              <map> -                <key>command</key> -                <string>cmake</string> -                <key>options</key> -                <array>                    <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>                    <string>-DUNATTENDED:BOOL=OFF</string>                    <string>-DWORD_SIZE:STRING=32</string> @@ -1718,7 +1650,7 @@                  </array>                </map>                <key>name</key> -              <string>RelWithDebInfo</string> +              <string>RelWithDebInfoOS</string>              </map>              <key>Release</key>              <map> @@ -1740,35 +1672,10 @@                <key>name</key>                <string>Release</string>              </map> -            <key>VC10msbuildRelWithDebInfo</key> +            <key>ReleaseOS</key>              <map>                <key>configure</key>                <map> -                <key>arguments</key> -                <array> -                  <string>../indra</string> -                </array> -                <key>command</key> -                <string>cmake</string> -                <key>options</key> -                <array> -                  <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string> -                  <string>-DUNATTENDED:BOOL=OFF</string> -                  <string>-DWORD_SIZE:STRING=32</string> -                  <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> -                </array> -              </map> -              <key>name</key> -              <string>VC10msbuildRelWithDebInfo</string> -            </map> -            <key>VC10msbuildRelease</key> -            <map> -              <key>configure</key> -              <map> -                <key>arguments</key> -                <array> -                  <string>../indra</string> -                </array>                  <key>command</key>                  <string>cmake</string>                  <key>options</key> @@ -1780,28 +1687,7 @@                  </array>                </map>                <key>name</key> -              <string>VC10msbuildRelease</string> -            </map> -            <key>VCexpressRelWithDebInfo</key> -            <map> -              <key>configure</key> -              <map> -                <key>arguments</key> -                <array> -                  <string>../indra</string> -                </array> -                <key>command</key> -                <string>cmake</string> -                <key>options</key> -                <array> -                  <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string> -                  <string>-DUNATTENDED:BOOL=OFF</string> -                  <string>-DWORD_SIZE:STRING=32</string> -                  <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> -                </array> -              </map> -              <key>name</key> -              <string>VCexpressRelWithDebInfo</string> +              <string>ReleaseOS</string>              </map>            </map>            <key>name</key> @@ -1850,7 +1736,7 @@                <key>name</key>                <string>Debug</string>              </map> -            <key>OpenSourceDebug</key> +            <key>DebugOS</key>              <map>                <key>build</key>                <map> @@ -1878,102 +1764,19 @@                  </array>                </map>                <key>name</key> -              <string>OpenSourceDebug</string> +              <string>DebugOS</string>              </map> -            <key>OpenSourceRelWithDebInfo</key> -            <map> -              <key>build</key> -              <map> -                <key>command</key> -                <string>xcodebuild</string> -                <key>options</key> -                <array> -                  <string>-configuration RelWithDebInfo</string> -                  <string>-project SecondLife.xcodeproj</string> -                </array> -              </map> -              <key>configure</key> -              <map> -                <key>arguments</key> -                <array> -                  <string>../indra</string> -                </array> -                <key>options</key> -                <array> -                  <string>-G</string> -                  <string>'Xcode'</string> -                  <string>-DSTANDALONE:BOOL=FALSE</string> -                  <string>-DINSTALL_PROPRIETARY=FALSE</string> -                  <string>-DFMOD=FALSE</string> -                </array> -              </map> -              <key>name</key> -              <string>OpenSourceRelWithDebInfo</string> -            </map> -            <key>OpenSourceRelease</key> -            <map> -              <key>build</key> -              <map> -                <key>command</key> -                <string>xcodebuild</string> -                <key>options</key> -                <array> -                  <string>-configuration Release</string> -                  <string>-project SecondLife.xcodeproj</string> -                </array> -              </map> -              <key>configure</key> -              <map> -                <key>arguments</key> -                <array> -                  <string>../indra</string> -                </array> -                <key>options</key> -                <array> -                  <string>-G</string> -                  <string>'Xcode'</string> -                  <string>-DSTANDALONE:BOOL=FALSE</string> -                  <string>-DINSTALL_PROPRIETARY=FALSE</string> -                  <string>-DFMOD=FALSE</string> -                </array> -              </map> -              <key>name</key> -              <string>OpenSourceRelease</string> -            </map> -            <key>OpenSourceStandAloneDebug</key> +            <key>RelWithDebInfo</key>              <map>                <key>build</key>                <map> -                <key>command</key> -                <string>xcodebuild</string> -                <key>options</key> -                <array> -                  <string>-configuration Debug</string> -                  <string>-project SecondLife.xcodeproj</string> -                </array> -              </map> -              <key>configure</key> -              <map>                  <key>arguments</key>                  <array> -                  <string>../indra</string> -                </array> -                <key>options</key> -                <array> -                  <string>-G</string> -                  <string>'Xcode'</string> -                  <string>-DSTANDALONE:BOOL=TRUE</string> -                  <string>-DINSTALL_PROPRIETARY=FALSE</string> -                  <string>-DFMOD=FALSE</string> +                  <string>|</string> +                  <string>grep</string> +                  <string>-v</string> +                  <string>setenv</string>                  </array> -              </map> -              <key>name</key> -              <string>OpenSourceStandAloneDebug</string> -            </map> -            <key>OpenSourceStandAloneRelWithDebInfo</key> -            <map> -              <key>build</key> -              <map>                  <key>command</key>                  <string>xcodebuild</string>                  <key>options</key> @@ -1992,15 +1795,17 @@                  <array>                    <string>-G</string>                    <string>'Xcode'</string> -                  <string>-DSTANDALONE:BOOL=TRUE</string> -                  <string>-DINSTALL_PROPRIETARY=FALSE</string> -                  <string>-DFMOD=FALSE</string> +                  <string>-DSTANDALONE:BOOL=OFF</string> +                  <string>-DINSTALL_PROPRIETARY=TRUE</string> +                  <string>-DFMOD=TRUE</string>                  </array>                </map> +              <key>default</key> +              <string>True</string>                <key>name</key> -              <string>OpenSourceStandAloneRelWithDebInfo</string> +              <string>RelWithDebInfo</string>              </map> -            <key>OpenSourceStandAloneRelease</key> +            <key>RelWithDebInfoOS</key>              <map>                <key>build</key>                <map> @@ -2008,7 +1813,7 @@                  <string>xcodebuild</string>                  <key>options</key>                  <array> -                  <string>-configuration Release</string> +                  <string>-configuration RelWithDebInfo</string>                    <string>-project SecondLife.xcodeproj</string>                  </array>                </map> @@ -2022,15 +1827,15 @@                  <array>                    <string>-G</string>                    <string>'Xcode'</string> -                  <string>-DSTANDALONE:BOOL=TRUE</string> +                  <string>-DSTANDALONE:BOOL=FALSE</string>                    <string>-DINSTALL_PROPRIETARY=FALSE</string>                    <string>-DFMOD=FALSE</string>                  </array>                </map>                <key>name</key> -              <string>OpenSourceStandAloneRelease</string> +              <string>RelWithDebInfoOS</string>              </map> -            <key>RelWithDebInfo</key> +            <key>Release</key>              <map>                <key>build</key>                <map> @@ -2045,7 +1850,7 @@                  <string>xcodebuild</string>                  <key>options</key>                  <array> -                  <string>-configuration RelWithDebInfo</string> +                  <string>-configuration Release</string>                    <string>-project SecondLife.xcodeproj</string>                  </array>                </map> @@ -2064,22 +1869,13 @@                    <string>-DFMOD=TRUE</string>                  </array>                </map> -              <key>default</key> -              <string>True</string>                <key>name</key> -              <string>RelWithDebInfo</string> +              <string>Release</string>              </map> -            <key>Release</key> +            <key>ReleaseOS</key>              <map>                <key>build</key>                <map> -                <key>arguments</key> -                <array> -                  <string>|</string> -                  <string>grep</string> -                  <string>-v</string> -                  <string>setenv</string> -                </array>                  <key>command</key>                  <string>xcodebuild</string>                  <key>options</key> @@ -2098,13 +1894,13 @@                  <array>                    <string>-G</string>                    <string>'Xcode'</string> -                  <string>-DSTANDALONE:BOOL=OFF</string> -                  <string>-DINSTALL_PROPRIETARY=TRUE</string> -                  <string>-DFMOD=TRUE</string> +                  <string>-DSTANDALONE:BOOL=FALSE</string> +                  <string>-DINSTALL_PROPRIETARY=FALSE</string> +                  <string>-DFMOD=FALSE</string>                  </array>                </map>                <key>name</key> -              <string>Release</string> +              <string>ReleaseOS</string>              </map>            </map>            <key>name</key> @@ -2145,7 +1941,7 @@                <key>name</key>                <string>Debug</string>              </map> -            <key>OpenSourceDebug</key> +            <key>DebugOS</key>              <map>                <key>build</key>                <map> @@ -2172,9 +1968,9 @@                  </array>                </map>                <key>name</key> -              <string>OpenSourceDebug</string> +              <string>DebugOS</string>              </map> -            <key>OpenSourceRelWithDebInfo</key> +            <key>RelWithDebInfo</key>              <map>                <key>build</key>                <map> @@ -2195,15 +1991,17 @@                  <array>                    <string>-G</string>                    <string>'Unix Makefiles'</string> -                  <string>-DSTANDALONE:BOOL=FALSE</string> -                  <string>-DINSTALL_PROPRIETARY=FALSE</string> -                  <string>-DFMOD=FALSE</string> +                  <string>-DSTANDALONE:BOOL=OFF</string> +                  <string>-DINSTALL_PROPRIETARY=TRUE</string> +                  <string>-DFMOD=TRUE</string>                  </array>                </map> +              <key>default</key> +              <string>True</string>                <key>name</key> -              <string>OpenSourceRelWithDebInfo</string> +              <string>RelWithDebInfo</string>              </map> -            <key>OpenSourceRelease</key> +            <key>RelWithDebInfoOS</key>              <map>                <key>build</key>                <map> @@ -2230,96 +2028,9 @@                  </array>                </map>                <key>name</key> -              <string>OpenSourceRelease</string> +              <string>RelWithDebInfoOS</string>              </map> -            <key>OpenSourceStandAloneDebug</key> -            <map> -              <key>build</key> -              <map> -                <key>command</key> -                <string>make</string> -                <key>options</key> -                <array> -                  <string>-j 12</string> -                </array> -              </map> -              <key>configure</key> -              <map> -                <key>arguments</key> -                <array> -                  <string>../indra</string> -                </array> -                <key>options</key> -                <array> -                  <string>-G</string> -                  <string>'Unix Makefiles'</string> -                  <string>-DSTANDALONE:BOOL=TRUE</string> -                  <string>-DINSTALL_PROPRIETARY=FALSE</string> -                  <string>-DFMOD=FALSE</string> -                </array> -              </map> -              <key>name</key> -              <string>OpenSourceStandAloneDebug</string> -            </map> -            <key>OpenSourceStandAloneRelWithDebInfo</key> -            <map> -              <key>build</key> -              <map> -                <key>command</key> -                <string>make</string> -                <key>options</key> -                <array> -                  <string>-j 12</string> -                </array> -              </map> -              <key>configure</key> -              <map> -                <key>arguments</key> -                <array> -                  <string>../indra</string> -                </array> -                <key>options</key> -                <array> -                  <string>-G</string> -                  <string>'Unix Makefiles'</string> -                  <string>-DSTANDALONE:BOOL=TRUE</string> -                  <string>-DINSTALL_PROPRIETARY=FALSE</string> -                  <string>-DFMOD=FALSE</string> -                </array> -              </map> -              <key>name</key> -              <string>OpenSourceStandAloneRelWithDebInfo</string> -            </map> -            <key>OpenSourceStandAloneRelease</key> -            <map> -              <key>build</key> -              <map> -                <key>command</key> -                <string>make</string> -                <key>options</key> -                <array> -                  <string>-j 12</string> -                </array> -              </map> -              <key>configure</key> -              <map> -                <key>arguments</key> -                <array> -                  <string>../indra</string> -                </array> -                <key>options</key> -                <array> -                  <string>-G</string> -                  <string>'Unix Makefiles'</string> -                  <string>-DSTANDALONE:BOOL=TRUE</string> -                  <string>-DINSTALL_PROPRIETARY=FALSE</string> -                  <string>-DFMOD=FALSE</string> -                </array> -              </map> -              <key>name</key> -              <string>OpenSourceStandAloneRelease</string> -            </map> -            <key>RelWithDebInfo</key> +            <key>Release</key>              <map>                <key>build</key>                <map> @@ -2345,12 +2056,10 @@                    <string>-DFMOD=TRUE</string>                  </array>                </map> -              <key>default</key> -              <string>True</string>                <key>name</key> -              <string>RelWithDebInfo</string> +              <string>Release</string>              </map> -            <key>Release</key> +            <key>ReleaseOS</key>              <map>                <key>build</key>                <map> @@ -2371,13 +2080,13 @@                  <array>                    <string>-G</string>                    <string>'Unix Makefiles'</string> -                  <string>-DSTANDALONE:BOOL=OFF</string> -                  <string>-DINSTALL_PROPRIETARY=TRUE</string> -                  <string>-DFMOD=TRUE</string> +                  <string>-DSTANDALONE:BOOL=FALSE</string> +                  <string>-DINSTALL_PROPRIETARY=FALSE</string> +                  <string>-DFMOD=FALSE</string>                  </array>                </map>                <key>name</key> -              <string>Release</string> +              <string>ReleaseOS</string>              </map>              <key>default</key>              <map> @@ -2439,7 +2148,7 @@                <key>name</key>                <string>Debug</string>              </map> -            <key>OpenSourceDebug</key> +            <key>DebugOS</key>              <map>                <key>build</key>                <map> @@ -2479,77 +2188,9 @@                  </array>                </map>                <key>name</key> -              <string>OpenSourceDebug</string> -            </map> -            <key>OpenSourceRelWithDebInfo</key> -            <map> -              <key>build</key> -              <map> -                <key>arguments</key> -                <array> -                  <string>SecondLife.sln</string> -                </array> -                <key>command</key> -                <string>devenv.com</string> -                <key>options</key> -                <array> -                  <string>/build</string> -                  <string>RelWithDebInfo</string> -                </array> -              </map> -              <key>configure</key> -              <map> -                <key>arguments</key> -                <array> -                  <string>../indra</string> -                </array> -                <key>options</key> -                <array> -                  <string>-G</string> -                  <string>"Visual Studio 10"</string> -                  <string>-DSTANDALONE:BOOL=FALSE</string> -                  <string>-DINSTALL_PROPRIETARY=FALSE</string> -                  <string>-DFMOD=FALSE</string> -                </array> -              </map> -              <key>name</key> -              <string>OpenSourceRelWithDebInfo</string> -            </map> -            <key>OpenSourceRelease</key> -            <map> -              <key>build</key> -              <map> -                <key>arguments</key> -                <array> -                  <string>SecondLife.sln</string> -                </array> -                <key>command</key> -                <string>devenv.com</string> -                <key>options</key> -                <array> -                  <string>/build</string> -                  <string>Release</string> -                </array> -              </map> -              <key>configure</key> -              <map> -                <key>arguments</key> -                <array> -                  <string>../indra</string> -                </array> -                <key>options</key> -                <array> -                  <string>-G</string> -                  <string>"Visual Studio 10"</string> -                  <string>-DSTANDALONE:BOOL=FALSE</string> -                  <string>-DINSTALL_PROPRIETARY=FALSE</string> -                  <string>-DFMOD=FALSE</string> -                </array> -              </map> -              <key>name</key> -              <string>OpenSourceRelease</string> +              <string>DebugOS</string>              </map> -            <key>OpenSourceStandAloneDebug</key> +            <key>RelWithDebInfo</key>              <map>                <key>build</key>                <map> @@ -2558,11 +2199,11 @@                    <string>SecondLife.sln</string>                  </array>                  <key>command</key> -                <string>devenv.com</string> +                <string>BuildConsole</string>                  <key>options</key>                  <array>                    <string>/build</string> -                  <string>Debug</string> +                  <string>"/cfg=RelWithDebInfo|Win32"</string>                  </array>                </map>                <key>configure</key> @@ -2583,15 +2224,17 @@                  <array>                    <string>-G</string>                    <string>"Visual Studio 10"</string> -                  <string>-DSTANDALONE:BOOL=TRUE</string> -                  <string>-DINSTALL_PROPRIETARY=FALSE</string> -                  <string>-DFMOD=FALSE</string> +                  <string>-DSTANDALONE:BOOL=OFF</string> +                  <string>-DINSTALL_PROPRIETARY=TRUE</string> +                  <string>-DFMOD=TRUE</string>                  </array>                </map> +              <key>default</key> +              <string>True</string>                <key>name</key> -              <string>OpenSourceStandAloneDebug</string> +              <string>RelWithDebInfo</string>              </map> -            <key>OpenSourceStandAloneRelWithDebInfo</key> +            <key>RelWithDebInfoOS</key>              <map>                <key>build</key>                <map> @@ -2617,91 +2260,13 @@                  <array>                    <string>-G</string>                    <string>"Visual Studio 10"</string> -                  <string>-DSTANDALONE:BOOL=TRUE</string> -                  <string>-DINSTALL_PROPRIETARY=FALSE</string> -                  <string>-DFMOD=FALSE</string> -                </array> -              </map> -              <key>name</key> -              <string>OpenSourceStandAloneRelWithDebInfo</string> -            </map> -            <key>OpenSourceStandAloneRelease</key> -            <map> -              <key>build</key> -              <map> -                <key>arguments</key> -                <array> -                  <string>SecondLife.sln</string> -                </array> -                <key>command</key> -                <string>devenv.com</string> -                <key>options</key> -                <array> -                  <string>/build</string> -                  <string>Release</string> -                </array> -              </map> -              <key>configure</key> -              <map> -                <key>arguments</key> -                <array> -                  <string>../indra</string> -                </array> -                <key>options</key> -                <array> -                  <string>-G</string> -                  <string>"Visual Studio 10"</string> -                  <string>-DSTANDALONE:BOOL=TRUE</string> +                  <string>-DSTANDALONE:BOOL=FALSE</string>                    <string>-DINSTALL_PROPRIETARY=FALSE</string>                    <string>-DFMOD=FALSE</string>                  </array>                </map>                <key>name</key> -              <string>OpenSourceStandAloneRelease</string> -            </map> -            <key>RelWithDebInfo</key> -            <map> -              <key>build</key> -              <map> -                <key>arguments</key> -                <array> -                  <string>SecondLife.sln</string> -                </array> -                <key>command</key> -                <string>BuildConsole</string> -                <key>options</key> -                <array> -                  <string>/build</string> -                  <string>"/cfg=RelWithDebInfo|Win32"</string> -                </array> -              </map> -              <key>configure</key> -              <map> -                <key>arguments</key> -                <array> -                  <string>..\indra</string> -                  <string>&&</string> -                  <string>..\indra\tools\vstool\VSTool.exe</string> -                  <string>--solution</string> -                  <string>SecondLife.sln</string> -                  <string>--config</string> -                  <string>RelWithDebInfo</string> -                  <string>--startup</string> -                  <string>secondlife-bin</string> -                </array> -                <key>options</key> -                <array> -                  <string>-G</string> -                  <string>"Visual Studio 10"</string> -                  <string>-DSTANDALONE:BOOL=OFF</string> -                  <string>-DINSTALL_PROPRIETARY=TRUE</string> -                  <string>-DFMOD=TRUE</string> -                </array> -              </map> -              <key>default</key> -              <string>True</string> -              <key>name</key> -              <string>RelWithDebInfo</string> +              <string>RelWithDebInfoOS</string>              </map>              <key>Release</key>              <map> @@ -2746,34 +2311,28 @@                <key>name</key>                <string>Release</string>              </map> -            <key>VC10msbuildRelWithDebInfo</key> -            <map> -              <key>name</key> -              <string>VC10msbuildRelWithDebInfo</string> -            </map> -            <key>VC10msbuildRelease</key> -            <map> -              <key>name</key> -              <string>VC10msbuildRelease</string> -            </map> -            <key>VCexpressRelWithDebInfo</key> +            <key>ReleaseOS</key>              <map>                <key>build</key>                <map>                  <key>arguments</key>                  <array> -                  <string>"RelWithDebInfo|Win32"</string> +                  <string>SecondLife.sln</string>                  </array>                  <key>command</key> -                <string>vcbuild.exe</string> +                <string>devenv.com</string>                  <key>options</key>                  <array> -                  <string>/u</string> -                  <string>SecondLife.sln</string> +                  <string>/build</string> +                  <string>Release</string>                  </array>                </map>                <key>configure</key>                <map> +                <key>arguments</key> +                <array> +                  <string>../indra</string> +                </array>                  <key>options</key>                  <array>                    <string>-G</string> @@ -2784,7 +2343,7 @@                  </array>                </map>                <key>name</key> -              <string>VCexpressRelWithDebInfo</string> +              <string>ReleaseOS</string>              </map>            </map>            <key>name</key> | 
