Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12744] trunk/examples
|
From: <ai...@us...> - 2013-11-23 04:20:19
|
Revision: 12744
http://sourceforge.net/p/plplot/code/12744
Author: airwin
Date: 2013-11-23 04:20:14 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
Implement the test_plserver_runAllDemos and test_wish_runAllDemos
targets which do what their name implies.
Tested by Alan W. Irwin <ai...@us...> on Linux
using build-tree testing of the test_plserver_runAllDemos and
test_wish_runAllDemos from an initially empty build tree (to
test all required dependencies will be built correctly by these targets).
There are a number of run-time issues with these targets that will be
discussed on the plplot-devel mailing list. Because of those issues
these targets are temporarily kept from being dependencies of more
general interactive targets such as test_interactive.
Modified Paths:
--------------
trunk/examples/CMakeLists.txt
trunk/examples/tk/CMakeLists.txt
Added Paths:
-----------
trunk/examples/tk/plserver_runAllDemos.in
trunk/examples/tk/wish_runAllDemos.in
Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt 2013-11-23 01:28:32 UTC (rev 12743)
+++ trunk/examples/CMakeLists.txt 2013-11-23 04:20:14 UTC (rev 12744)
@@ -1048,6 +1048,41 @@
else(USE_INCRTCL_VERSION_4)
list(APPEND targets_examples_tk test_tk_04)
endif(USE_INCRTCL_VERSION_4)
+
+ add_custom_target(test_plserver_runAllDemos
+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/plserver_runAllDemos
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk
+ )
+ add_dependencies(test_plserver_runAllDemos
+ plserver
+ tcl_examples
+ tclIndex_tcl
+ tclIndex_tk
+ tclIndex_examples_tk
+ )
+
+ message(STATUS "WARNING: The test_plserver_runAlldemos target can be run independently but
+ there are several issues with this target so it is temporarily excluded from being a
+ dependency of other more general interactive test targets")
+ #list(APPEND targets_examples_tk test_plserver_runAllDemos)
+
+ add_custom_target(test_wish_runAllDemos
+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_runAllDemos -geometry 800x600
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk
+ )
+ add_dependencies(test_wish_runAllDemos
+ plplottcltk${LIB_TAG}
+ tkwin
+ tcl_examples
+ tclIndex_tcl
+ tclIndex_tk
+ tclIndex_examples_tk
+ )
+ message(STATUS "WARNING: The test_wish_runAlldemos target can be run independently but
+ there are several issues with this target so it is temporarily excluded from being a
+ dependency of other more general interactive test targets")
+ # list(APPEND targets_examples_tk test_wish_runAlldemos)
+
endif(ENABLE_itk)
endif(ENABLE_tk AND PLD_tk)
Modified: trunk/examples/tk/CMakeLists.txt
===================================================================
--- trunk/examples/tk/CMakeLists.txt 2013-11-23 01:28:32 UTC (rev 12743)
+++ trunk/examples/tk/CMakeLists.txt 2013-11-23 04:20:14 UTC (rev 12744)
@@ -142,10 +142,21 @@
# standard_examples is a configured shell script that runs all the standard
# examples under plserver.
-set(tk_SCRIPTS tk01 tk03 plgrid standard_examples wish_standard_examples)
-# The second and fourth Tk examples depend on Itk to work.
+set(tk_SCRIPTS
+ tk01
+ tk03
+ plgrid
+ standard_examples
+ wish_standard_examples
+ )
+# These examples depend on Itk to work.
if(ENABLE_itk)
- list(APPEND tk_SCRIPTS tk02 tk04)
+ list(APPEND tk_SCRIPTS
+ tk02
+ tk04
+ plserver_runAllDemos
+ wish_runAllDemos
+ )
endif(ENABLE_itk)
if(BUILD_TEST)
@@ -185,11 +196,15 @@
# wish_standard_examples is a configured shell script that runs all
# the standard examples under wish using a TEA-based approach.
# pkgIndex_LOCATION is the directory where the relevant pkgIndex.tcl
- # file is located.
+ # file is located. In the Plplotter package case two build-tree
+ # locations must be given, and we use the pkgIndex_LOCATIONS variable
+ # to configure that case.
if(CORE_BUILD)
set(pkgIndex_LOCATION ${CMAKE_BINARY_DIR}/bindings/tk)
+ set(pkgIndex_LOCATIONS "${CMAKE_BINARY_DIR}/bindings/tk ${CMAKE_BINARY_DIR}/bindings/tk-x-plat")
else(CORE_BUILD)
set(pkgIndex_LOCATION ${DATA_DIR})
+ set(pkgIndex_LOCATIONS ${DATA_DIR})
endif(CORE_BUILD)
foreach(tk_related_target xtk01 plserver xtk02 xtk04)
Added: trunk/examples/tk/plserver_runAllDemos.in
===================================================================
--- trunk/examples/tk/plserver_runAllDemos.in (rev 0)
+++ trunk/examples/tk/plserver_runAllDemos.in 2013-11-23 04:20:14 UTC (rev 12744)
@@ -0,0 +1,7 @@
+#!@SH_EXECUTABLE@
+# Run plserver example for standard examples.
+# The following exec command reexecutes the script under wish. This
+# is possible because all comment lines are ignored by wish including
+# continued ones with a trailing backslash like this one \
+exec @plserver_LOCATION@ -f "$0" "$@"
+source runAllDemos.tcl
Property changes on: trunk/examples/tk/plserver_runAllDemos.in
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/examples/tk/wish_runAllDemos.in
===================================================================
--- trunk/examples/tk/wish_runAllDemos.in (rev 0)
+++ trunk/examples/tk/wish_runAllDemos.in 2013-11-23 04:20:14 UTC (rev 12744)
@@ -0,0 +1,9 @@
+#!@SH_EXECUTABLE@
+# Run standard examples using wish/runAllDemos.tcl
+# The following exec command reexecutes the script under wish. This
+# is possible because all comment lines are ignored by wish including
+# continued ones with a trailing backslash like this one \
+exec @TK_WISH@ "$0" "$@"
+lappend auto_path @pkgIndex_LOCATIONS@
+package require Plplotter
+source runAllDemos.tcl
Property changes on: trunk/examples/tk/wish_runAllDemos.in
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
