Revision: 56026
http://sourceforge.net/p/brlcad/code/56026
Author: brlcad
Date: 2013-07-12 17:17:56 +0000 (Fri, 12 Jul 2013)
Log Message:
-----------
change to a crazy long legacy. now that there are nothing but benchmark
reference pix and log files in the top-level pix/ directory, move that
directory to bench/ref/ and update accordingly. keep installation as pix/
though so we preserve the current installation hierarchy.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/bench/CMakeLists.txt
brlcad/trunk/bench/run.sh
Added Paths:
-----------
brlcad/trunk/bench/ref/
Removed Paths:
-------------
brlcad/trunk/pix/
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2013-07-12 16:53:43 UTC (rev 56025)
+++ brlcad/trunk/CMakeLists.txt 2013-07-12 17:17:56 UTC (rev 56026)
@@ -1817,12 +1817,11 @@
add_subdirectory(misc)
if(NOT BRLCAD_ENABLE_TARGETS OR "${BRLCAD_ENABLE_TARGETS}" GREATER 2)
add_subdirectory(doc)
- add_subdirectory(pix)
add_subdirectory(db)
add_subdirectory(bench)
add_subdirectory(regress)
else(NOT BRLCAD_ENABLE_TARGETS OR "${BRLCAD_ENABLE_TARGETS}" GREATER 2)
- CMAKEFILES(doc pix bench regress db)
+ CMAKEFILES(doc bench regress db)
endif(NOT BRLCAD_ENABLE_TARGETS OR "${BRLCAD_ENABLE_TARGETS}" GREATER 2)
# If we're building on Windows, use config_win.h file
Modified: brlcad/trunk/bench/CMakeLists.txt
===================================================================
--- brlcad/trunk/bench/CMakeLists.txt 2013-07-12 16:53:43 UTC (rev 56025)
+++ brlcad/trunk/bench/CMakeLists.txt 2013-07-12 17:17:56 UTC (rev 56026)
@@ -1,3 +1,5 @@
+add_subdirectory(ref)
+
include_directories(${BU_INCLUDE_DIRS})
add_definitions(
Modified: brlcad/trunk/bench/run.sh
===================================================================
--- brlcad/trunk/bench/run.sh 2013-07-12 16:53:43 UTC (rev 56025)
+++ brlcad/trunk/bench/run.sh 2013-07-12 17:17:56 UTC (rev 56026)
@@ -241,8 +241,8 @@
echo "Available options:"
echo " RT=/path/to/rt_binary (e.g., rt)"
echo " DB=/path/to/reference/geometry (e.g. ../db)"
- echo " PIX=/path/to/reference/images (e.g., ../pix)"
- echo " LOG=/path/to/reference/logs (e.g., ../pix)"
+ echo " PIX=/path/to/reference/images (e.g., ./ref)"
+ echo " LOG=/path/to/reference/logs (e.g., ./ref)"
echo " CMP=/path/to/pixcmp_tool (e.g., pixcmp)"
echo " ELP=/path/to/time_tool (e.g., elapsed.sh)"
echo " TIMEFRAME=#seconds (default 32)"
@@ -291,8 +291,8 @@
RT - the rt binary (e.g. ../src/rt/rt or /usr/brlcad/bin/rt)
DB - the directory containing the reference geometry (e.g. ../db)
- PIX - the directory containing the reference images (e.g. ../pix)
- LOG - the directory containing the reference logs (e.g. ../pix)
+ PIX - the directory containing the reference images (e.g. ./ref)
+ LOG - the directory containing the reference logs (e.g. ./ref)
CMP - the name of a pixcmp tool (e.g. ./pixcmp or cmp)
ELP - the name of an elapsed time tool (e.g. ../sh/elapsed.sh)
TIMEFRAME - the minimum number of seconds each trace needs to take
@@ -520,9 +520,8 @@
${PATH_TO_THIS}/share/brlcad/pix \
${PATH_TO_THIS}/../share/pix \
${PATH_TO_THIS}/share/pix \
- ${PATH_TO_THIS}/../pix \
- ${PATH_TO_THIS}/pix \
- ./pix
+ ${PATH_TO_THIS}/ref \
+ ./ref
look_for directory "a benchmark reference log directory" LOG \
$PIX \
@@ -532,9 +531,8 @@
${PATH_TO_THIS}/share/brlcad/pix \
${PATH_TO_THIS}/../share/pix \
${PATH_TO_THIS}/share/pix \
- ${PATH_TO_THIS}/../pix \
- ${PATH_TO_THIS}/pix \
- ./pix
+ ${PATH_TO_THIS}/ref \
+ ./ref
look_for executable "a pixel comparison utility" CMP \
${PATH_TO_THIS}/pixcmp \
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
