summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2017-06-12 13:26:19 -0700
committerGlenn Glazer <coyot@lindenlab.com>2017-06-12 13:26:19 -0700
commit5134805c66fcb0fe944691db168c75af106db14c (patch)
tree29edea0e9660e0d6e02d30a0090be595a6015036
parent0bdb5f6823723cc3e70ba45c4a4be05f6e719edd (diff)
MAINT-7192: upgrade to VMP package 506412
-rw-r--r--autobuild.xml10
-rwxr-xr-xbuild.sh1
2 files changed, 6 insertions, 5 deletions
diff --git a/autobuild.xml b/autobuild.xml
index 4db3018c39..c9e9075bbc 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3072,9 +3072,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>3e48bc03e0addce3b89a5b3dfcd2a720</string>
+ <string>26c1baecb8192fd627748e77550eea53</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6070/21122/viewer_manager-1.0.506059-darwin64-506059.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6423/22456/viewer_manager-1.0.506412-darwin64-506412.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@@ -3096,9 +3096,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>d17d5da63ae2e83bf2f9908591435e2b</string>
+ <string>c18521823d02e376bd9380fc50945abb</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6071/21128/viewer_manager-1.0.506059-windows-506059.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6424/22462/viewer_manager-1.0.506412-windows-506412.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -3109,7 +3109,7 @@
<key>source_type</key>
<string>hg</string>
<key>version</key>
- <string>1.0.506059</string>
+ <string>1.0.506412</string>
</map>
<key>vlc-bin</key>
<map>
diff --git a/build.sh b/build.sh
index 1d39ccf664..bb8d66599b 100755
--- a/build.sh
+++ b/build.sh
@@ -209,6 +209,7 @@ fi
# load autobuild provided shell functions and variables
"$autobuild" --quiet source_environment > "$build_log_dir/source_environment"
+PYTHONPATH="$BUILDSCRIPTS_SHARED/packages/lib/python:$PYTHONPATH"
begin_section "dump source environment commands"
cat "$build_log_dir/source_environment"
end_section "dump source environment commands"