peiyongz 2004/11/04 10:37:09
Modified: c/src/xercesc/util/MsgLoaders/ICU/resources resources.mak
res-file-list.txt Makefile.in
Log:
set pkgname=XercesMessage$(VER)
both genrb and pkgdata refer to the same pkgname
Revision Changes Path
1.10 +4 -4
xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak
Index: resources.mak
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- resources.mak 17 Mar 2003 19:28:15 -0000 1.9
+++ resources.mak 4 Nov 2004 18:37:09 -0000 1.10
@@ -21,9 +21,9 @@
RESFILES= en_US.res
-PKGNAME = XercesMessages
-TARGET_DLL = $(PKGNAME)$(VER).DLL
-TARGET_LIB = $(PKGNAME)$(VER).lib
+PKGNAME = XercesMessages$(VER)
+TARGET_DLL = $(PKGNAME).DLL
+TARGET_LIB = $(PKGNAME).lib
GENRB = $(ICUROOT)\bin\genrb.exe
PKGDATA = $(ICUROOT)\bin\pkgdata
@@ -50,5 +50,5 @@
all: $(TARGET_DLL)
$(TARGET_DLL): $(RESFILES)
- $(PKGDATA) --name $(PKGNAME)$(VER) -v -O R:$(ICUROOT) --mode dll -d .
res-file-list.txt
+ $(PKGDATA) --name $(PKGNAME) -v -O R:$(ICUROOT) --mode dll -d .
res-file-list.txt
1.2 +1 -1
xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt
Index: res-file-list.txt
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- res-file-list.txt 20 Feb 2003 18:08:51 -0000 1.1
+++ res-file-list.txt 4 Nov 2004 18:37:09 -0000 1.2
@@ -1 +1 @@
-XercesMessages_en_US.res
\ No newline at end of file
+XercesMessages2_6_0_en_US.res
\ No newline at end of file
1.7 +5 -4
xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
Index: Makefile.in
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 9 Jul 2004 16:15:25 -0000 1.6
+++ Makefile.in 4 Nov 2004 18:37:09 -0000 1.7
@@ -59,7 +59,7 @@
INVOKE=$(shell icu-config --invoke)
#GENRB=$(shell icu-config --invoke=genrb)
GENRB=genrb
-GENRBOPT=--package-name $(RESNAME)
+GENRBOPT=--package-name $(PKGNAME)
#PKGDATA=$(shell icu-config --invoke=pkgdata)
PKGDATA=pkgdata
SO=$(shell icu-config --so)
@@ -81,6 +81,7 @@
# Resource shortname
RESNAME=XercesMessages
+PKGNAME=XercesMessages$(VER)
RESLDFLAGS=
CHECK_VARS= ICU_DATA=$(RESDIR)
@@ -112,7 +113,7 @@
$(RESTARGET): $(RESFILES)
@echo building ${FQ_RESLIB_REAL_NAME}
- $(PKGDATA) --name $(RESNAME) --mode $(RESMODE) $(PKGDATAOPTS) $(RESLIST)
+ $(PKGDATA) --name $(PKGNAME) --mode $(RESMODE) $(PKGDATAOPTS) $(RESLIST)
mv $(RESTARGET) ${FQ_RESLIB_REAL_NAME}
@echo symlink ${FQ_RESLIB_SO_NAME}
ln -s ${FQ_RESLIB_REAL_NAME} ${FQ_RESLIB_SO_NAME}
@@ -120,7 +121,7 @@
ln -s ${FQ_RESLIB_SO_NAME} ${FQ_RESLIB_LINK_NAME}
res-install: $(RESTARGET)
- $(PKGDATA) --name $(RESNAME) --mode $(RESMODE) $(PKGDATAOPTS) $(RESLIST)
--install $(shell icu-config --libdir)
+ $(PKGDATA) --name $(PKGNAME) --mode $(RESMODE) $(PKGDATAOPTS) $(RESLIST)
--install $(shell icu-config --libdir)
# clean out files
distclean clean: $(CLEAN_SUBDIR)
@@ -132,7 +133,7 @@
$(INVOKE) $(CHECK_VARS) ./$(TARGET) $(CHECK_ARGS) | tee $(TARGET).out
## resources
-$(RESNAME)_%.res: %.txt
+$(PKGNAME)_%.res: %.txt
@echo "generating $@"
$(GENRB) $(GENRBOPT) $^
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
