diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | doc/wish.1 | 2 | ||||
| -rw-r--r-- | library/demos/hello | 2 | ||||
| -rw-r--r-- | library/demos/rmt | 2 | ||||
| -rw-r--r-- | library/demos/square | 2 | ||||
| -rw-r--r-- | library/demos/tcolor | 2 | ||||
| -rw-r--r-- | library/demos/timer | 2 | ||||
| -rw-r--r-- | library/demos/widget | 2 | ||||
| -rw-r--r-- | unix/Makefile.in | 4 | ||||
| -rw-r--r-- | win/Makefile.in | 6 |
10 files changed, 28 insertions, 8 deletions
@@ -1,3 +1,15 @@ +2011-11-22 Jan Nijtmans <nijtmans@users.sf.net> + + * doc/wish.1: Use the same shebang comment everywhere. + * library/demos/hello + * library/demos/rmt + * library/demos/square + * library/demos/tcolor + * library/demos/timer + * library/demos/widget + * unix/Makefile.in: [Bug 1945073]: Demo square.tcl + * win/Makefile.in: cannot run; need package tktest + 2011-11-17 Alexandre Ferrieux <ferrieux@users.sourceforge.net> * generic/tkCanvas.c: [Bug 3437816]: Missing TCL_ERROR return @@ -166,7 +166,7 @@ following three lines: .CS \fB#!/bin/sh # the next line restarts using wish \e -exec wish "$0" "$@"\fR +exec wish "$0" ${1+"$@"}\fR .CE This approach has three advantages over the approach in the previous paragraph. First, the location of the \fBwish\fR binary does not have diff --git a/library/demos/hello b/library/demos/hello index c8ccd37..d10b8d5 100644 --- a/library/demos/hello +++ b/library/demos/hello @@ -1,6 +1,6 @@ #!/bin/sh # the next line restarts using wish \ -exec wish "$0" "$@" +exec wish "$0" ${1+"$@"} # hello -- # Simple Tk script to create a button that prints "Hello, world". diff --git a/library/demos/rmt b/library/demos/rmt index 1be4b56..51886de 100644 --- a/library/demos/rmt +++ b/library/demos/rmt @@ -1,6 +1,6 @@ #!/bin/sh # the next line restarts using wish \ -exec wish "$0" "$@" +exec wish "$0" ${1+"$@"} # rmt -- # This script implements a simple remote-control mechanism for diff --git a/library/demos/square b/library/demos/square index b7dd78f..08c362b 100644 --- a/library/demos/square +++ b/library/demos/square @@ -1,6 +1,6 @@ #!/bin/sh # the next line restarts using wish \ -exec wish "$0" "$@" +exec wish "$0" ${1+"$@"} # square -- # This script generates a demo application containing only a "square" diff --git a/library/demos/tcolor b/library/demos/tcolor index bd20f7b..6e50c61 100644 --- a/library/demos/tcolor +++ b/library/demos/tcolor @@ -1,6 +1,6 @@ #!/bin/sh # the next line restarts using wish \ -exec wish "$0" "$@" +exec wish "$0" ${1+"$@"} # tcolor -- # This script implements a simple color editor, where you can diff --git a/library/demos/timer b/library/demos/timer index 694227f..e10b840 100644 --- a/library/demos/timer +++ b/library/demos/timer @@ -1,6 +1,6 @@ #!/bin/sh # the next line restarts using wish \ -exec wish "$0" "$@" +exec wish "$0" ${1+"$@"} # timer -- # This script generates a counter with start and stop buttons. diff --git a/library/demos/widget b/library/demos/widget index 7dd8ab3..d58f086 100644 --- a/library/demos/widget +++ b/library/demos/widget @@ -1,6 +1,6 @@ #!/bin/sh # the next line restarts using wish \ -exec wish "$0" "$@" +exec wish "$0" ${1+"$@"} # widget -- # This script demonstrates the various widgets provided by Tk, along with many diff --git a/unix/Makefile.in b/unix/Makefile.in index 170f157..0096d27 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -807,7 +807,11 @@ install-demos: done; @for i in $(DEMOPROGS); \ do \ + if test $$i = "square"; then \ + rm -f "$(DEMO_INSTALL_DIR)"/$$i; \ + else \ chmod 755 "$(DEMO_INSTALL_DIR)"/$$i; \ + fi; \ done; @echo "Installing demo images"; @for i in $(TOP_DIR)/library/demos/images/*; \ diff --git a/win/Makefile.in b/win/Makefile.in index 851566d..5f9fd46 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -556,13 +556,17 @@ install-demos: @for i in $(ROOT_DIR)/library/demos/*; \ do \ if [ -f $$i ] ; then \ - sed -e '3 s|exec $(WISH)|exec $(WISH)|' \ + sed -e '3 s|exec wish|exec wish$(VER)|' \ $$i > $(SCRIPT_INSTALL_DIR)/demos/`basename $$i`; \ fi; \ done; @for i in $(DEMOPROGS); \ do \ + if test $$i = "square"; then \ + rm -f $(SCRIPT_INSTALL_DIR)/demos/$$i; \ + else \ chmod 755 $(SCRIPT_INSTALL_DIR)/demos/$$i; \ + fi; \ done; @echo "Installing demo images"; @for i in $(ROOT_DIR)/library/demos/images/*; \ |