jberry 2003/02/25 11:43:19
Modified: c/scripts packageBinaries.pl
c/src/xercesc Makefile.incl
Log:
Change name of MacOSX shared library to follow conventions
Revision Changes Path
1.121 +4 -4 xml-xerces/c/scripts/packageBinaries.pl
Index: packageBinaries.pl
===================================================================
RCS file: /home/cvs/xml-xerces/c/scripts/packageBinaries.pl,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- packageBinaries.pl 21 Feb 2003 09:18:56 -0000 1.120
+++ packageBinaries.pl 25 Feb 2003 19:43:18 -0000 1.121
@@ -1262,10 +1262,10 @@
}
# Mac OS X
- if ((-e "$XERCESCROOT/lib/libxerces-c.dylib.22.0" )) {
- psystem("cp -f $XERCESCROOT/lib/libxerces-c.dylib.22.0 .");
- psystem("ln -s libxerces-c.dylib.22.0 libxerces-c.dylib.22 ");
- psystem("ln -s libxerces-c.dylib.22 libxerces-c.dylib ");
+ if ((-e "$XERCESCROOT/lib/libxerces-c.22.0.dylib" )) {
+ psystem("cp -f $XERCESCROOT/lib/libxerces-c.22.0.dylib .");
+ psystem("ln -s libxerces-c.22.0.dylib libxerces-c.22.dylib ");
+ psystem("ln -s libxerces-c.22.dylib libxerces-c.dylib ");
}
# Populate the Message Catalog Files
1.36 +44 -34 xml-xerces/c/src/xercesc/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/Makefile.incl,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Makefile.incl 20 Feb 2003 18:06:17 -0000 1.35
+++ Makefile.incl 25 Feb 2003 19:43:19 -0000 1.36
@@ -514,6 +514,7 @@
ALLLIBS = ${LIBS} -L/usr/lib
endif
SHLIBSUFFIX=.dylib
+ LD_SONAME = -install_name ${SO_NAME}
endif
#=============== CygWin SPECIFIC OPTIONS =========================
@@ -545,54 +546,63 @@
#
#
ifeq (${PLATFORM}, AIX)
-
#
# LINK_NAME=libxerces-c.so
# SO_NAME =libxerces-c20.so
# REAL_NAME=libxerces-c20.0.so
#
-
LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
SO_NAME =${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}
REAL_NAME=${LIBNAME}${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}${SHLIBSUFFIX}
+endif
+ifeq (${PLATFORM}, OS390)
+ #
+ # LINK_NAME=libxerces-c.dll
+ # SO_NAME =libxerces-c20.dll
+ # REAL_NAME=libxerces-c2_0_0.dll
+ #
+ LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
+ SO_NAME =${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}
+ REAL_NAME=${LIBNAME}${VER}${SHLIBSUFFIX}
+endif
+ifeq (${PLATFORM}, CYGWIN)
+ #
+ # LINK_NAME=libxerces-c.dll
+ # SO_NAME =cygxerces-c20.dll
+ # REAL_NAME=libxerces-c2_0_0.dll
+ #
+ LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
+ SO_NAME =${CYGNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}
+ REAL_NAME=${LIBNAME}${VER}${SHLIBSUFFIX}
+endif
+ifeq (${PLATFORM}, MACOSX)
+ #
+ # LINK_NAME=libxerces-c.{suffix}
+ # SO_NAME =libxerces-c.20.{suffix}
+ # REAL_NAME=libxerces-c.20.0.{suffix}
+ #
+ LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
+ SO_NAME =${LIBNAME}.${SO_TARGET_VERSION}${SHLIBSUFFIX}
+
REAL_NAME=${LIBNAME}.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}${SHLIBSUFFIX}
+endif
-else
- ifeq (${PLATFORM}, OS390)
- #
- # LINK_NAME=libxerces-c.dll
- # SO_NAME =libxerces-c20.dll
- # REAL_NAME=libxerces-c2_0_0.dll
- #
- LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
- SO_NAME =${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}
- REAL_NAME=${LIBNAME}${VER}${SHLIBSUFFIX}
- else
- ifeq (${PLATFORM}, CYGWIN)
- #
- # LINK_NAME=libxerces-c.dll
- # SO_NAME =cygxerces-c20.dll
- # REAL_NAME=libxerces-c2_0_0.dll
- #
- LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
- SO_NAME =${CYGNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}
- REAL_NAME=${LIBNAME}${VER}${SHLIBSUFFIX}
- else
- #
- # LINK_NAME=libxerces-c.so
- # SO_NAME =libxerces-c.so.20
- # REAL_NAME=libxerces-c.so.20.0
- #
- LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
- SO_NAME =${LIBNAME}${SHLIBSUFFIX}.${SO_TARGET_VERSION}
-
REAL_NAME=${LIBNAME}${SHLIBSUFFIX}.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}
- endif
- endif
+# Default naming (if no special cases above)
+ifeq ($(SO_NAME),)
+ #
+ # LINK_NAME=libxerces-c.so
+ # SO_NAME =libxerces-c.so.20
+ # REAL_NAME=libxerces-c.so.20.0
+ #
+ LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
+ SO_NAME =${LIBNAME}${SHLIBSUFFIX}.${SO_TARGET_VERSION}
+
REAL_NAME=${LIBNAME}${SHLIBSUFFIX}.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}
endif
FQ_LINK_NAME=${XML_LIB_DIR}/${LINK_NAME}
FQ_SO_NAME =${XML_LIB_DIR}/${SO_NAME}
FQ_REAL_NAME=${XML_LIB_DIR}/${REAL_NAME}
+
###################### STANDARD TOOLS #############################
ifeq (${PLATFORM}, OS400)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
