summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroehhar <harald.oehlmann@elmicron.de>2012-09-17 06:42:02 (GMT)
committeroehhar <harald.oehlmann@elmicron.de>2012-09-17 06:42:02 (GMT)
commitfd70297b820fcad022629bfd4d0ff5e1a550aaaa (patch)
treea6050b32995945729be416ce1de4188709a04820
parent4dbba767c34ef9df1449908d3b71e130ebf74dc5 (diff)
downloadtcl-fd70297b820fcad022629bfd4d0ff5e1a550aaaa.zip
tcl-fd70297b820fcad022629bfd4d0ff5e1a550aaaa.tar.gz
tcl-fd70297b820fcad022629bfd4d0ff5e1a550aaaa.tar.bz2
Correct build version and backported 973091ef75tip404_tcl8_5
-rw-r--r--ChangeLog8
-rw-r--r--changes3
-rw-r--r--tests/msgcat.test7
-rw-r--r--unix/Makefile.in4
-rw-r--r--win/Makefile.in4
5 files changed, 19 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d2d296..9f63bc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,11 @@
IMPLEMENTATION OF TIP#404.
- * library/msgcat.tcl: [FRQ 3544988] (Backport from tcl8.6): add commands
- [mcflset] and [mcflmset] to set mc entries with implicit message file
- locale. Package version is now 1.5.0.
+ * library/msgcat/msgcat.tcl: [FRQ 3544988]: (Backport from Tcl 8.6)
+ * library/msgcat/pkgIndex.tcl: New commands [mcflset] and [mcflmset]
+ * unix/Makefile.in: to set mc entries with implicit message
+ * win/Makefile.in: file locale. Bump to 1.5.0.
+ * tests/msgcat.test:
2012-09-07 Alexandre Ferrieux <ferrieux@users.sourceforge.net>
diff --git a/changes b/changes
index 6709726..3221846 100644
--- a/changes
+++ b/changes
@@ -7655,6 +7655,9 @@ and Tcl_FSMountsChanged(). (porter)
2012-07-25 (bug fix)[3546275] [auto_execok] search match [exec] (danckaert)
+2012-09-12 (TIP 404) New msgcat commands [mcflset], [mcflmset] (oehlmann)
+=> msgcat 1.5.0
+
Many revisions to better support a Cygwin environment (nijtmans)
--- Released 8.5.12, July 27, 2011 --- See ChangeLog for details ---
diff --git a/tests/msgcat.test b/tests/msgcat.test
index d75bf8e..0edb1d2 100644
--- a/tests/msgcat.test
+++ b/tests/msgcat.test
@@ -56,6 +56,13 @@ namespace eval ::msgcat::test {
set result [string tolower \
[msgcat::ConvertLocale $::tcl::mac::locale]]
} else {
+ if {([info sharedlibextension] == ".dll")
+ && ![catch {package require registry}]} {
+ # Windows and Cygwin have other ways to determine the
+ # locale when the environment variables are missing
+ # and the registry package is present
+ continue
+ }
set result c
}
}
diff --git a/unix/Makefile.in b/unix/Makefile.in
index bdcbda0..a2d89aa 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -773,8 +773,8 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
do \
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
done;
- @echo "Installing package msgcat 1.4.5 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.5.tm;
+ @echo "Installing package msgcat 1.5.0 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.0.tm;
@echo "Installing package tcltest 2.3.4 as a Tcl Module";
@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.4.tm;
diff --git a/win/Makefile.in b/win/Makefile.in
index 8e01818..b0bdec8 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -644,8 +644,8 @@ install-libraries: libraries install-tzdata install-msgs
do \
$(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
done;
- @echo "Installing package msgcat 1.4.5 as a Tcl Module";
- @$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/msgcat-1.4.5.tm;
+ @echo "Installing package msgcat 1.5.0 as a Tcl Module";
+ @$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/msgcat-1.5.0.tm;
@echo "Installing package tcltest 2.3.4 as a Tcl Module";
@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3.4.tm;
@echo "Installing package platform 1.0.10 as a Tcl Module";