Revision: 41512
http://brlcad.svn.sourceforge.net/brlcad/?rev=41512&view=rev
Author: starseeker
Date: 2010-12-06 16:10:04 +0000 (Mon, 06 Dec 2010)
Log Message:
-----------
Mutter... take out hard coded paths and add more ensearch to get shaders.sh
working with CMake.
Modified Paths:
--------------
brlcad/branches/cmake/regress/shaders.sh
Modified: brlcad/branches/cmake/regress/shaders.sh
===================================================================
--- brlcad/branches/cmake/regress/shaders.sh 2010-12-06 16:04:59 UTC (rev
41511)
+++ brlcad/branches/cmake/regress/shaders.sh 2010-12-06 16:10:04 UTC (rev
41512)
@@ -48,7 +48,26 @@
exit 1
fi
+RT="`ensearch rt`"
+if test ! -f "$RT" ; then
+ echo "Unable to find rt, aborting"
+ exit 1
+fi
+PIXDIFF="`ensearch pixdiff`"
+if test ! -f "$PIXDIFF" ; then
+ echo "Unable to find pixdiff, aborting"
+ exit 1
+fi
+
+ASC2PIX="`ensearch asc2pix`"
+if test ! -f "$ASC2PIX" ; then
+ echo "Unable to find asc2pix, aborting"
+ exit 1
+fi
+
+pwd
+
EAGLECAD=eagleCAD-512x438.pix
rm -f shaders.rt shaders.g shaders.rt.pix shaders.pixdiff.log shaders.rt.log
shaders.log shaders.txt shaders.dat $EAGLECAD shaders.mged
@@ -59,7 +78,7 @@
fi
-../src/conv/asc2pix > $EAGLECAD << EOF
+$ASC2PIX > $EAGLECAD << EOF
FFFFFD
FEFEFD
FFFFFD
@@ -224465,7 +224484,7 @@
exit 1
fi
mv shaders.rt shaders.rt.orig
-sed "s,^rt,../src/rt/rt -P 1 -B -U 1," < shaders.rt.orig > shaders.rt
+sed "s,^rt,$RT -P 1 -B -U 1," < shaders.rt.orig > shaders.rt
rm shaders.rt.orig
chmod 775 shaders.rt
echo 'rendering shaders...'
@@ -224487,8 +224506,8 @@
if [ ! -f $TOP_SRCDIR/regress/shaderspix.asc ] ; then
echo No reference file for $TOP_SRCDIR/regress/shaders.rt.pix
else
- ../src/conv/asc2pix < $TOP_SRCDIR/regress/shaderspix.asc >
shaders_ref.pix
- ../src/util/pixdiff shaders.rt.pix shaders_ref.pix >
shaders.rt.diff.pix 2> shaders.rt.pixdiff.log
+ $ASC2PIX < $TOP_SRCDIR/regress/shaderspix.asc > shaders_ref.pix
+ $PIXDIFF shaders.rt.pix shaders_ref.pix > shaders.rt.diff.pix
2> shaders.rt.pixdiff.log
NUMBER_WRONG=`tr , '\012' < shaders.rt.pixdiff.log | awk
'/many/ {print $1}' | tail -${TAIL_N}1`
export NUMBER_WRONG
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
What happens now with your Lotus Notes apps - do you make another costly
upgrade, or settle for being marooned without product support? Time to move
off Lotus Notes and onto the cloud with Force.com, apps are easier to build,
use, and manage than apps on traditional platforms. Sign up for the Lotus
Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
