summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2009-05-29 16:28:03 (GMT)
committerandreas_kupries <akupries@shaw.ca>2009-05-29 16:28:03 (GMT)
commit8b7d58d45372ecb03111fa3d1b23d8d161074295 (patch)
tree9b548d400962a38dc606dc3c70f2ef17192547d3
parentc928dd4059aa6908a40bcb9e7ce94c163e6abfdf (diff)
downloadtcl-8b7d58d45372ecb03111fa3d1b23d8d161074295.zip
tcl-8b7d58d45372ecb03111fa3d1b23d8d161074295.tar.gz
tcl-8b7d58d45372ecb03111fa3d1b23d8d161074295.tar.bz2
* library/platform/platform.tcl: Fixed handling of cpu ia64,
* library/platform/pkgIndex.tcl: taking ia64_32 into account * unix/Makefile.in: now. Bumped version to 1.0.5. Updated the * win/Makefile.in: installation commands.
-rw-r--r--ChangeLog7
-rw-r--r--library/platform/pkgIndex.tcl2
-rw-r--r--library/platform/platform.tcl6
-rw-r--r--unix/Makefile.in6
-rw-r--r--win/Makefile.in6
5 files changed, 17 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 268dca7..a7e99d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-29 Andreas Kupries <andreask@activestate.com>
+
+ * library/platform/platform.tcl: Fixed handling of cpu ia64,
+ * library/platform/pkgIndex.tcl: taking ia64_32 into account
+ * unix/Makefile.in: now. Bumped version to 1.0.5. Updated the
+ * win/Makefile.in: installation commands.
+
2009-05-07 Miguel Sofer <msofer@users.sf.net>
* generic/tclObj.c (Tcl_GetCommandFromObj): fix for bug [2785893],
diff --git a/library/platform/pkgIndex.tcl b/library/platform/pkgIndex.tcl
index a63f4aa..0b69432 100644
--- a/library/platform/pkgIndex.tcl
+++ b/library/platform/pkgIndex.tcl
@@ -1,3 +1,3 @@
-package ifneeded platform 1.0.4 [list source [file join $dir platform.tcl]]
+package ifneeded platform 1.0.5 [list source [file join $dir platform.tcl]]
package ifneeded platform::shell 1.1.4 [list source [file join $dir shell.tcl]]
diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl
index b42c419..1a454cd 100644
--- a/library/platform/platform.tcl
+++ b/library/platform/platform.tcl
@@ -103,7 +103,7 @@ proc ::platform::generic {} {
}
sunos {
set plat solaris
- if {$cpu ne "ia64"} {
+ if {![string match "ia64*" $cpu]} {
if {$tcl_platform(wordSize) == 8} {
append cpu 64
}
@@ -127,7 +127,7 @@ proc ::platform::generic {} {
}
hp-ux {
set plat hpux
- if {$cpu ne "ia64"} {
+ if {![string match "ia64*" $cpu]} {
set cpu parisc
if {$tcl_platform(wordSize) == 8} {
append cpu 64
@@ -289,7 +289,7 @@ proc ::platform::patterns {id} {
# ### ### ### ######### ######### #########
## Ready
-package provide platform 1.0.4
+package provide platform 1.0.5
# ### ### ### ######### ######### #########
## Demo application
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 3a4c8ac..77e50ea 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.229.2.15 2009/04/24 15:15:11 stwo Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.229.2.16 2009/05/29 16:28:04 andreas_kupries Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -798,8 +798,8 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
@echo "Installing package tcltest 2.3.1 as a Tcl Module";
@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.1.tm;
- @echo "Installing package platform 1.0.4 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.4.tm;
+ @echo "Installing package platform 1.0.5 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.5.tm;
@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
diff --git a/win/Makefile.in b/win/Makefile.in
index 7ae9c93..cf44f03 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.124.2.9 2009/04/09 17:05:42 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.124.2.10 2009/05/29 16:28:04 andreas_kupries Exp $
VERSION = @TCL_VERSION@
@@ -646,8 +646,8 @@ install-libraries: libraries install-tzdata install-msgs
@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/msgcat-1.4.2.tm;
@echo "Installing package tcltest 2.3.1 as a Tcl Module";
@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3.1.tm;
- @echo "Installing package platform 1.0.4 as a Tcl Module";
- @$(COPY) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.4.tm;
+ @echo "Installing package platform 1.0.5 as a Tcl Module";
+ @$(COPY) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.5.tm;
@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
@$(COPY) $(ROOT_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform/shell-1.1.4.tm;
@echo "Installing encodings";