From: John Dallaway <john@dallaway.org.uk>
To: ecos-patches@sourceware.org
Subject: Re: #!/usr/bin/env tclsh
Date: Sat, 07 Feb 2009 15:49:00 -0000 [thread overview]
Message-ID: <498DAD60.4000208@dallaway.org.uk> (raw)
In-Reply-To: <498C433C.1080100@mlbassoc.com>
[-- 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"
prev parent reply other threads:[~2009-02-07 15:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-08 17:20 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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=498DAD60.4000208@dallaway.org.uk \
--to=john@dallaway.org.uk \
--cc=ecos-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).