diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-02-27 14:29:34 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-02-27 14:29:34 -0500 |
| commit | 71141cc463dfef75a9991a781e0537c53f81ea3e (patch) | |
| tree | 74aa78d19b26791a452b7198faa55524b3fceae9 | |
| parent | 18892418f8c902d5b31cf7435e3958f11a64623f (diff) | |
Backed out changeset f753369355e8 (removing ReleaseOS, RelWithDebInfoOS)
Restore the MumbleOS build configs: they differ in settings, not only in the
build engine.
| -rwxr-xr-x | autobuild.xml | 228 |
1 files changed, 228 insertions, 0 deletions
diff --git a/autobuild.xml b/autobuild.xml index de70b6bc88..c123abf9cf 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -2352,6 +2352,27 @@ <key>name</key> <string>RelWithDebInfo</string> </map> + <key>RelWithDebInfoOS</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>-DWORD_SIZE:STRING=32</string> + <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> + <string>-DINSTALL_PROPRIETARY=FALSE</string> + </array> + </map> + <key>name</key> + <string>RelWithDebInfoOS</string> + </map> <key>Release</key> <map> <key>build</key> @@ -2372,6 +2393,27 @@ <key>name</key> <string>Release</string> </map> + <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=Release</string> + <string>-DWORD_SIZE:STRING=32</string> + <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> + <string>-DINSTALL_PROPRIETARY=FALSE</string> + </array> + </map> + <key>name</key> + <string>ReleaseOS</string> + </map> </map> <key>name</key> <string>common</string> @@ -2415,6 +2457,29 @@ <key>name</key> <string>RelWithDebInfo</string> </map> + <key>RelWithDebInfoOS</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>options</key> + <array> + <string>-G</string> + <string>'Xcode'</string> + </array> + </map> + <key>name</key> + <string>RelWithDebInfoOS</string> + </map> <key>Release</key> <map> <key>build</key> @@ -2448,6 +2513,31 @@ <key>name</key> <string>Release</string> </map> + <key>ReleaseOS</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> + <string>-DENABLE_SIGNING:BOOL=YES</string> + <string>-DSIGNING_IDENTITY:STRING="Developer ID Application: Linden Research, Inc."</string> + </array> + </map> + <key>configure</key> + <map> + <key>options</key> + <array> + <string>-G</string> + <string>'Xcode'</string> + </array> + </map> + <key>name</key> + <string>ReleaseOS</string> + </map> </map> <key>name</key> <string>darwin</string> @@ -2486,6 +2576,28 @@ <key>name</key> <string>RelWithDebInfo</string> </map> + <key>RelWithDebInfoOS</key> + <map> + <key>build</key> + <map> + <key>command</key> + <string>make</string> + <key>options</key> + <array> + <string>-j 7</string> + </array> + </map> + <key>configure</key> + <map> + <key>options</key> + <array> + <string>-G</string> + <string>'Unix Makefiles'</string> + </array> + </map> + <key>name</key> + <string>RelWithDebInfoOS</string> + </map> <key>Release</key> <map> <key>build</key> @@ -2512,6 +2624,28 @@ <key>name</key> <string>Release</string> </map> + <key>ReleaseOS</key> + <map> + <key>build</key> + <map> + <key>command</key> + <string>make</string> + <key>options</key> + <array> + <string>-j 7</string> + </array> + </map> + <key>configure</key> + <map> + <key>options</key> + <array> + <string>-G</string> + <string>'Unix Makefiles'</string> + </array> + </map> + <key>name</key> + <string>ReleaseOS</string> + </map> <key>default</key> <map> <key>build</key> @@ -2571,6 +2705,53 @@ <key>name</key> <string>RelWithDebInfo</string> </map> + <key>RelWithDebInfoOS</key> + <map> + <key>build</key> + <map> + <key>arguments</key> + <array> + <string>SecondLife.sln</string> + </array> + <key>command</key> + <string>msbuild.exe</string> + <key>options</key> + <array> + <string>/p:Configuration=RelWithDebInfo</string> + <string>/p:Platform=Win32</string> + <string>/t:Build</string> + <string>/p:useenv=true</string> + <string>/verbosity:minimal</string> + <string>/toolsversion:4.0</string> + <string>/p:"VCBuildAdditionalOptions= /incremental"</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 12"</string> + <string>-DUNATTENDED:BOOL=ON</string> + <string>-DINSTALL_PROPRIETARY=FALSE</string> + <string>-DUSE_KDU=FALSE</string> + </array> + </map> + <key>name</key> + <string>RelWithDebInfoOS</string> + </map> <key>Release</key> <map> <key>build</key> @@ -2610,6 +2791,53 @@ <key>name</key> <string>Release</string> </map> + <key>ReleaseOS</key> + <map> + <key>build</key> + <map> + <key>arguments</key> + <array> + <string>SecondLife.sln</string> + </array> + <key>command</key> + <string>msbuild.exe</string> + <key>options</key> + <array> + <string>/p:Configuration=Release</string> + <string>/p:Platform=Win32</string> + <string>/t:Build</string> + <string>/p:useenv=true</string> + <string>/verbosity:minimal</string> + <string>/toolsversion:4.0</string> + <string>/p:"VCBuildAdditionalOptions= /incremental"</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>Release</string> + <string>--startup</string> + <string>secondlife-bin</string> + </array> + <key>options</key> + <array> + <string>-G</string> + <string>"Visual Studio 12"</string> + <string>-DUNATTENDED:BOOL=ON</string> + <string>-DINSTALL_PROPRIETARY=FALSE</string> + <string>-DUSE_KDU=FALSE</string> + </array> + </map> + <key>name</key> + <string>ReleaseOS</string> + </map> </map> <key>name</key> <string>windows</string> |