Automated merge with https://bitbucket.org/stinson_linden/viewer-development-havokai
commit
28be2c4364
|
|
@ -1110,9 +1110,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>3e743d07fabd82a6c8fdfed2c52aa9b1</string>
|
||||
<string>c97157313e496a46227d125212cfb3cb</string>
|
||||
<key>url</key>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248734/arch/Linux/installer/llphysicsextensions-0.1-linux-20120131.tar.bz2</string>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248758/arch/Linux/installer/llphysicsextensions-0.1-linux-20120201.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1122,9 +1122,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>d03a4b2abb8d883a29f21d0fdb9ecacd</string>
|
||||
<string>2f65c55658b051653aad697c39a65375</string>
|
||||
<key>url</key>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248734/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120131.tar.bz2</string>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248758/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120201.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows</string>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
#!/bin/bash
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
# turn on verbose debugging output for parabuild logs.
|
||||
set -x
|
||||
# make errors fatal
|
||||
set -e
|
||||
|
||||
if [ -z "$AUTOBUILD" ] ; then
|
||||
fail
|
||||
fi
|
||||
|
||||
if [ "$OSTYPE" = "cygwin" ] ; then
|
||||
export AUTOBUILD="$(cygpath -u $AUTOBUILD)"
|
||||
fi
|
||||
|
||||
# load autbuild provided shell functions and variables
|
||||
eval "$("$AUTOBUILD" source_environment)"
|
||||
|
||||
projectDir="$(pwd)"
|
||||
|
||||
#directories we need the headers from
|
||||
projects="llcommon llimage llmath llrender"
|
||||
|
||||
source="$projectDir/indra"
|
||||
|
||||
stage="$projectDir/stage/include"
|
||||
mkdir -p $stage
|
||||
|
||||
for project in $projects
|
||||
do
|
||||
dstIncludeDir="$stage/$project"
|
||||
mkdir -p $dstIncludeDir
|
||||
headers="$source/$project/*.h"
|
||||
cp $headers "$dstIncludeDir"
|
||||
done
|
||||
|
||||
# Copy the license files into place for packaging
|
||||
srcLicenseDir="$projectDir/doc"
|
||||
dstLicenseDir="$projectDir/stage/LICENSES"
|
||||
|
||||
mkdir -p "$dstLicenseDir"
|
||||
cp "$srcLicenseDir/LGPL-licence.txt" "$dstLicenseDir/LGPL-licence.txt"
|
||||
|
||||
pass
|
||||
|
|
@ -0,0 +1,145 @@
|
|||
<?xml version="1.0" ?>
|
||||
<llsd>
|
||||
<map>
|
||||
<key>package_description</key>
|
||||
<map>
|
||||
<key>description</key>
|
||||
<string>include files referenced in the llphysicsextensions</string>
|
||||
<key>license</key>
|
||||
<string>LGPL</string>
|
||||
<key>license_file</key>
|
||||
<string>LICENSES/LGPL-licence.txt</string>
|
||||
<key>name</key>
|
||||
<string>pathfinding_includes</string>
|
||||
<key>platforms</key>
|
||||
<map>
|
||||
<key>common</key>
|
||||
<map>
|
||||
<key>configurations</key>
|
||||
<map>
|
||||
<key>Default</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
<map>
|
||||
<key>command</key>
|
||||
<string>bash</string>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>-c ../package_physicsextensions.sh</string>
|
||||
</array>
|
||||
</map>
|
||||
<key>configure</key>
|
||||
<map>
|
||||
</map>
|
||||
<key>default</key>
|
||||
<string>True</string>
|
||||
<key>name</key>
|
||||
<string>Default</string>
|
||||
</map>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>common</string>
|
||||
</map>
|
||||
<key>darwin</key>
|
||||
<map>
|
||||
<key>build_directory</key>
|
||||
<string>stage</string>
|
||||
<key>configurations</key>
|
||||
<map>
|
||||
<key>common</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
<map>
|
||||
<key>command</key>
|
||||
<string>bash</string>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>-c ../package_physicsextensions.sh</string>
|
||||
</array>
|
||||
</map>
|
||||
<key>default</key>
|
||||
<string>true</string>
|
||||
<key>manifest</key>
|
||||
<array>
|
||||
<string>include/</string>
|
||||
<string>LICENSES</string>
|
||||
</array>
|
||||
<key>name</key>
|
||||
<string>common</string>
|
||||
</map>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>darwin</string>
|
||||
</map>
|
||||
<key>linux</key>
|
||||
<map>
|
||||
<key>build_directory</key>
|
||||
<string>stage</string>
|
||||
<key>configurations</key>
|
||||
<map>
|
||||
<key>common</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
<map>
|
||||
<key>command</key>
|
||||
<string>bash</string>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>-c ../package_physicsextensions.sh</string>
|
||||
</array>
|
||||
</map>
|
||||
<key>default</key>
|
||||
<string>true</string>
|
||||
<key>manifest</key>
|
||||
<array>
|
||||
<string>include/</string>
|
||||
<string>LICENSES</string>
|
||||
</array>
|
||||
<key>name</key>
|
||||
<string>common</string>
|
||||
</map>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
</map>
|
||||
<key>windows</key>
|
||||
<map>
|
||||
<key>build_directory</key>
|
||||
<string>stage</string>
|
||||
<key>configurations</key>
|
||||
<map>
|
||||
<key>common</key>
|
||||
<map>
|
||||
<key>build</key>
|
||||
<map>
|
||||
<key>command</key>
|
||||
<string>bash</string>
|
||||
<key>options</key>
|
||||
<array>
|
||||
<string>-c ../package_physicsextensions.sh</string>
|
||||
</array>
|
||||
</map>
|
||||
<key>default</key>
|
||||
<string>true</string>
|
||||
<key>manifest</key>
|
||||
<array>
|
||||
<string>include/</string>
|
||||
<string>LICENSES</string>
|
||||
</array>
|
||||
<key>name</key>
|
||||
<string>common</string>
|
||||
</map>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows</string>
|
||||
</map>
|
||||
</map>
|
||||
<key>version</key>
|
||||
<string>1.0</string>
|
||||
</map>
|
||||
<key>type</key>
|
||||
<string>autobuild</string>
|
||||
<key>version</key>
|
||||
<string>1.2</string>
|
||||
</map>
|
||||
</llsd>
|
||||
Loading…
Reference in New Issue