summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2007-03-09 20:04:38 (GMT)
committerandreas_kupries <akupries@shaw.ca>2007-03-09 20:04:38 (GMT)
commite0efa747c2cefb29ffa4c46bf1c0d8b3923bd600 (patch)
tree8f4b18e9fe3189a76157d97b433e7b2c55eac90c
parent5810f3ae6446903fadc9860d8ba2c24515a448b3 (diff)
downloadtcl-e0efa747c2cefb29ffa4c46bf1c0d8b3923bd600.zip
tcl-e0efa747c2cefb29ffa4c46bf1c0d8b3923bd600.tar.gz
tcl-e0efa747c2cefb29ffa4c46bf1c0d8b3923bd600.tar.bz2
* library/platform/shell.tcl: Made more robust if an older platform
* library/platform/pkgIndex.tcl: package is present in the inspected * unix/Makefile.in: shell. Package forget it to prevent errors. Bumped * win/Makefile.in: package version to 1.1.3, and updated the makefiles installing it as Tcl Module.
-rw-r--r--ChangeLog8
-rw-r--r--library/platform/pkgIndex.tcl2
-rw-r--r--library/platform/shell.tcl14
-rw-r--r--unix/Makefile.in6
-rw-r--r--win/Makefile.in6
5 files changed, 28 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index c300529..b095a5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-09 Andreas Kupries <andreask@activestate.com>
+
+ * library/platform/shell.tcl: Made more robust if an older platform
+ * library/platform/pkgIndex.tcl: package is present in the inspected
+ * unix/Makefile.in: shell. Package forget it to prevent errors. Bumped
+ * win/Makefile.in: package version to 1.1.3, and updated the Makefiles
+ installing it as Tcl Module.
+
2007-03-09 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* generic/tclCmdIL.c (Tcl_LsortObjCmd): Handle tricky case with loss
diff --git a/library/platform/pkgIndex.tcl b/library/platform/pkgIndex.tcl
index e38e770..d141612 100644
--- a/library/platform/pkgIndex.tcl
+++ b/library/platform/pkgIndex.tcl
@@ -1,3 +1,3 @@
package ifneeded platform 1.0.2 [list source [file join $dir platform.tcl]]
-package ifneeded platform::shell 1.1.2 [list source [file join $dir shell.tcl]]
+package ifneeded platform::shell 1.1.3 [list source [file join $dir shell.tcl]]
diff --git a/library/platform/shell.tcl b/library/platform/shell.tcl
index 6c1be5d..b007666 100644
--- a/library/platform/shell.tcl
+++ b/library/platform/shell.tcl
@@ -26,8 +26,14 @@ proc ::platform::shell::generic {shell} {
LOCATE base out
set code {}
+ # Forget any pre-existing platform package, it might be in
+ # conflict with this one.
+ lappend code {package forget platform}
+ # Inject our platform package
lappend code [list source $base]
+ # Query and print the architecture
lappend code {puts [platform::generic]}
+ # And done
lappend code {exit 0}
set arch [RUN $shell [join $code \n]]
@@ -45,8 +51,14 @@ proc ::platform::shell::identify {shell} {
LOCATE base out
set code {}
+ # Forget any pre-existing platform package, it might be in
+ # conflict with this one.
+ lappend code {package forget platform}
+ # Inject our platform package
lappend code [list source $base]
+ # Query and print the architecture
lappend code {puts [platform::identify]}
+ # And done
lappend code {exit 0}
set arch [RUN $shell [join $code \n]]
@@ -221,4 +233,4 @@ proc ::platform::shell::DIR {} {
# ### ### ### ######### ######### #########
## Ready
-package provide platform::shell 1.1.2
+package provide platform::shell 1.1.3
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 09e7a0a..1e2e7a0 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -4,7 +4,7 @@
# "./configure", which is a configuration script generated by the "autoconf"
# program (constructs like "@foo@" will get replaced in the actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.202 2007/03/05 23:28:25 andreas_kupries Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.203 2007/03/09 20:04:39 andreas_kupries Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -797,8 +797,8 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
@echo "Installing package platform 1.0.2 as a Tcl Module";
@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.2.tm;
- @echo "Installing package platform::shell 1.1.2 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform/shell-1.1.2.tm;
+ @echo "Installing package platform::shell 1.1.3 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform/shell-1.1.3.tm;
@echo "Installing library encoding directory";
@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
diff --git a/win/Makefile.in b/win/Makefile.in
index 353180b..94144dd 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
# "./configure", which is a configuration script generated by the "autoconf"
# program (constructs like "@foo@" will get replaced in the actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.112 2007/03/05 23:28:26 andreas_kupries Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.113 2007/03/09 20:04:39 andreas_kupries Exp $
VERSION = @TCL_VERSION@
@@ -646,8 +646,8 @@ install-libraries: libraries install-tzdata install-msgs
@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3a1.tm;
@echo "Installing package platform 1.0.2 as a Tcl Module";
@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.2.tm;
- @echo "Installing package platform::shell 1.1.2 as a Tcl Module";
- @$(COPY) $(ROOT_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform/shell-1.1.2.tm;
+ @echo "Installing package platform::shell 1.1.3 as a Tcl Module";
+ @$(COPY) $(ROOT_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform/shell-1.1.3.tm;
@echo "Installing encodings";
@for i in $(ROOT_DIR)/library/encoding/*.enc ; do \
$(COPY) "$$i" "$(SCRIPT_INSTALL_DIR)/encoding"; \