* #!/usr/bin/env tclsh
@ 2009-01-08 17:20 John Dallaway
2009-01-08 17:30 ` Jonathan Larmour
[not found] ` <pn4oz7g3d6.fsf@delenn.bartv.net>
0 siblings, 2 replies; 3+ messages in thread
From: John Dallaway @ 2009-01-08 17:20 UTC (permalink / raw)
To: ecos-patches
[-- Attachment #1: Type: text/plain, Size: 249 bytes --]
This patch simplifies the #! magic used to invoke Tcl scripts by using
"/usr/bin/env tclsh" to find the tclsh executable. Very old Cygwin
installations providing only tclsh83.exe or cygtclsh80.exe are no-longer
supported. Checked-in.
John Dallaway
[-- Attachment #2: env-090108.patch --]
[-- Type: text/x-patch, Size: 15243 bytes --]
Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/ChangeLog,v
retrieving revision 1.201
diff -u -5 -r1.201 ChangeLog
--- ChangeLog 8 Dec 2008 20:15:54 -0000 1.201
+++ ChangeLog 8 Jan 2009 16:53:36 -0000
@@ -1,5 +1,10 @@
+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, &
LPC-L2294-1MB targets.
Index: ecosadmin.tcl
===================================================================
RCS file: /cvs/ecos/ecos/packages/ecosadmin.tcl,v
retrieving revision 1.16
diff -u -5 -r1.16 ecosadmin.tcl
--- ecosadmin.tcl 10 Nov 2008 12:30:32 -0000 1.16
+++ ecosadmin.tcl 8 Jan 2009 16:53:38 -0000
@@ -1,11 +1,6 @@
-#!/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
#===============================================================================
#
Index: pkgconf/fixhtml.tcl
===================================================================
RCS file: /cvs/ecos/ecos/packages/pkgconf/fixhtml.tcl,v
retrieving revision 1.11
diff -u -5 -r1.11 fixhtml.tcl
--- pkgconf/fixhtml.tcl 29 Jan 2003 12:45:02 -0000 1.11
+++ pkgconf/fixhtml.tcl 8 Jan 2009 16:53:38 -0000
@@ -1,11 +1,6 @@
-#!/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
#===============================================================================
#
# fixhtml.tcl
#
Index: devs/framebuf/synth/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/framebuf/synth/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -r1.2 ChangeLog
--- devs/framebuf/synth/current/ChangeLog 30 Dec 2008 21:47:14 -0000 1.2
+++ devs/framebuf/synth/current/ChangeLog 8 Jan 2009 16:53:39 -0000
@@ -1,5 +1,9 @@
+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.
2008-10-06 Bart Veer <bartv@ecoscentric.com>
Index: devs/framebuf/synth/current/src/gen_synthfb.tcl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/framebuf/synth/current/src/gen_synthfb.tcl,v
retrieving revision 1.1
diff -u -5 -r1.1 gen_synthfb.tcl
--- devs/framebuf/synth/current/src/gen_synthfb.tcl 7 Oct 2008 21:10:17 -0000 1.1
+++ devs/framebuf/synth/current/src/gen_synthfb.tcl 8 Jan 2009 16:53:40 -0000
@@ -1,11 +1,6 @@
-#!/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
#===============================================================================
#
# gen_synthfb.tcl
#
Index: fs/rom/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/fs/rom/current/ChangeLog,v
retrieving revision 1.23
diff -u -5 -r1.23 ChangeLog
--- fs/rom/current/ChangeLog 14 Aug 2008 20:10:52 -0000 1.23
+++ fs/rom/current/ChangeLog 8 Jan 2009 16:53:40 -0000
@@ -1,5 +1,9 @@
+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>
* doc/mk_romfs.txt (Usage): Remove documentation about obsolete
CYGNUM_FS_ROM_BASE_ADDRESS option, and replace with better
Index: fs/rom/current/support/file2c.tcl
===================================================================
RCS file: /cvs/ecos/ecos/packages/fs/rom/current/support/file2c.tcl,v
retrieving revision 1.5
diff -u -5 -r1.5 file2c.tcl
--- fs/rom/current/support/file2c.tcl 14 Nov 2007 14:08:06 -0000 1.5
+++ fs/rom/current/support/file2c.tcl 8 Jan 2009 16:53:40 -0000
@@ -1,11 +1,6 @@
-#!/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
#===============================================================================
#
# file2c.tcl
#
Index: hal/mips/ref4955/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mips/ref4955/current/ChangeLog,v
retrieving revision 1.9
diff -u -5 -r1.9 ChangeLog
--- hal/mips/ref4955/current/ChangeLog 22 Apr 2004 15:26:42 -0000 1.9
+++ hal/mips/ref4955/current/ChangeLog 8 Jan 2009 16:53:41 -0000
@@ -1,5 +1,10 @@
+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 :
Invoke tail with stricter syntax that works in latest coreutils.
Index: hal/mips/ref4955/current/misc/slow_cat.tcl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mips/ref4955/current/misc/slow_cat.tcl,v
retrieving revision 1.2
diff -u -5 -r1.2 slow_cat.tcl
--- hal/mips/ref4955/current/misc/slow_cat.tcl 29 Jan 2003 12:45:02 -0000 1.2
+++ hal/mips/ref4955/current/misc/slow_cat.tcl 8 Jan 2009 16:53:41 -0000
@@ -1,11 +1,6 @@
-#!/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
# [o (Option menu), a (flAsh menu), b (Boot write)]
# Then execute the following
Index: hal/mips/ref4955/current/misc/swap4.tcl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mips/ref4955/current/misc/swap4.tcl,v
retrieving revision 1.2
diff -u -5 -r1.2 swap4.tcl
--- hal/mips/ref4955/current/misc/swap4.tcl 29 Jan 2003 12:45:02 -0000 1.2
+++ hal/mips/ref4955/current/misc/swap4.tcl 8 Jan 2009 16:53:41 -0000
@@ -1,11 +1,6 @@
-#!/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"]
set output_fd [open $output_file "w"]
Index: hal/arm/e7t/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/e7t/current/ChangeLog,v
retrieving revision 1.15
diff -u -5 -r1.15 ChangeLog
--- hal/arm/e7t/current/ChangeLog 22 Apr 2004 15:26:25 -0000 1.15
+++ hal/arm/e7t/current/ChangeLog 8 Jan 2009 16:53:41 -0000
@@ -1,5 +1,9 @@
+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 :
Invoke tail with stricter syntax that works in latest coreutils.
Index: hal/arm/e7t/current/src/flash_cksum.tcl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/e7t/current/src/flash_cksum.tcl,v
retrieving revision 1.4
diff -u -5 -r1.4 flash_cksum.tcl
--- hal/arm/e7t/current/src/flash_cksum.tcl 29 Jan 2003 12:45:02 -0000 1.4
+++ hal/arm/e7t/current/src/flash_cksum.tcl 8 Jan 2009 16:53:41 -0000
@@ -1,11 +1,6 @@
-#!/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
#===============================================================================
#
# flash_cksum.tcl
#
Index: hal/arm/aeb/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/aeb/current/ChangeLog,v
retrieving revision 1.30
diff -u -5 -r1.30 ChangeLog
--- hal/arm/aeb/current/ChangeLog 22 Apr 2004 15:26:20 -0000 1.30
+++ hal/arm/aeb/current/ChangeLog 8 Jan 2009 16:53:42 -0000
@@ -1,5 +1,9 @@
+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 :
Invoke tail with stricter syntax that works in latest coreutils.
Index: hal/arm/aeb/current/src/flash_cksum.tcl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/aeb/current/src/flash_cksum.tcl,v
retrieving revision 1.8
diff -u -5 -r1.8 flash_cksum.tcl
--- hal/arm/aeb/current/src/flash_cksum.tcl 29 Jan 2003 12:45:02 -0000 1.8
+++ hal/arm/aeb/current/src/flash_cksum.tcl 8 Jan 2009 16:53:43 -0000
@@ -1,11 +1,6 @@
-#!/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
#===============================================================================
#
# flash_cksum.tcl
#
Index: io/framebuf/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/framebuf/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -r1.2 ChangeLog
--- io/framebuf/current/ChangeLog 9 Nov 2008 11:44:31 -0000 1.2
+++ io/framebuf/current/ChangeLog 8 Jan 2009 16:53:43 -0000
@@ -1,5 +1,9 @@
+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
handling.
Index: io/framebuf/current/src/gen_framebufs.tcl
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/framebuf/current/src/gen_framebufs.tcl,v
retrieving revision 1.1
diff -u -5 -r1.1 gen_framebufs.tcl
--- io/framebuf/current/src/gen_framebufs.tcl 7 Oct 2008 10:15:04 -0000 1.1
+++ io/framebuf/current/src/gen_framebufs.tcl 8 Jan 2009 16:53:43 -0000
@@ -1,11 +1,6 @@
-#!/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
#===============================================================================
#
# gen_framebufs.tcl
#
Index: services/memalloc/common/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/memalloc/common/current/ChangeLog,v
retrieving revision 1.45
diff -u -5 -r1.45 ChangeLog
--- services/memalloc/common/current/ChangeLog 19 Dec 2008 05:49:15 -0000 1.45
+++ services/memalloc/common/current/ChangeLog 8 Jan 2009 16:53:44 -0000
@@ -1,5 +1,11 @@
+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
(reverting change of 2008-11-03).
* cdl/memalloc.cdl (CYGIMP_MEMALLOC_ALLOCATOR_DLMALLOC_USE_MEMCPY):
Index: services/memalloc/common/current/cdl/memalloc.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/memalloc/common/current/cdl/memalloc.cdl,v
retrieving revision 1.18
diff -u -5 -r1.18 memalloc.cdl
--- services/memalloc/common/current/cdl/memalloc.cdl 19 Dec 2008 05:49:15 -0000 1.18
+++ services/memalloc/common/current/cdl/memalloc.cdl 8 Jan 2009 16:53:45 -0000
@@ -279,16 +279,13 @@
@rm heapgen.tmp
}
# 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
}
make_object {
Index: services/memalloc/common/current/src/heapgen.tcl
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/memalloc/common/current/src/heapgen.tcl,v
retrieving revision 1.10
diff -u -5 -r1.10 heapgen.tcl
--- services/memalloc/common/current/src/heapgen.tcl 24 Oct 2007 13:25:46 -0000 1.10
+++ services/memalloc/common/current/src/heapgen.tcl 8 Jan 2009 16:53:45 -0000
@@ -1,11 +1,6 @@
-#!/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
#===============================================================================
#
# heapgen.tcl
#
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: #!/usr/bin/env tclsh
2009-01-08 17:20 #!/usr/bin/env tclsh John Dallaway
@ 2009-01-08 17:30 ` Jonathan Larmour
[not found] ` <pn4oz7g3d6.fsf@delenn.bartv.net>
1 sibling, 0 replies; 3+ messages in thread
From: Jonathan Larmour @ 2009-01-08 17:30 UTC (permalink / raw)
To: John Dallaway; +Cc: ecos-patches
John Dallaway wrote:
> This patch simplifies the #! magic used to invoke Tcl scripts by using
> "/usr/bin/env tclsh" to find the tclsh executable. Very old Cygwin
> installations providing only tclsh83.exe or cygtclsh80.exe are no-longer
> supported. Checked-in.
Can you please refrain from further non-trivial changes until you have a
copyright assignment.
You will also now need to ensure all files you have just modified are
explicitly included in the list of "Existing files you have modified" on
the assignment.
As a result (assuming you have already requested an assignment form) you
will need to make a new request of the FSF for an assignment.
This is why I said in my mail of 2009-01-02: "FAOD until then hold back on
working on any (copyrightable) changes for eCos or the website."
Jifl
--
eCosCentric Limited http://www.eCosCentric.com/ The eCos experts
Barnwell House, Barnwell Drive, Cambridge, UK. Tel: +44 1223 245571
Registered in England and Wales: Reg No 4422071.
------["Si fractum non sit, noli id reficere"]------ Opinions==mine
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: #!/usr/bin/env tclsh
[not found] ` <498C433C.1080100@mlbassoc.com>
@ 2009-02-07 15:49 ` John Dallaway
0 siblings, 0 replies; 3+ messages in thread
From: John Dallaway @ 2009-02-07 15:49 UTC (permalink / raw)
To: ecos-patches
[-- Attachment #1: Type: text/plain, Size: 731 bytes --]
Gary Thomas wrote:
> John Dallaway wrote:
>
>> I agree with Bart that invoking "/usr/bin/env tclsh" within the various
>> CDL custom rules doesn't gain us anything. It seems entirely reasonable
>> to assume that tclsh is on the PATH and users will get an intelligible
>> error message if it is not. In the case of heapgen.tcl, I simply
>> modified the custom make rule to invoke "tclsh" rather than "sh" and I
>> suggest we do the same with the other scripts. Are you OK with this
>> proposal?
>>
>> If we can agree on this, I am happy to identify and implement these changes.
>
> Sure - whatever it takes to make it work [again]. Too bad "sh"
> is being too "smart" about this...
Patched attached. Checked-in.
John Dallaway
[-- Attachment #2: tclsh-090207.patch --]
[-- Type: text/x-patch, Size: 17330 bytes --]
Index: devs/framebuf/synth/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/framebuf/synth/current/ChangeLog,v
retrieving revision 1.4
diff -u -5 -r1.4 ChangeLog
--- devs/framebuf/synth/current/ChangeLog 29 Jan 2009 17:48:32 -0000 1.4
+++ devs/framebuf/synth/current/ChangeLog 7 Feb 2009 15:36:09 -0000
@@ -1,5 +1,9 @@
+2009-02-07 John Dallaway <john@dallaway.org.uk>
+
+ * cdl/framebuf_synth.tcl: Pass gen_synthfb.tcl to tclsh directly.
+
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>
@@ -12,11 +16,11 @@
//===========================================================================
// ####GPLCOPYRIGHTBEGIN####
// -------------------------------------------
// This file is part of eCos, the Embedded Configurable Operating System.
-// Copyright (C) 2008 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 or (at your option) any
// later version.
Index: devs/framebuf/synth/current/cdl/framebuf_synth.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/framebuf/synth/current/cdl/framebuf_synth.cdl,v
retrieving revision 1.3
diff -u -5 -r1.3 framebuf_synth.cdl
--- devs/framebuf/synth/current/cdl/framebuf_synth.cdl 29 Jan 2009 17:48:32 -0000 1.3
+++ devs/framebuf/synth/current/cdl/framebuf_synth.cdl 7 Feb 2009 15:36:10 -0000
@@ -6,11 +6,11 @@
#
# ====================================================================
# ####ECOSGPLCOPYRIGHTBEGIN####
# -------------------------------------------
# This file is part of eCos, the Embedded Configurable Operating System.
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
#
# eCos is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation; either version 2 or (at your option) any later
# version.
@@ -187,14 +187,14 @@
active_if { CYGPKG_DEVS_FRAMEBUF_SYNTH_FB0 ||
CYGPKG_DEVS_FRAMEBUF_SYNTH_FB1 ||
CYGPKG_DEVS_FRAMEBUF_SYNTH_FB2 ||
CYGPKG_DEVS_FRAMEBUF_SYNTH_FB3 }
make -priority=1 {
- $(PREFIX)/include/cyg/io/framebufs/synth_fb.h : \
- $(REPOSITORY)/$(PACKAGE)/src/gen_synthfb.tcl \
- $(PREFIX)/include/pkgconf/devs_framebuf_synth.h
- sh $< $(PREFIX)
+ <PREFIX>/include/cyg/io/framebufs/synth_fb.h : \
+ <PACKAGE>/src/gen_synthfb.tcl \
+ <PREFIX>/include/pkgconf/devs_framebuf_synth.h
+ tclsh $< $(PREFIX)
}
compile synthfb.c
compile -library=libextras.a synthfb_init.cxx
cdl_option CYGHWR_DEVS_FRAMEBUF_SYNTH_FUNCTIONALITY_32BPP {
Index: fs/rom/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/fs/rom/current/ChangeLog,v
retrieving revision 1.25
diff -u -5 -r1.25 ChangeLog
--- fs/rom/current/ChangeLog 29 Jan 2009 17:48:54 -0000 1.25
+++ fs/rom/current/ChangeLog 7 Feb 2009 15:36:13 -0000
@@ -1,5 +1,9 @@
+2009-02-07 John Dallaway <john@dallaway.org.uk>
+
+ * cdl/romfs.cdl: Pass file2c.tcl to tclsh directly.
+
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>
@@ -163,11 +167,11 @@
//===========================================================================
// ####GPLCOPYRIGHTBEGIN####
// -------------------------------------------
// This file is part of eCos, the Embedded Configurable Operating System.
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2009 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 or (at your option) any
// later version.
Index: fs/rom/current/cdl/romfs.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/fs/rom/current/cdl/romfs.cdl,v
retrieving revision 1.13
diff -u -5 -r1.13 romfs.cdl
--- fs/rom/current/cdl/romfs.cdl 29 Jan 2009 17:48:54 -0000 1.13
+++ fs/rom/current/cdl/romfs.cdl 7 Feb 2009 15:36:13 -0000
@@ -6,11 +6,11 @@
#
# ====================================================================
## ####ECOSGPLCOPYRIGHTBEGIN####
## -------------------------------------------
## This file is part of eCos, the Embedded Configurable Operating System.
-## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2009 Free Software Foundation, Inc.
##
## eCos is free software; you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free
## Software Foundation; either version 2 or (at your option) any later
## version.
@@ -109,27 +109,27 @@
requires CYGBLD_FS_ROMFS_MK_ROMFS
description "
This option enables the building of the ROM filesystem tests."
make -priority 100 {
- <PREFIX>/include/cyg/romfs/testromfs_le.h : $(PREFIX)/bin/mk_romfs <PACKAGE>/support/file2c.tcl
+ <PREFIX>/include/cyg/romfs/testromfs_le.h : <PREFIX>/bin/mk_romfs <PACKAGE>/support/file2c.tcl
$(PREFIX)/bin/mk_romfs $(REPOSITORY)/$(PACKAGE)/tests/testromfs testromfs_le.bin
@mkdir -p "$(dir $@)"
# work around cygwin path problems by copying to build dir
@cp $(REPOSITORY)/$(PACKAGE)/support/file2c.tcl .
- sh file2c.tcl testromfs_le.bin testromfs_le.h
+ tclsh file2c.tcl testromfs_le.bin testromfs_le.h
@rm -f $@ file2c.tcl
@cp testromfs_le.h $@
}
make -priority 100 {
- <PREFIX>/include/cyg/romfs/testromfs_be.h : $(PREFIX)/bin/mk_romfs <PACKAGE>/support/file2c.tcl
+ <PREFIX>/include/cyg/romfs/testromfs_be.h : <PREFIX>/bin/mk_romfs <PACKAGE>/support/file2c.tcl
$(PREFIX)/bin/mk_romfs -b $(REPOSITORY)/$(PACKAGE)/tests/testromfs testromfs_be.bin
@mkdir -p "$(dir $@)"
# work around cygwin path problems by copying to bin dir
@cp $(REPOSITORY)/$(PACKAGE)/support/file2c.tcl $(PREFIX)/bin/
- sh $(PREFIX)/bin/file2c.tcl testromfs_be.bin testromfs_be.h
+ tclsh $(PREFIX)/bin/file2c.tcl testromfs_be.bin testromfs_be.h
@cp testromfs_be.h $@
}
cdl_option CYGPKG_FS_ROM_TESTS {
display "ROM filesystem tests"
Index: hal/synth/arch/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/synth/arch/current/ChangeLog,v
retrieving revision 1.41
diff -u -5 -r1.41 ChangeLog
--- hal/synth/arch/current/ChangeLog 29 Jan 2009 17:49:42 -0000 1.41
+++ hal/synth/arch/current/ChangeLog 7 Feb 2009 15:36:24 -0000
@@ -1,5 +1,10 @@
+2009-02-07 John Dallaway <john@dallaway.org.uk>
+
+ * cdl/hal_synth.cdl: Parent under the common HAL package as with
+ other architectural HAL packages.
+
2008-12-30 John Dallaway <john@dallaway.org.uk>
* cdl/hal_synth.cdl: Reference per-package documentation.
2008-10-07 Bart Veer <bartv@ecoscentric.com>
@@ -582,11 +587,11 @@
//===========================================================================
// ####GPLCOPYRIGHTBEGIN####
// -------------------------------------------
// This file is part of eCos, the Embedded Configurable Operating System.
-// Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 or (at your option) any
// later version.
Index: hal/synth/arch/current/cdl/hal_synth.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/synth/arch/current/cdl/hal_synth.cdl,v
retrieving revision 1.12
diff -u -5 -r1.12 hal_synth.cdl
--- hal/synth/arch/current/cdl/hal_synth.cdl 29 Jan 2009 17:49:43 -0000 1.12
+++ hal/synth/arch/current/cdl/hal_synth.cdl 7 Feb 2009 15:36:24 -0000
@@ -6,11 +6,11 @@
#
# ====================================================================
## ####ECOSGPLCOPYRIGHTBEGIN####
## -------------------------------------------
## This file is part of eCos, the Embedded Configurable Operating System.
-## Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc.
##
## eCos is free software; you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free
## Software Foundation; either version 2 or (at your option) any later
## version.
@@ -49,11 +49,11 @@
# ====================================================================
cdl_package CYGPKG_HAL_SYNTH {
display "Linux Synthetic target"
doc ref/hal-synth-arch.html
- parent CYGPKG_HAL_I386
+ parent CYGPKG_HAL
define_header hal_synth.h
include_dir cyg/hal
requires !CYGDBG_KERNEL_DEBUG_GDB_THREAD_SUPPORT
description "
Index: io/framebuf/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/framebuf/current/ChangeLog,v
retrieving revision 1.4
diff -u -5 -r1.4 ChangeLog
--- io/framebuf/current/ChangeLog 29 Jan 2009 17:49:46 -0000 1.4
+++ io/framebuf/current/ChangeLog 7 Feb 2009 15:36:25 -0000
@@ -1,5 +1,9 @@
+2009-02-07 John Dallaway <john@dallaway.org.uk>
+
+ * cdl/framebuf.cdl: Pass gen_framebufs.tcl to tclsh directly.
+
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>
@@ -46,11 +50,11 @@
//===========================================================================
// ####GPLCOPYRIGHTBEGIN####
// -------------------------------------------
// This file is part of eCos, the Embedded Configurable Operating System.
-// Copyright (C) 2008 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 or (at your option) any
// later version.
Index: io/framebuf/current/cdl/framebuf.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/framebuf/current/cdl/framebuf.cdl,v
retrieving revision 1.2
diff -u -5 -r1.2 framebuf.cdl
--- io/framebuf/current/cdl/framebuf.cdl 29 Jan 2009 17:49:46 -0000 1.2
+++ io/framebuf/current/cdl/framebuf.cdl 7 Feb 2009 15:36:25 -0000
@@ -6,11 +6,11 @@
#
# ====================================================================
# ####ECOSGPLCOPYRIGHTBEGIN####
# -------------------------------------------
# This file is part of eCos, the Embedded Configurable Operating System.
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
#
# eCos is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation; either version 2 or (at your option) any later
# version.
@@ -57,11 +57,11 @@
# copes with the case of a framebuffer device driver package being removed
make -priority 2 {
$(PREFIX)/include/cyg/io/framebufs/framebufs.h : $(REPOSITORY)/$(PACKAGE)/src/gen_framebufs.tcl \
$(PREFIX)/include/pkgconf/system.h \
$(subst $(PREFIX)/include/cyg/io/framebufs/framebufs.h,,$(wildcard $(PREFIX)/include/cyg/io/framebufs/*.h*))
- sh $< $(dir $@)
+ tclsh $< $(dir $@)
}
description "
The generic framebuffer package provides an API for accessing
one or more framebuffers, plus support for appropriate device
Index: services/objloader/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/objloader/current/ChangeLog,v
retrieving revision 1.4
diff -u -5 -r1.4 ChangeLog
--- services/objloader/current/ChangeLog 29 Jan 2009 17:50:09 -0000 1.4
+++ services/objloader/current/ChangeLog 7 Feb 2009 15:36:31 -0000
@@ -1,5 +1,9 @@
+2009-02-07 John Dallaway <john@dallaway.org.uk>
+
+ * cdl/objloader.tcl: Pass file2c.tcl to tclsh directly.
+
2006-06-27 Anthony Tonizzo <atonizzo@gmail.com>
* src/loader_fs.c : Minor cosmetic and formatting changes on all files.
Also got rid of some signed/unsigned comparison which did not show up using
the PPC toolchain but do when compiled with gcc under the synthetic target.
Index: services/objloader/current/cdl/objloader.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/objloader/current/cdl/objloader.cdl,v
retrieving revision 1.4
diff -u -5 -r1.4 objloader.cdl
--- services/objloader/current/cdl/objloader.cdl 29 Jan 2009 17:50:09 -0000 1.4
+++ services/objloader/current/cdl/objloader.cdl 7 Feb 2009 15:36:31 -0000
@@ -6,11 +6,11 @@
#
# ====================================================================
## ####ECOSGPLCOPYRIGHTBEGIN####
## -------------------------------------------
## This file is part of eCos, the Embedded Configurable Operating System.
-## Copyright (C) 2005 Free Software Foundation, Inc.
+## Copyright (C) 2005, 2009 Free Software Foundation, Inc.
##
## eCos is free software; you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free
## Software Foundation; either version 2 or (at your option) any later
## version.
@@ -170,19 +170,19 @@
make -priority 322 {
<PREFIX>/include/cyg/objloader/testromfs_be.h : tests/testromfs/hello.o
$(PREFIX)/bin/mk_romfs -b tests/testromfs testromfs_be.bin
@mkdir -p "$(dir $@)"
- @sh $(PREFIX)/bin/file2c.tcl testromfs_be.bin testromfs_be.h
+ @tclsh $(PREFIX)/bin/file2c.tcl testromfs_be.bin testromfs_be.h
@cp testromfs_be.h $@
}
make -priority 322 {
<PREFIX>/include/cyg/objloader/testromfs_le.h : tests/testromfs/hello.o
$(PREFIX)/bin/mk_romfs tests/testromfs testromfs_le.bin
@mkdir -p "$(dir $@)"
- @sh $(PREFIX)/bin/file2c.tcl testromfs_le.bin testromfs_le.h
+ @tclsh $(PREFIX)/bin/file2c.tcl testromfs_le.bin testromfs_le.h
@cp testromfs_le.h $@
}
cdl_option CYGPKG_OBJLOADER_TESTS {
display "Objloader tests"
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-02-07 15:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-01-08 17:20 #!/usr/bin/env tclsh John Dallaway
2009-01-08 17:30 ` Jonathan Larmour
[not found] ` <pn4oz7g3d6.fsf@delenn.bartv.net>
[not found] ` <498C3FEB.5020508@dallaway.org.uk>
[not found] ` <498C433C.1080100@mlbassoc.com>
2009-02-07 15:49 ` John Dallaway
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).