diff --git a/scripts/packageBinaries.pl b/scripts/packageBinaries.pl
index 59cd7c9dc0373f9661e245f99559293045411a57..85b2c91c98db39daf3bd85928edfc5e3f1715f03 100644
--- a/scripts/packageBinaries.pl
+++ b/scripts/packageBinaries.pl
@@ -1159,13 +1159,9 @@ if ( ($platform =~ m/AIX/i) || ($platform =~ m/HP-UX/i) || ($platform =~ m/BeO
# on AIX, create '.a' version for building libxerces-c
if ( $platform eq "aix") {
- print("\n\n create icuuc and icudata's DOTA version\n");
- psystem("cp -f $ICUROOT/lib/libicudata26.1.so $ICUROOT/lib/libicudata26.a");
- psystem("cp -f $ICUROOT/lib/libicuuc26.1.so $ICUROOT/lib/libicuuc26.a");
+ psystem("ln -s $ICUROOT/lib/libicudata26.1.so $ICUROOT/lib/libicudata26.a");
+ psystem("ln -s $ICUROOT/lib/libicuuc26.1.so $ICUROOT/lib/libicuuc26.a");
}
- else {
- print("\n\n on platform other than aix\n");
- }
}
@@ -1189,15 +1185,6 @@ if ( ($platform =~ m/AIX/i) || ($platform =~ m/HP-UX/i) || ($platform =~ m/BeO
psystem ("$MAKE clean"); # May want to comment this line out to speed up
psystem ("$MAKE");
-
- # on AIX, create '.a' version for building samples and tests
- if ( $platform eq "aix") {
- print("\n\n create xercesc DOTA version\n");
- pchdir ("$XERCESCROOT/lib");
- psystem("cp -f libxerces-c24.0.so libxerces-c24.0.a ");
- psystem("ln -s libxerces-c24.0.a libxerces-c24.a ");
- psystem("ln -s libxerces-c24.a libxerces-c.a ");
- }
# Move ICU libs into lib dir, so samples will link. This matches the structure of
# the eventual binary packaging, even though we are doing it in the build directory.
@@ -1248,8 +1235,8 @@ if ( ($platform =~ m/AIX/i) || ($platform =~ m/HP-UX/i) || ($platform =~ m/BeO
# on AIX, copy '.a' version
if ( $platform eq "aix") {
- psystem("cp -f $ICUROOT/lib/libicudata26.a .");
- psystem("cp -f $ICUROOT/lib/libicuuc26.a .");
+ psystem("ln -s libicudata26.so libicudata26.a");
+ psystem("ln -s libicuuc26.so libicuuc26.a");
}
}
@@ -1354,8 +1341,7 @@ if ( ($platform =~ m/AIX/i) || ($platform =~ m/HP-UX/i) || ($platform =~ m/BeO
psystem("ln -s libxerces-c24.so libxerces-c.so ");
}
- # on AIX, copy '.a' version
- if ( $platform eq "aix") {
+ if ((-e "$XERCESCROOT/lib/libxerces-c24.0.a" )) {
psystem("cp -f $XERCESCROOT/lib/libxerces-c24.0.a . ");
psystem("ln -s libxerces-c24.0.a libxerces-c24.a ");
psystem("ln -s libxerces-c24.a libxerces-c.a ");
@@ -1424,8 +1410,8 @@ if ( ($platform =~ m/AIX/i) || ($platform =~ m/HP-UX/i) || ($platform =~ m/BeO
# on AIX, copy '.a' version
if ( $platform eq "aix") {
- psystem("cp -f $XERCESCROOT/lib/libicudata26.a .");
- psystem("cp -f $XERCESCROOT/lib/libicuuc26.a .");
+ psystem("ln -s libicudata26.so libicudata26.a");
+ psystem("ln -s libicuuc26.so libicuuc26.a");
}
# Copy the Resouce Bundle for ICUMsgLoader
diff --git a/src/xercesc/Makefile.incl b/src/xercesc/Makefile.incl
index aa99b1f8b24365db0c8b1cf7da9d41ad0558aae5..08555d8fe3ef858a1ccfa034c9dc9e8293f74c7a 100644
--- a/src/xercesc/Makefile.incl
+++ b/src/xercesc/Makefile.incl
@@ -146,6 +146,7 @@ ifeq (${PLATFORM}, SOLARIS)
endif
SHLIBSUFFIX=.so
+ ICUSHLIBSUFFIX=.so
## Compiler switch to embed a library name
LD_SONAME = -h ${SO_NAME}
endif
@@ -177,6 +178,7 @@ ifeq (${PLATFORM}, UNIXWARE)
endif
endif
SHLIBSUFFIX=.so
+ ICUSHLIBSUFFIX=.so
endif
#=============== OPENSERVER SPECIFIC OPTIONS =========================
@@ -202,6 +204,7 @@ ifeq (${PLATFORM}, OPENSERVER)
ALLLIBS = ${LIBS}
endif
SHLIBSUFFIX=.so
+ ICUSHLIBSUFFIX=.so
endif
#================= PTX SPECIFIC OPTIONS ===========================
@@ -221,6 +224,7 @@ MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -D${PLATFORM} -G ${LDFLAGS}
MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -D${PLATFORM} -G ${LDFLAGS}
EXTRA_LINK_OPTIONS = -lm -lgen
SHLIBSUFFIX=.so
+ICUSHLIBSUFFIX=.so
endif
#================= AIX SPECIFIC OPTIONS ===========================
@@ -255,7 +259,8 @@ else
endif
EXTRA_LINK_OPTIONS = -bmap:$(XML_OBJ)/${LIBNAME}${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}.map
-SHLIBSUFFIX=.so
+SHLIBSUFFIX=.a
+ICUSHLIBSUFFIX=.so
## Compiler switch to embed a library name
LD_SONAME =
@@ -278,12 +283,14 @@ MAKE_SHARED = makeC++SharedLib_r -p 5000 ${LDFLAGS}
MAKE_SHARED_C = makeC++SharedLib_r -p 5000 ${LDFLAGS}
TO = qwobj
SHLIBSUFFIX=.a
+ICUSHLIBSUFFIX=.a
else
PLATFORM_COMPILE_OPTIONS = -qnotempinc -D_MULTI_THREADED -D${PLATFORM}
PLATFORM_C_COMPILE_OPTIONS = -v -D_MULTI_THREADED -D${PLATFORM}
MAKE_SHARED = ld -v ${LDFLAGS}
MAKE_SHARED_C = ld -v ${LDFLAGS}
SHLIBSUFFIX=.o
+ICUSHLIBSUFFIX=.o
endif
ifeq (${TRANSCODER}, ICU)
ifeq (${SYSOVR},OS400)
@@ -311,6 +318,7 @@ else
endif
EXTRA_LINK_OPTIONS = -Xlinker -Map -Xlinker $(XML_OBJ)/${SO_NAME}.map
SHLIBSUFFIX=.so
+ICUSHLIBSUFFIX=.so
## Compiler switch to embed a library name
LD_SONAME = -Wl,-soname,${SO_NAME}
endif
@@ -345,6 +353,7 @@ endif
EXTRA_LINK_OPTIONS = -Xlinker -Map -Xlinker $(XML_OBJ)/${SO_NAME}.map
SHLIBSUFFIX=.so
+ICUSHLIBSUFFIX=.so
## Compiler switch to embed a library name
LD_SONAME = -Wl,-soname,${SO_NAME}
endif
@@ -366,6 +375,7 @@ endif
EXTRA_LINK_OPTIONS =
SHLIBSUFFIX=.so
+ICUSHLIBSUFFIX=.so
## Compiler switch to embed a library name
LD_SONAME = -Wl,-soname,${SO_NAME}
endif
@@ -382,6 +392,7 @@ else
ALLLIBS = ${LIBS}
endif
SHLIBSUFFIX=.so
+ICUSHLIBSUFFIX=.so
## Compiler switch to embed a library name
LD_SONAME = -Wl,-soname,${SO_NAME}
endif
@@ -398,6 +409,7 @@ else
ALLLIBS = ${LIBS}
endif
SHLIBSUFFIX=.so
+ICUSHLIBSUFFIX=.so
## Compiler switch to embed a library name
LD_SONAME = -Wl,-soname,${SO_NAME}
endif
@@ -415,6 +427,7 @@ else
ALLLIBS = ${LIBS} -lC
endif
SHLIBSUFFIX=.so
+ICUSHLIBSUFFIX=.so
endif
@@ -428,6 +441,7 @@ MAKE_SHARED = ilink /nofree ${LDFLAGS}
MAKE_SHARED_C = ilink /nofree ${LDFLAGS}
EXTRA_LINK_OPTIONS = /map /nod /noe /noi /packcode /packdata /exepack /align:4
SHLIBSUFFIX= .dll
+ICUSHLIBSUFFIX= .dll
ifneq (${DEBUG}, 1)
XML_BUILD_OPTIONS += -2
endif
@@ -459,6 +473,7 @@ ifeq (${PLATFORM}, HPUX)
EXTRA_LINK_OPTIONS = -b -Wl,+s -Wl,+b,.
SHLIBSUFFIX=.sl
+ IUCSHLIBSUFFIX=.sl
else
TEMPLATESREPOSITORY = ${XML_OBJ_DIR}/ptrepository
COMMON_COMPILE_OPTIONS = -D_HP_UX -DXERCES_TMPLSINC \
@@ -482,6 +497,7 @@ ifeq (${PLATFORM}, HPUX)
EXTRA_LINK_OPTIONS = -b -Wl,+s -Wl,+b,. -Wl,-a,shared
SHLIBSUFFIX=.sl
+ ICUSHLIBSUFFIX=.sl
endif
## Compiler switch to embed a library name
LD_SONAME = -Wl,+h,${SO_NAME}
@@ -524,12 +540,14 @@ endif
endif
EXTRA_LINK_OPTIONS =
SHLIBSUFFIX=.dll
+ICUSHLIBSUFFIX=.dll
OS390SIDEDECK=.x
endif
#=============== TRU64 SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, TRU64)
SHLIBSUFFIX=.so
+ ICUSHLIBSUFFIX=.so
MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared ${LDFLAGS}
ifeq (${GXX}, yes)
MAKE_SHARED = ${CXX} -D${PLATFORM} -shared ${LDFLAGS}
@@ -566,6 +584,7 @@ ifeq (${PLATFORM}, MACOSX)
ALLLIBS = ${LIBS} -L/usr/lib
endif
SHLIBSUFFIX=.dylib
+ ICUSHLIBSUFFIX=.dylib
LD_SONAME = -install_name ${SO_NAME}
endif
@@ -591,6 +610,7 @@ ifeq (${PLATFORM}, CYGWIN)
-Xlinker --out-implib \
-Xlinker $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}.dll.a
SHLIBSUFFIX=.dll
+ ICUSHLIBSUFFIX=.dll
endif
@@ -611,10 +631,6 @@ ifeq (${PLATFORM}, AIX)
RESLIB_SO_NAME =${RESLIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}
RESLIB_REAL_NAME=${RESLIBNAME}${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}${SHLIBSUFFIX}
- RESLIB_LINK_DOTA=${RESLIBNAME}.a
- RESLIB_SO_DOTA =${RESLIBNAME}${SO_TARGET_VERSION}.a
- RESLIB_REAL_DOTA=${RESLIBNAME}${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}.a
-
endif
ifeq (${PLATFORM}, OS390)
#
@@ -630,10 +646,6 @@ ifeq (${PLATFORM}, OS390)
RESLIB_SO_NAME =${RESLIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}
RESLIB_REAL_NAME=${RESLIBNAME}${VER}${SHLIBSUFFIX}
- RESLIB_LINK_DOTA=${RESLIBNAME}.a
- RESLIB_SO_DOTA =${RESLIBNAME}${SO_TARGET_VERSION}.a
- RESLIB_REAL_DOTA=${RESLIBNAME}${VER}.a
-
endif
ifeq (${PLATFORM}, CYGWIN)
#
@@ -681,9 +693,6 @@ ifeq ($(SO_NAME),)
RESLIB_SO_NAME =${RESLIBNAME}${SHLIBSUFFIX}.${SO_TARGET_VERSION}
RESLIB_REAL_NAME=${RESLIBNAME}${SHLIBSUFFIX}.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}
- RESLIB_LINK_DOTA=${RESLIBNAME}.a
- RESLIB_SO_DOTA =${RESLIBNAME}.a.${SO_TARGET_VERSION}
- RESLIB_REAL_DOTA=${RESLIBNAME}.a.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}
endif
@@ -695,10 +704,6 @@ FQ_RESLIB_LINK_NAME=${XML_LIB_DIR}/${RESLIB_LINK_NAME}
FQ_RESLIB_SO_NAME =${XML_LIB_DIR}/${RESLIB_SO_NAME}
FQ_RESLIB_REAL_NAME=${XML_LIB_DIR}/${RESLIB_REAL_NAME}
-FQ_RESLIB_LINK_DOTA=${XML_LIB_DIR}/${RESLIB_LINK_DOTA}
-FQ_RESLIB_SO_DOTA =${XML_LIB_DIR}/${RESLIB_SO_DOTA}
-FQ_RESLIB_REAL_DOTA=${XML_LIB_DIR}/${RESLIB_REAL_DOTA}
-
###################### STANDARD TOOLS #############################
ifeq (${PLATFORM}, OS400)
CP = -cp -fph
diff --git a/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in b/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
index fbe0b89de9db1e86afe2c491ae175f9ded87b839..ccb0b44a30ffe79a84bb5360e666fe37d53d4585 100644
--- a/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
+++ b/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
@@ -92,7 +92,7 @@ CHECK_VARS=
# target file for resource bundle - this must be set, or 'make all' won't
# build any resources.
RESLIBNAME=lib$(RESNAME)
-RESTARGET=lib$(RESNAME)$(SHLIBSUFFIX)
+RESTARGET=lib$(RESNAME)$(ICUSHLIBSUFFIX)
# Resource files. Add new ones for additional locales here.
# keep in sync with the file RESLIST
@@ -117,10 +117,6 @@ $(RESTARGET): $(RESFILES)
ln -s ${FQ_RESLIB_REAL_NAME} ${FQ_RESLIB_SO_NAME}
@echo symlink ${FQ_RESLIB_LINK_NAME}
ln -s ${FQ_RESLIB_SO_NAME} ${FQ_RESLIB_LINK_NAME}
- @echo create DOTA library
- cp ${FQ_RESLIB_REAL_NAME} ${FQ_RESLIB_REAL_DOTA}
- ln -s ${FQ_RESLIB_REAL_DOTA} ${FQ_RESLIB_SO_DOTA}
- ln -s ${FQ_RESLIB_SO_DOTA} ${FQ_RESLIB_LINK_DOTA}
res-install: $(RESTARGET)
$(PKGDATA) --name $(RESNAME) --mode $(RESMODE) $(PKGDATAOPTS) $(RESLIST) --install $(shell icu-config --libdir)