Author: borisk
Date: Mon Mar 3 01:41:18 2008
New Revision: 633004
URL: http://svn.apache.org/viewvc?rev=633004&view=rev
Log:
Get rid of the deprecated prefix in the icu message loader resource file (patch
from XERCESC-1769 by Tiziano Müller).
Removed:
xerces/c/branches/xerces-2/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list-unix.txt
xerces/c/branches/xerces-2/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list-wins.txt
Modified:
xerces/c/branches/xerces-2/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
xerces/c/branches/xerces-2/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt
xerces/c/branches/xerces-2/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak
Modified:
xerces/c/branches/xerces-2/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
URL:
http://svn.apache.org/viewvc/xerces/c/branches/xerces-2/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in?rev=633004&r1=633003&r2=633004&view=diff
==============================================================================
---
xerces/c/branches/xerces-2/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
(original)
+++
xerces/c/branches/xerces-2/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
Mon Mar 3 01:41:18 2008
@@ -61,7 +61,6 @@
INVOKE=$(shell icu-config --invoke)
#GENRB=$(shell icu-config --invoke=genrb)
GENRB=genrb
-GENRBOPT=--package-name $(PKGNAME)
#PKGDATA=$(shell icu-config --invoke=pkgdata)
PKGDATA=pkgdata
SO=$(shell icu-config --so)
@@ -111,10 +110,10 @@
# Resource files. Add new ones for additional locales here.
# keep in sync with the file RESLIST
-RESFILES=$(RESNAME)_en_US.res
+RESFILES=en_US.res
# list of resource bundles - keep in sync with RESFILES
-RESLIST=res-file-list-unix.txt
+RESLIST=res-file-list.txt
# list of targets that aren't actually created
.PHONY: all clean distclean check report
@@ -149,9 +148,9 @@
$(INVOKE) $(CHECK_VARS) ./$(TARGET) $(CHECK_ARGS) | tee $(TARGET).out
## resources
-$(RESNAME)_%.res: %.txt
+%.res: %.txt
@echo "generating $@"
- $(GENRB) $(GENRBOPT) $^
+ $(GENRB) $^
#end of rules.mk
Modified:
xerces/c/branches/xerces-2/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt
URL:
http://svn.apache.org/viewvc/xerces/c/branches/xerces-2/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt?rev=633004&r1=633003&r2=633004&view=diff
==============================================================================
---
xerces/c/branches/xerces-2/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt
(original)
+++
xerces/c/branches/xerces-2/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt
Mon Mar 3 01:41:18 2008
@@ -1 +1 @@
-XercesMessages2_8_0_en_US.res
\ No newline at end of file
+en_US.res
Modified:
xerces/c/branches/xerces-2/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak
URL:
http://svn.apache.org/viewvc/xerces/c/branches/xerces-2/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak?rev=633004&r1=633003&r2=633004&view=diff
==============================================================================
---
xerces/c/branches/xerces-2/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak
(original)
+++
xerces/c/branches/xerces-2/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak
Mon Mar 3 01:41:18 2008
@@ -11,7 +11,7 @@
#
# . When adding a resource source (.txt) file for a new locale,
# the corresponding .res file must be added to this list,
-# . AND to the file res-file-list-wins.txt
+# . AND to the file res-file-list.txt
#
# keep synchronous with ICUMsgLoader.cpp
#
@@ -39,10 +39,9 @@
#
# Inference rule, for compiling a .txt file into a .res file.
-# -t fools make into thinking there are files such as es.res, etc
#
.txt.res:
- $(GENRB) -t --package-name $(PKGNAME) -d . $*.txt
+ $(GENRB) -d . $*.txt
#
# all - nmake starts here by default
@@ -50,5 +49,4 @@
all: $(TARGET_DLL)
$(TARGET_DLL): $(RESFILES)
- $(PKGDATA) --name $(PKGNAME) -v -O R:$(ICUROOT) --mode dll -d .
res-file-list-wins.txt
-
+ $(PKGDATA) --name $(PKGNAME) -v -O R:$(ICUROOT) --mode dll -d .
res-file-list.txt
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
