From cfbf5639c39a78473e6f0b67d85e31d86138717e Mon Sep 17 00:00:00 2001
From: PeiYong Zhang <peiyongz@apache.org>
Date: Thu, 4 Nov 2004 18:37:09 +0000
Subject: [PATCH] set pkgname=XercesMessage$(VER) both genrb and pkgdata refer
to the same pkgname
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@176173 13f79535-47bb-0310-9956-ffa450edef68
---
src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in | 9 +++++----
.../util/MsgLoaders/ICU/resources/res-file-list.txt | 2 +-
src/xercesc/util/MsgLoaders/ICU/resources/resources.mak | 8 ++++----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in b/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
index 7633e947f..a14a746f9 100644
--- a/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
+++ b/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
@@ -59,7 +59,7 @@ LDFLAGS_USTDIO =$(shell icu-config --ldflags-ustdio)
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 @@ RESMODE=dll
# Resource shortname
RESNAME=XercesMessages
+PKGNAME=XercesMessages$(VER)
RESLDFLAGS=
CHECK_VARS= ICU_DATA=$(RESDIR)
@@ -112,7 +113,7 @@ $(TARGET): $(OBJECTS)
$(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 @@ $(RESTARGET): $(RESFILES)
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 @@ check: $(TARGET)
$(INVOKE) $(CHECK_VARS) ./$(TARGET) $(CHECK_ARGS) | tee $(TARGET).out
## resources
-$(RESNAME)_%.res: %.txt
+$(PKGNAME)_%.res: %.txt
@echo "generating $@"
$(GENRB) $(GENRBOPT) $^
diff --git a/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt b/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt
index 2bc274401..cfa13d79e 100644
--- a/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt
+++ b/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt
@@ -1 +1 @@
-XercesMessages_en_US.res
\ No newline at end of file
+XercesMessages2_6_0_en_US.res
\ No newline at end of file
diff --git a/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak b/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak
index 20bd9831a..c0edf2950 100644
--- a/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak
+++ b/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak
@@ -21,9 +21,9 @@ include ..\..\..\..\..\..\version.incl
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 @@ REN = ren
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
--
GitLab