Skip to content
Snippets Groups Projects
Commit 3f66bc49 authored by Brad Linden's avatar Brad Linden
Browse files

Merge remote-tracking branch 'origin/SL-19594-fakesmile' into DRTVWR-559

parents 45fdba8f 86846ffb
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
Hide whitespace changes
Inline Side-by-side
Showing
with 96 additions and 98 deletions
autobuild.xml
+ 96
− 98
View file @ 3f66bc49
<?xml version="1.0" ?>
<llsd>
<map>
<llsd><map>
<key>installables</key>
<map>
<key>SDL</key>
......@@ -184,9 +183,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>7b4aceaed511d44c4d1354b2162b59c7</string>
<string>02b569ac2bd71f201e3dd86ade7b3eeb</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107398/936936/bugsplat-1.0.7.576560-darwin64-576560.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113876/983684/bugsplat-1.0.7.579696-darwin64-579696.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
......@@ -196,9 +195,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>53918c7c74b943cdc0bb90caf9657a84</string>
<string>5b32c47ae8e8cf0d4106f08e8db18044</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107400/936949/bugsplat-4.0.3.0.576560-windows-576560.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113878/983697/bugsplat-4.0.3.0.579696-windows-579696.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
......@@ -208,16 +207,16 @@
<key>archive</key>
<map>
<key>hash</key>
<string>19d6a55db101f02e7eb531daf3e8cfd1</string>
<string>79c005fd8a660f8551b3c9ede64fa4ef</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107401/936948/bugsplat-.576560-windows64-576560.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113879/983696/bugsplat-4.0.3.0.579696-windows64-579696.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>4.0.3.0.576560</string>
<string>4.0.3.0.579696</string>
</map>
<key>colladadom</key>
<map>
......@@ -307,31 +306,29 @@
<key>name</key>
<string>darwin64</string>
</map>
<key>windows</key>
<key>linux64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>b5ea7097ae10037024b0c2b3df9812b5</string>
<string>ac54672e0b38f52726f5c99047c913e4</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89307/815434/cubemaptoequirectangular-1.1.0-windows-564841.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89306/815431/cubemaptoequirectangular-1.1.0-windows64-564841.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
<key>windows64</key>
<key>windows</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>ac54672e0b38f52726f5c99047c913e4</string>
<string>b5ea7097ae10037024b0c2b3df9812b5</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89306/815431/cubemaptoequirectangular-1.1.0-windows64-564841.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89307/815434/cubemaptoequirectangular-1.1.0-windows-564841.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
<string>windows</string>
</map>
<key>linux64</key>
<key>windows64</key>
<map>
<key>archive</key>
<map>
......@@ -340,6 +337,8 @@
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89306/815431/cubemaptoequirectangular-1.1.0-windows64-564841.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
......@@ -1027,31 +1026,29 @@
<key>name</key>
<string>darwin64</string>
</map>
<key>windows</key>
<key>linux64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>0a376676dbb43fdd0c81ffdfbc5e6f81</string>
<string>e70898903475d8ac2e81ff33278fc987</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89308/815432/jpegencoderbasic-1.0-windows-564842.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89309/815433/jpegencoderbasic-1.0-windows64-564842.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
<key>windows64</key>
<key>windows</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>e70898903475d8ac2e81ff33278fc987</string>
<string>0a376676dbb43fdd0c81ffdfbc5e6f81</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89309/815433/jpegencoderbasic-1.0-windows64-564842.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89308/815432/jpegencoderbasic-1.0-windows-564842.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
<string>windows</string>
</map>
<key>linux64</key>
<key>windows64</key>
<map>
<key>archive</key>
<map>
......@@ -1060,6 +1057,8 @@
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89309/815433/jpegencoderbasic-1.0-windows64-564842.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
......@@ -2504,31 +2503,29 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>name</key>
<string>darwin64</string>
</map>
<key>windows</key>
<key>linux64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>e1303fb9f2242a79aee5fd9f97726ace</string>
<string>46edf0f55417f8ef0d33a5c007bc3644</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89311/815452/threejs-0.132.2-windows-564843.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89310/815451/threejs-0.132.2-windows64-564843.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
<key>windows64</key>
<key>windows</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>46edf0f55417f8ef0d33a5c007bc3644</string>
<string>e1303fb9f2242a79aee5fd9f97726ace</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89310/815451/threejs-0.132.2-windows64-564843.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89311/815452/threejs-0.132.2-windows-564843.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
<string>windows</string>
</map>
<key>linux64</key>
<key>windows64</key>
<map>
<key>archive</key>
<map>
......@@ -2537,6 +2534,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89310/815451/threejs-0.132.2-windows64-564843.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
......@@ -3163,18 +3162,25 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>name</key>
<string>common</string>
</map>
<key>linux64</key>
<key>darwin64</key>
<map>
<key>build_directory</key>
<string>build-linux-x86_64</string>
<string>build-darwin-x86_64</string>
<key>configurations</key>
<map>
<key>Release</key>
<key>RelWithDebInfo</key>
<map>
<key>build</key>
<map>
<key>command</key>
<string>ninja</string>
<string>xcodebuild</string>
<key>options</key>
<array>
<string>-configuration</string>
<string>RelWithDebInfo</string>
<string>-project</string>
<string>SecondLife.xcodeproj</string>
</array>
</map>
<key>configure</key>
<map>
......@@ -3185,53 +3191,40 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>options</key>
<array>
<string>-G</string>
<string>Ninja</string>
<string>-DLL_TESTS=Off</string>
<string>Xcode</string>
</array>
</map>
<key>default</key>
<string>True</string>
<key>name</key>
<string>Release</string>
<string>RelWithDebInfo</string>
</map>
<key>ReleaseOS</key>
<key>RelWithDebInfoOS</key>
<map>
<key>build</key>
<map>
<key>command</key>
<string>ninja</string>
<string>xcodebuild</string>
<key>options</key>
<array>
<string>-configuration</string>
<string>RelWithDebInfo</string>
<string>-project</string>
<string>SecondLife.xcodeproj</string>
</array>
</map>
<key>configure</key>
<map>
<key>options</key>
<array>
<string>-G</string>
<string>Ninja</string>
<string>-DLL_TESTS=Off</string>
<string>Xcode</string>
</array>
</map>
<key>name</key>
<string>ReleaseOS</string>
</map>
<key>default</key>
<map>
<key>build</key>
<map>
</map>
<key>name</key>
<string>default</string>
<string>RelWithDebInfoOS</string>
</map>
</map>
<key>name</key>
<string>linux64</string>
</map>
<key>darwin64</key>
<map>
<key>build_directory</key>
<string>build-darwin-x86_64</string>
<key>configurations</key>
<map>
<key>RelWithDebInfo</key>
<key>Release</key>
<map>
<key>build</key>
<map>
......@@ -3240,7 +3233,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>options</key>
<array>
<string>-configuration</string>
<string>RelWithDebInfo</string>
<string>Release</string>
<string>-project</string>
<string>SecondLife.xcodeproj</string>
</array>
......@@ -3257,12 +3250,10 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<string>Xcode</string>
</array>
</map>
<key>default</key>
<string>True</string>
<key>name</key>
<string>RelWithDebInfo</string>
<string>Release</string>
</map>
<key>RelWithDebInfoOS</key>
<key>ReleaseOS</key>
<map>
<key>build</key>
<map>
......@@ -3271,7 +3262,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>options</key>
<array>
<string>-configuration</string>
<string>RelWithDebInfo</string>
<string>Release</string>
<string>-project</string>
<string>SecondLife.xcodeproj</string>
</array>
......@@ -3285,21 +3276,24 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
</array>
</map>
<key>name</key>
<string>RelWithDebInfoOS</string>
<string>ReleaseOS</string>
</map>
</map>
<key>name</key>
<string>darwin64</string>
</map>
<key>linux64</key>
<map>
<key>build_directory</key>
<string>build-linux-x86_64</string>
<key>configurations</key>
<map>
<key>Release</key>
<map>
<key>build</key>
<map>
<key>command</key>
<string>xcodebuild</string>
<key>options</key>
<array>
<string>-configuration</string>
<string>Release</string>
<string>-project</string>
<string>SecondLife.xcodeproj</string>
</array>
<string>ninja</string>
</map>
<key>configure</key>
<map>
......@@ -3310,9 +3304,12 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>options</key>
<array>
<string>-G</string>
<string>Xcode</string>
<string>Ninja</string>
<string>-DLL_TESTS=Off</string>
</array>
</map>
<key>default</key>
<string>True</string>
<key>name</key>
<string>Release</string>
</map>
......@@ -3321,29 +3318,31 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>build</key>
<map>
<key>command</key>
<string>xcodebuild</string>
<key>options</key>
<array>
<string>-configuration</string>
<string>Release</string>
<string>-project</string>
<string>SecondLife.xcodeproj</string>
</array>
<string>ninja</string>
</map>
<key>configure</key>
<map>
<key>options</key>
<array>
<string>-G</string>
<string>Xcode</string>
<string>Ninja</string>
<string>-DLL_TESTS=Off</string>
</array>
</map>
<key>name</key>
<string>ReleaseOS</string>
</map>
<key>default</key>
<map>
<key>build</key>
<map>
</map>
<key>name</key>
<string>default</string>
</map>
</map>
<key>name</key>
<string>darwin64</string>
<string>linux64</string>
</map>
<key>windows</key>
<map>
......@@ -3512,5 +3511,4 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<string>autobuild</string>
<key>version</key>
<string>1.3</string>
</map>
</llsd>
</map></llsd>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment