# HG changeset patch
# User jld
# Date 1231434800 0
# Node ID eacd6295a6aa9de8fb02dc07edd2931c62f75420
# Parent  25584f5a3f55e8c8022d34b1ce87cf575a1669f5
* ecosadmin.tcl, pkgconf/fixhtml.tcl,
  devs/framebuf/synth/current/src/gen_synthfb.tcl,
  fs/rom/current/support/file2c.tcl,
  hal/mips/ref4955/current/misc/slow_cat.tcl,
  hal/mips/ref4955/current/misc/swap4.tcl,
  hal/arm/e7t/current/src/flash_cksum.tcl,
  hal/arm/aeb/current/src/flash_cksum.tcl,
  io/framebuf/current/src/gen_framebufs.tcl,
  services/memalloc/common/current/src/heapgen.tcl: Invoke using
  "/usr/bin/env tclsh".
* services/memalloc/common/current/cdl/memalloc.cdl: Simplify heaps.cxx
  make rule.

diff --git a/packages/ChangeLog b/packages/ChangeLog
--- a/packages/ChangeLog
+++ b/packages/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-08  John Dallaway  <john@dallaway.org.uk>
+
+	* ecosadmin.tcl, pkgconf/fixhtml.tcl: Specify script interpreter via
+	/usr/bin/env.
+
 2008-12-02  Sergei Gavrikov <sergei.gavrikov@gmail.com>
 
 	* ecos.db: Use the flash V2 driver for the LPC-H2294, LPC-E2294, &
diff --git a/packages/devs/framebuf/synth/current/ChangeLog b/packages/devs/framebuf/synth/current/ChangeLog
--- a/packages/devs/framebuf/synth/current/ChangeLog
+++ b/packages/devs/framebuf/synth/current/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-08  John Dallaway  <john@dallaway.org.uk>
+
+	* src/gen_synthfb.tcl: Specify script interpreter via /usr/bin/env.
+
 2008-12-30  John Dallaway  <john@dallaway.org.uk>
 
 	* cdl/framebuf_synth.cdl: Reference per-package documentation.
diff --git a/packages/devs/framebuf/synth/current/src/gen_synthfb.tcl b/packages/devs/framebuf/synth/current/src/gen_synthfb.tcl
--- a/packages/devs/framebuf/synth/current/src/gen_synthfb.tcl
+++ b/packages/devs/framebuf/synth/current/src/gen_synthfb.tcl
@@ -1,9 +1,4 @@
-#!/bin/bash
-# restart using a Tcl shell \
-    exec sh -c 'for tclshell in tclsh tclsh83 cygtclsh80 ; do \
-    ( echo | $tclshell ) 2> /dev/null && exec $tclshell "`( cygpath -w \"$0\" ) 2> /dev/null || echo $0`" "$@" ; \
-    done ; \
-    echo "gen_synthfb.tcl: cannot find Tcl shell" ; exit 1' "$0" "$@"
+#!/usr/bin/env tclsh
 
 #===============================================================================
 #
diff --git a/packages/ecosadmin.tcl b/packages/ecosadmin.tcl
--- a/packages/ecosadmin.tcl
+++ b/packages/ecosadmin.tcl
@@ -1,9 +1,4 @@
-#!/bin/bash
-# restart using a Tcl shell \
-    exec sh -c 'for tclshell in tclsh tclsh83 cygtclsh80 ; do \
-            ( echo | $tclshell ) 2> /dev/null && exec $tclshell "`( cygpath -w \"$0\" ) 2> /dev/null || echo $0`" "$@" ; \
-        done ; \
-        echo "ecosadmin.tcl: cannot find Tcl shell" ; exit 1' "$0" "$@"
+#!/usr/bin/env tclsh
 
 # {{{  Banner
 
diff --git a/packages/fs/rom/current/ChangeLog b/packages/fs/rom/current/ChangeLog
--- a/packages/fs/rom/current/ChangeLog
+++ b/packages/fs/rom/current/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-08  John Dallaway  <john@dallaway.org.uk>
+
+	* support/file2c.tcl: Specify script interpreter via /usr/bin/env.
+
 2008-08-14  Klaas Gadeyne  <klaas.gadeyne@fmtc.be>
 2008-08-14  Jonathan Larmour  <jifl@eCosCentric.com>
 
diff --git a/packages/fs/rom/current/support/file2c.tcl b/packages/fs/rom/current/support/file2c.tcl
--- a/packages/fs/rom/current/support/file2c.tcl
+++ b/packages/fs/rom/current/support/file2c.tcl
@@ -1,9 +1,4 @@
-#!/bin/bash
-# restart using a Tcl shell \
-    exec sh -c 'for tclshell in tclsh tclsh83 cygtclsh80 ; do \
-            ( echo | $tclshell ) 2> /dev/null && exec $tclshell "`( cygpath -w \"$0\" ) 2> /dev/null || echo $0`" "$@" ; \
-        done ; \
-        echo "file2c.tcl: cannot find Tcl shell" ; exit 1' "$0" "$@"
+#!/usr/bin/env tclsh
 
 #===============================================================================
 #
diff --git a/packages/hal/arm/aeb/current/ChangeLog b/packages/hal/arm/aeb/current/ChangeLog
--- a/packages/hal/arm/aeb/current/ChangeLog
+++ b/packages/hal/arm/aeb/current/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-08  John Dallaway  <john@dallaway.org.uk>
+
+	* src/flash_cksum.tcl: Specify script interpreter via /usr/bin/env.
+
 2004-04-22  Jani Monoses <jani@iv.ro>
 
 	 * cdl/hal_arm_aeb.cdl :
diff --git a/packages/hal/arm/aeb/current/src/flash_cksum.tcl b/packages/hal/arm/aeb/current/src/flash_cksum.tcl
--- a/packages/hal/arm/aeb/current/src/flash_cksum.tcl
+++ b/packages/hal/arm/aeb/current/src/flash_cksum.tcl
@@ -1,9 +1,4 @@
-#!/bin/bash
-# restart using a Tcl shell \
-    exec sh -c 'for tclshell in tclsh tclsh83 cygtclsh80 ; do \
-            ( echo | $tclshell ) 2> /dev/null && exec $tclshell "`( cygpath -w \"$0\" ) 2> /dev/null || echo $0`" "$@" ; \
-        done ; \
-        echo "flash_cksum.tcl: cannot find Tcl shell" ; exit 1' "$0" "$@"
+#!/usr/bin/env tclsh
 
 #===============================================================================
 #
diff --git a/packages/hal/arm/e7t/current/ChangeLog b/packages/hal/arm/e7t/current/ChangeLog
--- a/packages/hal/arm/e7t/current/ChangeLog
+++ b/packages/hal/arm/e7t/current/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-08  John Dallaway  <john@dallaway.org.uk>
+
+	* src/flash_cksum.tcl: Specify script interpreter via /usr/bin/env.
+
 2004-04-22  Jani Monoses <jani@iv.ro>
 
 	 * cdl/hal_arm_e7t.cdl :
diff --git a/packages/hal/arm/e7t/current/src/flash_cksum.tcl b/packages/hal/arm/e7t/current/src/flash_cksum.tcl
--- a/packages/hal/arm/e7t/current/src/flash_cksum.tcl
+++ b/packages/hal/arm/e7t/current/src/flash_cksum.tcl
@@ -1,9 +1,4 @@
-#!/bin/bash
-# restart using a Tcl shell \
-    exec sh -c 'for tclshell in tclsh tclsh83 cygtclsh80 ; do \
-            ( echo | $tclshell ) 2> /dev/null && exec $tclshell "`( cygpath -w \"$0\" ) 2> /dev/null || echo $0`" "$@" ; \
-        done ; \
-        echo "flash_cksum.tcl: cannot find Tcl shell" ; exit 1' "$0" "$@"
+#!/usr/bin/env tclsh
 
 #===============================================================================
 #
diff --git a/packages/hal/mips/ref4955/current/ChangeLog b/packages/hal/mips/ref4955/current/ChangeLog
--- a/packages/hal/mips/ref4955/current/ChangeLog
+++ b/packages/hal/mips/ref4955/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-08  John Dallaway  <john@dallaway.org.uk>
+
+	* misc/slow_cat.tcl, misc/swap4.tcl:
+	Specify script interpreter via /usr/bin/env.
+
 2004-04-22  Jani Monoses <jani@iv.ro>
 
 	 * cdl/hal_mips_tx49_ref4955.cdl :
diff --git a/packages/hal/mips/ref4955/current/misc/slow_cat.tcl b/packages/hal/mips/ref4955/current/misc/slow_cat.tcl
--- a/packages/hal/mips/ref4955/current/misc/slow_cat.tcl
+++ b/packages/hal/mips/ref4955/current/misc/slow_cat.tcl
@@ -1,9 +1,4 @@
-#!/bin/bash
-# restart using a Tcl shell \
-    exec sh -c 'for tclshell in tclsh tclsh83 cygtclsh80 ; do \
-            ( echo | $tclshell ) 2> /dev/null && exec $tclshell "`( cygpath -w \"$0\" ) 2> /dev/null || echo $0`" "$@" ; \
-        done ; \
-        echo "slow_cat.tcl: cannot find Tcl shell" ; exit 1' "$0" "$@"
+#!/usr/bin/env tclsh
 
 # Can be used like this:
 #  Get flash ready for programming using Minicom or similar
diff --git a/packages/hal/mips/ref4955/current/misc/swap4.tcl b/packages/hal/mips/ref4955/current/misc/swap4.tcl
--- a/packages/hal/mips/ref4955/current/misc/swap4.tcl
+++ b/packages/hal/mips/ref4955/current/misc/swap4.tcl
@@ -1,9 +1,4 @@
-#!/bin/bash
-# restart using a Tcl shell \
-    exec sh -c 'for tclshell in tclsh tclsh83 cygtclsh80 ; do \
-            ( echo | $tclshell ) 2> /dev/null && exec $tclshell "`( cygpath -w \"$0\" ) 2> /dev/null || echo $0`" "$@" ; \
-        done ; \
-        echo "swap4.tcl: cannot find Tcl shell" ; exit 1' "$0" "$@"
+#!/usr/bin/env tclsh
 
 proc filter { input_file output_file } {
     set input_fd [open $input_file  "r"]
diff --git a/packages/io/framebuf/current/ChangeLog b/packages/io/framebuf/current/ChangeLog
--- a/packages/io/framebuf/current/ChangeLog
+++ b/packages/io/framebuf/current/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-08  John Dallaway  <john@dallaway.org.uk>
+
+	* src/gen_framebufs.tcl: Specify script interpreter via /usr/bin/env.
+
 2008-11-09  Bart Veer  <bartv@ecoscentric.com>
 
 	* src/linear.c: fix the block move operations (new_y > y) overlap
diff --git a/packages/io/framebuf/current/src/gen_framebufs.tcl b/packages/io/framebuf/current/src/gen_framebufs.tcl
--- a/packages/io/framebuf/current/src/gen_framebufs.tcl
+++ b/packages/io/framebuf/current/src/gen_framebufs.tcl
@@ -1,9 +1,4 @@
-#!/bin/bash
-# restart using a Tcl shell \
-    exec sh -c 'for tclshell in tclsh tclsh83 cygtclsh80 ; do \
-    ( echo | $tclshell ) 2> /dev/null && exec $tclshell "`( cygpath -w \"$0\" ) 2> /dev/null || echo $0`" "$@" ; \
-    done ; \
-    echo "gen_framebufs.tcl: cannot find Tcl shell" ; exit 1' "$0" "$@"
+#!/usr/bin/env tclsh
 
 #===============================================================================
 #
diff --git a/packages/pkgconf/fixhtml.tcl b/packages/pkgconf/fixhtml.tcl
--- a/packages/pkgconf/fixhtml.tcl
+++ b/packages/pkgconf/fixhtml.tcl
@@ -1,9 +1,4 @@
-#!/bin/bash
-# restart using a Tcl shell \
-    exec sh -c 'for tclshell in tclsh tclsh83 cygtclsh80 ; do \
-            ( echo | $tclshell ) 2> /dev/null && exec $tclshell "`( cygpath -w \"$0\" ) 2> /dev/null || echo $0`" "$@" ; \
-        done ; \
-        echo "fixhtml.tcl: cannot find Tcl shell" ; exit 1' "$0" "$@"
+#!/usr/bin/env tclsh
 
 #===============================================================================
 #
diff --git a/packages/services/memalloc/common/current/ChangeLog b/packages/services/memalloc/common/current/ChangeLog
--- a/packages/services/memalloc/common/current/ChangeLog
+++ b/packages/services/memalloc/common/current/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-08  John Dallaway  <john@dallaway.org.uk>
+
+	* src/heapgen.tcl: Specify script interpreter via /usr/bin/env.
+	* cdl/memalloc.cdl: Simplify heaps.cxx make rule - cygtclsh80 is
+	no-longer supported.
+
 2008-12-19  Jonathan Larmour  <jifl@eCosCentric.com>
 
 	* src/dlmalloc.cxx (MALLOC_COPY): Reinstate fix of 2008-01-06
diff --git a/packages/services/memalloc/common/current/cdl/memalloc.cdl b/packages/services/memalloc/common/current/cdl/memalloc.cdl
--- a/packages/services/memalloc/common/current/cdl/memalloc.cdl
+++ b/packages/services/memalloc/common/current/cdl/memalloc.cdl
@@ -281,12 +281,9 @@ cdl_package CYGPKG_MEMALLOC {
     
         # FIXME this should have a dependency on mlt_headers, but CDL doesn't
         # permit custom build rules depending on phony targets
-        # FIXME we workaround an NT cygtclsh80 bug by cd'ing into the
-        # correct dir and running heapgen.tcl from there rather than passing
-        # an absolute path.
         make -priority 50 {
-            heaps.cxx : heapgeninc.tcl <PACKAGE>/src/heapgen.tcl
-            XPWD=`pwd` ; cd $(REPOSITORY)/$(PACKAGE)/src ; sh heapgen.tcl "$(PREFIX)" "$$XPWD"
+            heaps.cxx : <PACKAGE>/src/heapgen.tcl heapgeninc.tcl
+            $< "$(PREFIX)" "`pwd`"
             @cp heaps.hxx "$(PREFIX)"/include/pkgconf/heaps.hxx
             @chmod u+w "$(PREFIX)"/include/pkgconf/heaps.hxx
         }
diff --git a/packages/services/memalloc/common/current/src/heapgen.tcl b/packages/services/memalloc/common/current/src/heapgen.tcl
--- a/packages/services/memalloc/common/current/src/heapgen.tcl
+++ b/packages/services/memalloc/common/current/src/heapgen.tcl
@@ -1,9 +1,4 @@
-#!/bin/bash
-# restart using a Tcl shell \
-    exec sh -c 'for tclshell in tclsh tclsh83 cygtclsh80 ; do \
-            ( echo | $tclshell ) 2> /dev/null && exec $tclshell "`( cygpath -w \"$0\" ) 2> /dev/null || echo $0`" "$@" ; \
-        done ; \
-        echo "heapgen.tcl: cannot find Tcl shell" ; exit 1' "$0" "$@"
+#!/usr/bin/env tclsh
 
 #===============================================================================
 #