From 1675ea2aa8d1b4b97e6be8d495d8b9327bf03de4 Mon Sep 17 00:00:00 2001
From: PeiYong Zhang <peiyongz@apache.org>
Date: Wed, 10 Nov 2004 16:54:15 +0000
Subject: [PATCH] To build ICU3.2(d02)
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@176190 13f79535-47bb-0310-9956-ffa450edef68
---
scripts/packageBinaries.pl | 70 ++++++++++++++++++------------------
src/xercesc/Makefile.in | 72 +++++++++++++++++++-------------------
src/xercesc/Makefile.incl | 12 +++----
3 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/scripts/packageBinaries.pl b/scripts/packageBinaries.pl
index 246e38108..b15b3df6a 100644
--- a/scripts/packageBinaries.pl
+++ b/scripts/packageBinaries.pl
@@ -356,13 +356,13 @@ if ($platform =~ m/Windows/ || ($platform =~ m/CYGWIN/ && !($opt_c =~ m/gcc/)))
print ("\n\nCopying icu outputs ...\n");
# Copy the ICU dlls and libs
- psystem("cp -fv $ICUROOT/bin/icuuc30.dll $targetdir/bin");
- psystem("cp -fv $ICUROOT/bin/icuuc30d.dll $targetdir/bin");
+ psystem("cp -fv $ICUROOT/bin/icuuc32.dll $targetdir/bin");
+ psystem("cp -fv $ICUROOT/bin/icuuc32d.dll $targetdir/bin");
- # it seems icudt30*.DLL is generated (upper case dll)
+ # it seems icudt32*.DLL is generated (upper case dll)
# but just case, try lower case .dll as well
- psystem("cp -fv $ICUROOT/bin/icudt30*.DLL $targetdir/bin");
- psystem("cp -fv $ICUROOT/bin/icudt30*.dll $targetdir/bin");
+ psystem("cp -fv $ICUROOT/bin/icudt32*.DLL $targetdir/bin");
+ psystem("cp -fv $ICUROOT/bin/icudt32*.dll $targetdir/bin");
psystem("cp -fv $ICUROOT/lib/icuuc.lib $targetdir/lib");
psystem("cp -fv $ICUROOT/lib/icuucd.lib $targetdir/lib");
@@ -1118,51 +1118,51 @@ sub copyICUOnUNIX() {
#
# copy icudata dll
# For ICU 2.6:
- # on AIX, it is called libicudata30.0.a
- # on Solaris/Linux, it is called libicudata.so.30.0
- # on HP, it is called libicudata.sl.30.0
+ # on AIX, it is called libicudata32.0.a
+ # on Solaris/Linux, it is called libicudata.so.32.0
+ # on HP, it is called libicudata.sl.32.0
#
psystem("rm -f libicudata*");
- psystem("cp -f $ICUROOT/lib/libicudata30.0.so .");
- psystem("cp -f $ICUROOT/lib/libicudata30.0.a .");
- psystem("cp -f $ICUROOT/lib/libicudata.so.30.0 .");
- psystem("cp -f $ICUROOT/lib/libicudata.sl.30.0 .");
+ psystem("cp -f $ICUROOT/lib/libicudata32.0.so .");
+ psystem("cp -f $ICUROOT/lib/libicudata32.0.a .");
+ psystem("cp -f $ICUROOT/lib/libicudata.so.32.0 .");
+ psystem("cp -f $ICUROOT/lib/libicudata.sl.32.0 .");
- psystem("find . -name 'libicudata30.0.so' -exec ln -s {} libicudata.so \\;");
- psystem("find . -name 'libicudata30.0.so' -exec ln -s {} libicudata30.so \\;");
+ psystem("find . -name 'libicudata32.0.so' -exec ln -s {} libicudata.so \\;");
+ psystem("find . -name 'libicudata32.0.so' -exec ln -s {} libicudata32.so \\;");
- psystem("find . -name 'libicudata30.0.a' -exec ln -s {} libicudata.a \\;");
- psystem("find . -name 'libicudata30.0.a' -exec ln -s {} libicudata30.a \\;");
+ psystem("find . -name 'libicudata32.0.a' -exec ln -s {} libicudata.a \\;");
+ psystem("find . -name 'libicudata32.0.a' -exec ln -s {} libicudata32.a \\;");
- psystem("find . -name 'libicudata.so.30.0' -exec ln -s {} libicudata.so \\;");
- psystem("find . -name 'libicudata.so.30.0' -exec ln -s {} libicudata.so.30 \\;");
+ psystem("find . -name 'libicudata.so.32.0' -exec ln -s {} libicudata.so \\;");
+ psystem("find . -name 'libicudata.so.32.0' -exec ln -s {} libicudata.so.32 \\;");
- psystem("find . -name 'libicudata.sl.30.0' -exec ln -s {} libicudata.sl \\;");
- psystem("find . -name 'libicudata.sl.30.0' -exec ln -s {} libicudata.sl.30 \\;");
+ psystem("find . -name 'libicudata.sl.32.0' -exec ln -s {} libicudata.sl \\;");
+ psystem("find . -name 'libicudata.sl.32.0' -exec ln -s {} libicudata.sl.32 \\;");
#
# copy icuuc dll
- # on AIX, it is called libicuuc30.0.a
- # on Solaris/Linux, it is called libicuuc.so.30.0
- # on HP, it is called libicuuc.sl.30.0
+ # on AIX, it is called libicuuc32.0.a
+ # on Solaris/Linux, it is called libicuuc.so.32.0
+ # on HP, it is called libicuuc.sl.32.0
#
psystem("rm -f libicuuc*");
- psystem("cp -f $ICUROOT/lib/libicuuc30.0.so .");
- psystem("cp -f $ICUROOT/lib/libicuuc30.0.a .");
- psystem("cp -f $ICUROOT/lib/libicuuc.so.30.0 .");
- psystem("cp -f $ICUROOT/lib/libicuuc.sl.30.0 .");
+ psystem("cp -f $ICUROOT/lib/libicuuc32.0.so .");
+ psystem("cp -f $ICUROOT/lib/libicuuc32.0.a .");
+ psystem("cp -f $ICUROOT/lib/libicuuc.so.32.0 .");
+ psystem("cp -f $ICUROOT/lib/libicuuc.sl.32.0 .");
- psystem("find . -name 'libicuuc30.0.so' -exec ln -s {} libicuuc.so \\;");
- psystem("find . -name 'libicuuc30.0.so' -exec ln -s {} libicuuc30.so \\;");
+ psystem("find . -name 'libicuuc32.0.so' -exec ln -s {} libicuuc.so \\;");
+ psystem("find . -name 'libicuuc32.0.so' -exec ln -s {} libicuuc32.so \\;");
- psystem("find . -name 'libicuuc30.0.a' -exec ln -s {} libicuuc.a \\;");
- psystem("find . -name 'libicuuc30.0.a' -exec ln -s {} libicuuc30.a \\;");
+ psystem("find . -name 'libicuuc32.0.a' -exec ln -s {} libicuuc.a \\;");
+ psystem("find . -name 'libicuuc32.0.a' -exec ln -s {} libicuuc32.a \\;");
- psystem("find . -name 'libicuuc.so.30.0' -exec ln -s {} libicuuc.so \\;");
- psystem("find . -name 'libicuuc.so.30.0' -exec ln -s {} libicuuc.so.30 \\;");
+ psystem("find . -name 'libicuuc.so.32.0' -exec ln -s {} libicuuc.so \\;");
+ psystem("find . -name 'libicuuc.so.32.0' -exec ln -s {} libicuuc.so.32 \\;");
- psystem("find . -name 'libicuuc.sl.30.0' -exec ln -s {} libicuuc.sl \\;");
- psystem("find . -name 'libicuuc.sl.30.0' -exec ln -s {} libicuuc.sl.30 \\;");
+ psystem("find . -name 'libicuuc.sl.32.0' -exec ln -s {} libicuuc.sl \\;");
+ psystem("find . -name 'libicuuc.sl.32.0' -exec ln -s {} libicuuc.sl.32 \\;");
}
diff --git a/src/xercesc/Makefile.in b/src/xercesc/Makefile.in
index 427e47600..bf1b1991a 100644
--- a/src/xercesc/Makefile.in
+++ b/src/xercesc/Makefile.in
@@ -209,44 +209,44 @@ endif
-${CP} -Rf ${XERCESCROOT}/lib/${REAL_NAME} ${BINTARGETDIR}/lib
-${CD} ${BINTARGETDIR}/lib; ln -s ${REAL_NAME} ${SO_NAME}; ln -s ${REAL_NAME} ${LINK_NAME}
ifeq (${TRANSCODER},ICU)
- -${CP} -Rf ${ICUROOT}/lib/libicudata30.0.so ${BINTARGETDIR}/lib
- -${CP} -Rf ${ICUROOT}/lib/libicudata.so.30.0 ${BINTARGETDIR}/lib
- -${CP} -Rf ${ICUROOT}/lib/libicudata.sl.30.0 ${BINTARGETDIR}/lib
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata30.0.so' -exec ln -s {} libicudata.so \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata30.0.so' -exec ln -s {} libicudata30.so \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.30.0' -exec ln -s {} libicudata.so \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.30.0' -exec ln -s {} libicudata.so.30 \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.30.0' -exec ln -s {} libicudata.sl \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.30.0' -exec ln -s {} libicudata.sl.30 \;
- -${CP} -Rf ${ICUROOT}/lib/libicuuc30.0.so ${BINTARGETDIR}/lib
- -${CP} -Rf ${ICUROOT}/lib/libicuuc.so.30.0 ${BINTARGETDIR}/lib
- -${CP} -Rf ${ICUROOT}/lib/libicuuc.sl.30.0 ${BINTARGETDIR}/lib
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc30.0.so' -exec ln -s {} libicuuc.so \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc30.0.so' -exec ln -s {} libicuuc30.so \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.30.0' -exec ln -s {} libicuuc.so \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.30.0' -exec ln -s {} libicuuc.so.30 \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.30.0' -exec ln -s {} libicuuc.sl \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.30.0' -exec ln -s {} libicuuc.sl.30 \;
+ -${CP} -Rf ${ICUROOT}/lib/libicudata32.0.so ${BINTARGETDIR}/lib
+ -${CP} -Rf ${ICUROOT}/lib/libicudata.so.32.0 ${BINTARGETDIR}/lib
+ -${CP} -Rf ${ICUROOT}/lib/libicudata.sl.32.0 ${BINTARGETDIR}/lib
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata32.0.so' -exec ln -s {} libicudata.so \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata32.0.so' -exec ln -s {} libicudata32.so \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.32.0' -exec ln -s {} libicudata.so \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.32.0' -exec ln -s {} libicudata.so.32 \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.32.0' -exec ln -s {} libicudata.sl \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.32.0' -exec ln -s {} libicudata.sl.32 \;
+ -${CP} -Rf ${ICUROOT}/lib/libicuuc32.0.so ${BINTARGETDIR}/lib
+ -${CP} -Rf ${ICUROOT}/lib/libicuuc.so.32.0 ${BINTARGETDIR}/lib
+ -${CP} -Rf ${ICUROOT}/lib/libicuuc.sl.32.0 ${BINTARGETDIR}/lib
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc32.0.so' -exec ln -s {} libicuuc.so \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc32.0.so' -exec ln -s {} libicuuc32.so \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.32.0' -exec ln -s {} libicuuc.so \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.32.0' -exec ln -s {} libicuuc.so.32 \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.32.0' -exec ln -s {} libicuuc.sl \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.32.0' -exec ln -s {} libicuuc.sl.32 \;
else
ifeq (${MESSAGELOADER},ICU)
- -${CP} -Rf ${ICUROOT}/lib/libicudata30.0.so ${BINTARGETDIR}/lib
- -${CP} -Rf ${ICUROOT}/lib/libicudata.so.30.0 ${BINTARGETDIR}/lib
- -${CP} -Rf ${ICUROOT}/lib/libicudata.sl.30.0 ${BINTARGETDIR}/lib
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata30.0.so' -exec ln -s {} libicudata.so \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata30.0.so' -exec ln -s {} libicudata30.so \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.30.0' -exec ln -s {} libicudata.so \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.30.0' -exec ln -s {} libicudata.so.30 \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.30.0' -exec ln -s {} libicudata.sl \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.30.0' -exec ln -s {} libicudata.sl.30 \;
- -${CP} -Rf ${ICUROOT}/lib/libicuuc30.0.so ${BINTARGETDIR}/lib
- -${CP} -Rf ${ICUROOT}/lib/libicuuc.so.30.0 ${BINTARGETDIR}/lib
- -${CP} -Rf ${ICUROOT}/lib/libicuuc.sl.30.0 ${BINTARGETDIR}/lib
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc30.0.so' -exec ln -s {} libicuuc.so \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc30.0.so' -exec ln -s {} libicuuc30.so \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.30.0' -exec ln -s {} libicuuc.so \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.30.0' -exec ln -s {} libicuuc.so.30 \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.30.0' -exec ln -s {} libicuuc.sl \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.30.0' -exec ln -s {} libicuuc.sl.30 \;
+ -${CP} -Rf ${ICUROOT}/lib/libicudata32.0.so ${BINTARGETDIR}/lib
+ -${CP} -Rf ${ICUROOT}/lib/libicudata.so.32.0 ${BINTARGETDIR}/lib
+ -${CP} -Rf ${ICUROOT}/lib/libicudata.sl.32.0 ${BINTARGETDIR}/lib
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata32.0.so' -exec ln -s {} libicudata.so \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata32.0.so' -exec ln -s {} libicudata32.so \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.32.0' -exec ln -s {} libicudata.so \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.32.0' -exec ln -s {} libicudata.so.32 \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.32.0' -exec ln -s {} libicudata.sl \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.32.0' -exec ln -s {} libicudata.sl.32 \;
+ -${CP} -Rf ${ICUROOT}/lib/libicuuc32.0.so ${BINTARGETDIR}/lib
+ -${CP} -Rf ${ICUROOT}/lib/libicuuc.so.32.0 ${BINTARGETDIR}/lib
+ -${CP} -Rf ${ICUROOT}/lib/libicuuc.sl.32.0 ${BINTARGETDIR}/lib
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc32.0.so' -exec ln -s {} libicuuc.so \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc32.0.so' -exec ln -s {} libicuuc32.so \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.32.0' -exec ln -s {} libicuuc.so \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.32.0' -exec ln -s {} libicuuc.so.32 \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.32.0' -exec ln -s {} libicuuc.sl \;
+ -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.32.0' -exec ln -s {} libicuuc.sl.32 \;
endif
endif
ifeq (${MESSAGELOADER},ICU)
diff --git a/src/xercesc/Makefile.incl b/src/xercesc/Makefile.incl
index ee934436d..50898293f 100644
--- a/src/xercesc/Makefile.incl
+++ b/src/xercesc/Makefile.incl
@@ -205,13 +205,13 @@ ifeq (${PLATFORM}, AIX)
#endif
ifeq (${TRANSCODER}, ICU)
- ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -licuuc30 -licudata30
+ ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -licuuc32 -licudata32
else
ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib
endif
ifeq (${MESSAGELOADER}, ICU)
- ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -licuuc30 -licudata30 -lXercesMessages26
+ ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -licuuc32 -licudata32 -lXercesMessages26
endif
ifeq (${CXXVER}, v5compat)
@@ -536,17 +536,17 @@ MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -D${PLATFORM} -W l,dll ${LDFLAGS}
ifeq (${TRANSCODER}, ICU)
## OS390BATCH
ifeq (${OS390BATCH},1)
- ALLLIBS = "//'${LOADEXP}(IXMI30UC)'"
+ ALLLIBS = "//'${LOADEXP}(IXMI32UC)'"
else
- ALLLIBS = ${ICUROOT}/lib/libicuuc30.0.x
+ ALLLIBS = ${ICUROOT}/lib/libicuuc32.0.x
endif
else
ifeq (${TRANSCODER}, Uniconv390)
## OS390BATCH
ifeq (${OS390BATCH},1)
- ALLLIBS = "//'${LOADEXP}(IXMI30UC)'"
+ ALLLIBS = "//'${LOADEXP}(IXMI32UC)'"
else
- ALLLIBS = ${ICUROOT}/lib/libicuuc30.0.x
+ ALLLIBS = ${ICUROOT}/lib/libicuuc32.0.x
endif
else
ALLLIBS =
--
GitLab