From 9bc7165e23fa72fa3d8ece2da0b54dfe128a4ce9 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 24 Oct 2014 14:49:15 -0400
Subject: [PATCH] convert llphysicsextensions tpv package build to use new
autobuild package --results-file option
---
build.sh | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/build.sh b/build.sh
index 64181828aa..11455bff00 100755
--- a/build.sh
+++ b/build.sh
@@ -124,9 +124,15 @@ package_llphysicsextensions_tpv()
# capture the package file name for use in upload later...
PKGTMP=`mktemp -t pgktpv.XXXXXX`
trap "rm $PKGTMP* 2>/dev/null" 0
- "$AUTOBUILD" package --verbose --config-file $llpetpvcfg > $PKGTMP
+ "$AUTOBUILD" package --verbose --config-file $llpetpvcfg --results-file "$(native_path $PKGTMP)"
tpv_status=$?
- sed -n -e 's/^wrote *//p' $PKGTMP > $build_dir/llphysicsextensions_package
+ if [ -r "${PKGTMP}" ]
+ then
+ cat "${PKGTMP}" >> "$build_log"
+ eval $(cat "${PKGTMP}") # sets autobuild_package_{name,filename,md5}
+ autobuild_package_filename="$(shell_path "${autobuild_package_filename}")"
+ echo "${autobuild_package_filename}" > $build_dir/llphysicsextensions_package
+ fi
else
echo "Do not provide llphysicsextensions_tpv for $variant"
llphysicsextensions_package=""
--
GitLab