stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r439399 - in /incubator/stdcxx/trunk/etc/config: GNUmakefile.bin run_locale_utils.sh
Date Fri, 01 Sep 2006 18:01:55 GMT
Author: sebor
Date: Fri Sep  1 11:01:54 2006
New Revision: 439399

URL: http://svn.apache.org/viewvc?rev=439399&view=rev
Log:
2006-09-01  Andrew Black  <ablack@roguewave.com>

	* run_locale_utils.sh (test_locale): Corrected locale target name
	conversion patterns to avoid errors due to sed removing the trailing
	part of ANSI_X3.4-1968.
	* GNUmakefile.bin (LOCALE_LIST, DEPENDDIR/localedb.d): Simplified
	and made consistent sed patterns used to convert locale target names
	into locale and character map parameters.

Modified:
    incubator/stdcxx/trunk/etc/config/GNUmakefile.bin
    incubator/stdcxx/trunk/etc/config/run_locale_utils.sh

Modified: incubator/stdcxx/trunk/etc/config/GNUmakefile.bin
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/GNUmakefile.bin?rev=439399&r1=439398&r2=439399&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/GNUmakefile.bin (original)
+++ incubator/stdcxx/trunk/etc/config/GNUmakefile.bin Fri Sep  1 11:01:54 2006
@@ -8,7 +8,7 @@
 
 include ../makefile.in
 
-SRCDIRS = $(TOPDIR)/util
+SRCDIRS = $(TOPDIR)/src/util
 
 # include common variables setting for all makefiles
 ONE_REPOSITORY = 1
@@ -90,10 +90,8 @@
 # the rule presents as dependencies the source files corresponding
 # to that locale; it is run once for each entry in LOCALE_LIST
 $(LOCALE_LIST):
-	@(lname=`echo $@ |                                                   \
-                 sed s:"\([^.]*\)\.\([^>@]*\)\(.*\)":"\1\3":g | tr "@" "."`; \
-          cname=`echo $@ |                                                   \
-                 sed s:"\([^.]*\)\.\([^>@]*\)\(.*\)":"\2":g | tr "@" "."`;   \
+	@(lname=`echo $@ | sed "s:\([^.]*\)\.\([^@]*\)\(.*\):\1\3:;y:@:.:"`;     \
+          cname=`echo $@ | sed "s:\([^.]*\)\.\([^@]*\)\(.*\):\2:"`;          \
           echo "./localedef -w -c -f $(NLSDIR)/charmaps/$$cname"             \
                "-i $(NLSDIR)/src/$$lname $(LOCDIR)/$@";                      \
           ./localedef -w -c -f $(NLSDIR)/charmaps/$$cname                    \
@@ -103,9 +101,8 @@
 	@(echo "# generated locale dependencies" > $@;                      \
           for f in $(LOCALE_LIST); do                                       \
               lname=`echo $$f |                                             \
-                sed s:"\([^.]*\)\.\([^>@]*\)\(.*\)":"\1\3":g | tr "@" "."`; \
-              cname=`echo $$f |                                             \
-                sed s:"\([^.]*\)\.\([^>@]*\)\(.*\)":"\2":g`;                \
+                sed "s:\([^.]*\)\.\([^@]*\)\(.*\):\1\3:;y:@:.:"`;           \
+              cname=`echo $$f | sed "s:\([^.]*\)\.\([^@]*\)\(.*\):\2:"`;    \
               f=$$f;                                                        \
               echo "generating dependencies for $$f";                       \
               printf "%-32s:%s %s\n" $$f                                    \

Modified: incubator/stdcxx/trunk/etc/config/run_locale_utils.sh
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/run_locale_utils.sh?rev=439399&r1=439398&r2=439399&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/run_locale_utils.sh (original)
+++ incubator/stdcxx/trunk/etc/config/run_locale_utils.sh Fri Sep  1 11:01:54 2006
@@ -231,11 +231,8 @@
     fi
 
     # get locale's name and encoding
-    locale_src=`echo $3 | \
-                sed -n "s:\([^\.]*\)\.\([^\.\@]*\)\(.*\):\1\3:;\
-                        s:\@$::;y:@:.:;p"`;
-    locale_encoding=`echo $3 | \
-                     sed -n "s:\([^\.]*\)\.\([^\.\@]*\)\(.*\):\2:p"`;
+    locale_src=`echo $3 | sed "s:\([^.]*\)\.\([^@]*\)\(.*\):\1\3:;y:@:.:"`;
+    locale_encoding=`echo $3 | sed "s:\([^.]*\)\.\([^@]*\)\(.*\):\2:"`;
 
     ## generate the first locale database
     generate_locale $1/charmaps/$locale_encoding     \



Mime
View raw message