From: <ai...@us...> - 2013-11-28 19:19:11
|
Revision: 12777 http://sourceforge.net/p/plplot/code/12777 Author: airwin Date: 2013-11-28 19:19:04 +0000 (Thu, 28 Nov 2013) Log Message: ----------- Use better naming convention for scripts. examples/tcl/standard_examples.in ==> examples/tcl/pltcl_standard_examples.in examples/tk/standard_examples.in ==> examples/tk/plserver_standard_examples.in Tested by: Alan W. Irwin <ai...@us...> on Linux using the test_interactive target for both the core build tree and the installed examples build tree. Modified Paths: -------------- trunk/examples/CMakeLists.txt trunk/examples/tcl/CMakeLists.txt trunk/examples/tk/CMakeLists.txt Added Paths: ----------- trunk/examples/tcl/pltcl_standard_examples.in trunk/examples/tk/plserver_standard_examples.in Removed Paths: ------------- trunk/examples/tcl/standard_examples.in trunk/examples/tk/standard_examples.in Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2013-11-28 12:50:28 UTC (rev 12776) +++ trunk/examples/CMakeLists.txt 2013-11-28 19:19:04 UTC (rev 12777) @@ -870,7 +870,7 @@ if(ENABLE_tcl AND PLD_xwin) add_custom_target(test_pltcl_standard_examples - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/standard_examples -dev xwin -np + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/pltcl_standard_examples -dev xwin -np DEPENDS ${xwin_target} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tcl ) @@ -964,7 +964,7 @@ list(APPEND targets_examples_tk test_tk_plgrid) add_custom_target(test_plserver_standard_examples - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/standard_examples + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/plserver_standard_examples DEPENDS ${xwin_target} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk ) Modified: trunk/examples/tcl/CMakeLists.txt =================================================================== --- trunk/examples/tcl/CMakeLists.txt 2013-11-28 12:50:28 UTC (rev 12776) +++ trunk/examples/tcl/CMakeLists.txt 2013-11-28 19:19:04 UTC (rev 12777) @@ -76,12 +76,12 @@ set(tcl_SCRIPTS ${tcl_SCRIPTS} x${STRING_INDEX}) endforeach(STRING_INDEX ${tcl_STRING_INDICES}) -# standard_examples is a configured shell script that runs all the standard -# examples under pltcl. +# pltcl_standard_examples is a configured shell script that runs all +# the standard examples under pltcl. get_target_property(pltcl_LOCATION pltcl LOCATION) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/standard_examples.in - ${CMAKE_CURRENT_BINARY_DIR}/standard_examples + ${CMAKE_CURRENT_SOURCE_DIR}/pltcl_standard_examples.in + ${CMAKE_CURRENT_BINARY_DIR}/pltcl_standard_examples @ONLY ) @@ -135,7 +135,7 @@ ) install(FILES ${tcl_FILES} DESTINATION ${DATA_DIR}/examples/tcl) - install(PROGRAMS ${tcl_SCRIPTS} standard_examples.in tclsh_standard_examples.in + install(PROGRAMS ${tcl_SCRIPTS} pltcl_standard_examples.in tclsh_standard_examples.in DESTINATION ${DATA_DIR}/examples/tcl ) Copied: trunk/examples/tcl/pltcl_standard_examples.in (from rev 12772, trunk/examples/tcl/standard_examples.in) =================================================================== --- trunk/examples/tcl/pltcl_standard_examples.in (rev 0) +++ trunk/examples/tcl/pltcl_standard_examples.in 2013-11-28 19:19:04 UTC (rev 12777) @@ -0,0 +1,41 @@ +#!@SH_EXECUTABLE@ +# Examples 14 and 31 left out - see Tk standard_examples.in +# Note the backslash at the end of the comments - this causes Tcl to +# ignore the next line. It becomes a valid Tcl script as well as valid +# shell script \ +exec @pltcl_LOCATION@ "$0" "$@" +source tcldemos.tcl +plinit +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +15 +16 +17 +18 +19 +20 +plspause 0 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +33 +exit Deleted: trunk/examples/tcl/standard_examples.in =================================================================== --- trunk/examples/tcl/standard_examples.in 2013-11-28 12:50:28 UTC (rev 12776) +++ trunk/examples/tcl/standard_examples.in 2013-11-28 19:19:04 UTC (rev 12777) @@ -1,41 +0,0 @@ -#!@SH_EXECUTABLE@ -# Examples 14 and 31 left out - see Tk standard_examples.in -# Note the backslash at the end of the comments - this causes Tcl to -# ignore the next line. It becomes a valid Tcl script as well as valid -# shell script \ -exec @pltcl_LOCATION@ "$0" "$@" -source tcldemos.tcl -plinit -0 -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 -15 -16 -17 -18 -19 -20 -plspause 0 -21 -22 -23 -24 -25 -26 -27 -28 -29 -30 -33 -exit Modified: trunk/examples/tk/CMakeLists.txt =================================================================== --- trunk/examples/tk/CMakeLists.txt 2013-11-28 12:50:28 UTC (rev 12776) +++ trunk/examples/tk/CMakeLists.txt 2013-11-28 19:19:04 UTC (rev 12777) @@ -140,13 +140,13 @@ # plgrid is a configured shell script that runs the plgrid.tcl example # (N.B., in the tcl directory) using plserver. -# standard_examples is a configured shell script that runs all the standard -# examples under plserver. +# plserver_standard_examples is a configured shell script that runs +# all the standard examples under plserver. set(tk_SCRIPTS tk01 tk03 plgrid - standard_examples + plserver_standard_examples wish_standard_examples ) # These examples depend on Itk to work. Copied: trunk/examples/tk/plserver_standard_examples.in (from rev 12772, trunk/examples/tk/standard_examples.in) =================================================================== --- trunk/examples/tk/plserver_standard_examples.in (rev 0) +++ trunk/examples/tk/plserver_standard_examples.in 2013-11-28 19:19:04 UTC (rev 12777) @@ -0,0 +1,51 @@ +#!@SH_EXECUTABLE@ +# Run plserver example for standard examples. +# Drop examples 14 and 31 because querying for devices does not +# seem to work in this context. +# 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 tkdemos.tcl +# +# Turn off pausing - Note in the current plserver case, the plxframe +# uses a visual clue and bindings to key press events so a different +# method must be used to disable pausing than in the wish case. +# Note that the widget in question is .plw, not $plwin +# +plw::set_pause .plw 0 +# +# Now run the examples one by one +# +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +15 +16 +17 +18 +19 +20 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +33 +exit Deleted: trunk/examples/tk/standard_examples.in =================================================================== --- trunk/examples/tk/standard_examples.in 2013-11-28 12:50:28 UTC (rev 12776) +++ trunk/examples/tk/standard_examples.in 2013-11-28 19:19:04 UTC (rev 12777) @@ -1,51 +0,0 @@ -#!@SH_EXECUTABLE@ -# Run plserver example for standard examples. -# Drop examples 14 and 31 because querying for devices does not -# seem to work in this context. -# 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 tkdemos.tcl -# -# Turn off pausing - Note in the current plserver case, the plxframe -# uses a visual clue and bindings to key press events so a different -# method must be used to disable pausing than in the wish case. -# Note that the widget in question is .plw, not $plwin -# -plw::set_pause .plw 0 -# -# Now run the examples one by one -# -0 -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 -15 -16 -17 -18 -19 -20 -21 -22 -23 -24 -25 -26 -27 -28 -29 -30 -33 -exit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |