xerces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cargi...@apache.org
Subject cvs commit: xml-xerces/c/scripts packageBinaries.pl
Date Wed, 31 Dec 2003 19:57:04 GMT
cargilld    2003/12/31 11:57:04

  Modified:    c/src/xercesc/util/MsgLoaders/ICU/resources Makefile.in
               c/src/xercesc Makefile.incl
               c/scripts packageBinaries.pl
  Log:
  Update AIX build to generate .a libraries as -brtl is no longer used so that a build generated
without using packageBinaires.pl will be clean.
  
  Revision  Changes    Path
  1.5       +1 -5      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.in	19 Nov 2003 23:09:07 -0000	1.4
  +++ Makefile.in	31 Dec 2003 19:57:04 -0000	1.5
  @@ -92,7 +92,7 @@
   # 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 @@
   	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)
  
  
  
  1.46      +22 -17    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.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- Makefile.incl	10 Dec 2003 23:50:26 -0000	1.45
  +++ Makefile.incl	31 Dec 2003 19:57:04 -0000	1.46
  @@ -146,6 +146,7 @@
   
     endif
     SHLIBSUFFIX=.so
  +  ICUSHLIBSUFFIX=.so
     ## Compiler switch to embed a library name
     LD_SONAME = -h ${SO_NAME}
   endif
  @@ -177,6 +178,7 @@
       endif
     endif
     SHLIBSUFFIX=.so
  +  ICUSHLIBSUFFIX=.so
   endif
   
   #=============== OPENSERVER SPECIFIC OPTIONS =========================
  @@ -202,6 +204,7 @@
       ALLLIBS = ${LIBS}
     endif
     SHLIBSUFFIX=.so
  +  ICUSHLIBSUFFIX=.so
   endif
   
   #================= PTX SPECIFIC OPTIONS ===========================
  @@ -221,6 +224,7 @@
   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 @@
   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_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 @@
   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 @@
   
   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 @@
   
   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 @@
       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 @@
       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 @@
       ALLLIBS = ${LIBS} -lC
   endif
   SHLIBSUFFIX=.so
  +ICUSHLIBSUFFIX=.so
   endif
   
   
  @@ -428,6 +441,7 @@
   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 @@
   
       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 @@
   
       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
   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 @@
           ALLLIBS = ${LIBS} -L/usr/lib
       endif
       SHLIBSUFFIX=.dylib
  +    ICUSHLIBSUFFIX=.dylib
   	LD_SONAME = -install_name ${SO_NAME}
   endif
   
  @@ -591,6 +610,7 @@
                 -Xlinker --out-implib \
                     -Xlinker $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}.dll.a
           SHLIBSUFFIX=.dll
  +        ICUSHLIBSUFFIX=.dll
   endif
   
   
  @@ -611,10 +631,6 @@
       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 @@
       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 @@
       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
   
   
  @@ -694,10 +703,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)
  
  
  
  1.137     +7 -21     xml-xerces/c/scripts/packageBinaries.pl
  
  Index: packageBinaries.pl
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/scripts/packageBinaries.pl,v
  retrieving revision 1.136
  retrieving revision 1.137
  diff -u -r1.136 -r1.137
  --- packageBinaries.pl	1 Dec 2003 21:45:50 -0000	1.136
  +++ packageBinaries.pl	31 Dec 2003 19:57:04 -0000	1.137
  @@ -1159,13 +1159,9 @@
           
           # 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 @@
   
       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 @@
           
           # 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 @@
           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 @@
   
           # 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
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org


Mime
View raw message