Author: amassari
Date: Mon May 8 06:52:12 2006
New Revision: 405055
URL: http://svn.apache.org/viewcvs?rev=405055&view=rev
Log:
When the ICU MsgLoader is used, build the XercesMessage library
Added:
xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
Modified:
xerces/c/trunk/Makefile.am
xerces/c/trunk/configure.ac
xerces/c/trunk/obj/Makefile.am
xerces/c/trunk/scripts/packageBinaries.pl
xerces/c/trunk/src/Makefile.am
Modified: xerces/c/trunk/Makefile.am
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/Makefile.am?rev=405055&r1=405054&r2=405055&view=diff
==============================================================================
--- xerces/c/trunk/Makefile.am (original)
+++ xerces/c/trunk/Makefile.am Mon May 8 06:52:12 2006
@@ -1,3 +1,3 @@
SUBDIRS = lib src obj tests
samples
-ACLOCAL_AMFLAGS = -I m4
\ No newline at end of file
+ACLOCAL_AMFLAGS = -I m4
Modified: xerces/c/trunk/configure.ac
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/configure.ac?rev=405055&r1=405054&r2=405055&view=diff
==============================================================================
--- xerces/c/trunk/configure.ac (original)
+++ xerces/c/trunk/configure.ac Mon May 8 06:52:12 2006
@@ -29,7 +29,7 @@
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h src/xercesc/util/Xerces_autoconf_config.hpp])
-AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile obj/Makefile
tests/Makefile samples/Makefile])
+AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile
src/xercesc/util/MsgLoaders/ICU/resources/Makefile obj/Makefile tests/Makefile
samples/Makefile])
# Check the target system
AC_CANONICAL_HOST
@@ -97,6 +97,7 @@
towupper towlower iswspace \
])
+AC_SUBST([SHREXT], [$shrext_cmds])
#
# Orchestrate the replacement of missing functions
Modified: xerces/c/trunk/obj/Makefile.am
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/obj/Makefile.am?rev=405055&r1=405054&r2=405055&view=diff
==============================================================================
--- xerces/c/trunk/obj/Makefile.am (original)
+++ xerces/c/trunk/obj/Makefile.am Mon May 8 06:52:12 2006
@@ -18,6 +18,8 @@
# $Id$
#
+include ../version.incl
+
src = ${top_srcdir}/src
lib = ${top_srcdir}/lib
@@ -27,3 +29,8 @@
libxerces_la_LIBADD = ${src}/libsrc.la ${lib}/libcompat.la
libxerces_la_LDFLAGS = -release ${PACKAGE_VERSION}
+
+if XERCES_USE_MSGLOADER_ICU
+libxerces_la_LDFLAGS += -L${top_srcdir}/obj/.libs
-lXercesMessages$(VER)
+endif
+
Modified: xerces/c/trunk/scripts/packageBinaries.pl
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/scripts/packageBinaries.pl?rev=405055&r1=405054&r2=405055&view=diff
==============================================================================
--- xerces/c/trunk/scripts/packageBinaries.pl (original)
+++ xerces/c/trunk/scripts/packageBinaries.pl Mon May 8 06:52:12 2006
@@ -793,6 +793,9 @@
psystem ("$MAKE clean"); # May want to comment this line out to speed
up
psystem ("$MAKE");
+ # build the tests
+ print("\n\nBuild the tests ...\n");
+ psystem ("$MAKE check");
#
# Move ICU libs into lib dir, so samples will link. This matches the
structure of
@@ -804,10 +807,6 @@
# copied the message library to $XERCESCROOT/lib, we need copy over
here.
}# $ICUIsPresent
- # build the tests
- print("\n\nBuild the tests ...\n");
- psystem ("$MAKE check");
-
pchdir ($targetdir);
#
@@ -832,29 +831,23 @@
if ($ICUIsPresent) {
# ICU
copyICUOnUNIX("$targetdir/lib");
-
# Copy the Resouce Bundle for ICUMsgLoader
if ( $opt_m =~ m/icu/i) {
print ("\n\nCopying ICU message bundles ...\n");
- psystem("cp -f $XERCESCROOT/msg/XercesMessages*.res
$targetdir/msg");
+ psystem("cp -f
$XERCESCROOT/src/xercesc/util/MsgLoaders/ICU/resources/XercesMessages*.res
$targetdir/msg");
- psystem("cp -f $XERCESCROOT/lib/libXercesMessages30.0.so .");
- psystem("find . -name 'libXercesMessages30.0.so' -exec ln -s {}
libXercesMessages30.so \\;");
- psystem("find . -name 'libXercesMessages30.so' -exec ln -s {}
libXercesMessages.so \\;");
+ psystem("cp -f $XERCESCROOT/obj/.libs/libXercesMessages3_0_0.so
.");
+ psystem("find . -name 'libXercesMessages3_0_0.so' -exec ln -s {}
libXercesMessages3_0.so \\;");
+ psystem("find . -name 'libXercesMessages3_0.so' -exec ln -s {}
libXercesMessages.so \\;");
- psystem("cp -f $XERCESCROOT/lib/libXercesMessages.so.30.0 .");
- psystem("find . -name 'libXercesMessages.so.30.0' -exec ln -s {}
libXercesMessages.so.30 \\;");
- psystem("find . -name 'libXercesMessages.so.30' -exec ln -s {}
libXercesMessages.so \\;");
-
- psystem("cp -f $XERCESCROOT/lib/libXercesMessages.sl.30.0 .");
- psystem("find . -name 'libXercesMessages.sl.30.0' -exec ln -s {}
libXercesMessages.sl.30 \\;");
- psystem("find . -name 'libXercesMessages.sl.30' -exec ln -s {}
libXercesMessages.sl \\;");
-
- psystem("cp -f $XERCESCROOT/lib/libXercesMessages30.0.a .");
- psystem("find . -name 'libXercesMessages30.0.a' -exec ln -s {}
libXercesMessages30.a \\;");
- psystem("find . -name 'libXercesMessages30.a' -exec ln -s {}
libXercesMessages.a \\;");
-
- }
+ psystem("cp -f $XERCESCROOT/obj/.libs/libXercesMessages3_0_0.sl
.");
+ psystem("find . -name 'libXercesMessages3_0_0.sl' -exec ln -s {}
libXercesMessages3_0.sl \\;");
+ psystem("find . -name 'libXercesMessages3_0.sl' -exec ln -s {}
libXercesMessages.sl \\;");
+
+ psystem("cp -f $XERCESCROOT/obj/.libs/libXercesMessages3_0_0.a .");
+ psystem("find . -name 'libXercesMessages3_0_0.a' -exec ln -s {}
libXercesMessages3_0.a \\;");
+ psystem("find . -name 'libXercesMessages3_0.a' -exec ln -s {}
libXercesMessages.a \\;");
+ }
}
@@ -873,32 +866,16 @@
psystem("ln -s libxerces-3.so libxerces.so ");
}
- if ((-e "$XERCESCROOT/obj/.libs/libxerces-depdom-3.0.so" )) {
- psystem("cp -f $XERCESCROOT/obj/.libs/libxerces-depdom-3.0.so .");
- psystem("ln -s libxerces-depdom-3.0.so libxerces-depdom-3.so ");
- psystem("ln -s libxerces-depdom-3.so libxerces-depdom.so ");
- }
-
if ((-e "$XERCESCROOT/obj/.libs/libxerces-3.0.sl" )) {
psystem("cp -f $XERCESCROOT/obj/.libs/libxerces-3.0.sl .");
psystem("ln -s libxerces-3.0.sl libxerces-3.sl ");
psystem("ln -s libxerces-3.sl libxerces.sl ");
}
- if ((-e "$XERCESCROOT/obj/.libs/libxerces-depdom-3.0.sl" )) {
- psystem("cp -f $XERCESCROOT/obj/.libs/libxerces-depdom-3.0.sl .");
- psystem("ln -s libxerces-depdom-3.0.sl libxerces-depdom-3.sl ");
- psystem("ln -s libxerces-depdom-3.sl libxerces-depdom.sl ");
- }
-
if ((-e "$XERCESCROOT/obj/.libs/libxerces.a" )) {
psystem("cp -f $XERCESCROOT/obj/.libs/libxerces.a . ");
}
- if ((-e "$XERCESCROOT/obj/.libs/libxerces-depdom.a" )) {
- psystem("cp -f $XERCESCROOT/obj/.libs/libxerces-depdom.a . ");
- }
-
# Mac OS X
if ((-e "$XERCESCROOT/obj/.libs/libxerces-3.0.dylib" )) {
psystem("cp -f $XERCESCROOT/obj/.libs/libxerces-3.0.dylib .");
@@ -934,6 +911,9 @@
psystem ("find $targetdir -type d -exec chmod 755 {} \\;");
psystem ("chmod 755 $targetdir/bin/* $targetdir/lib/*");
+ # Remove .svn folders
+ psystem ("find $targetdir -type d -name .svn -exec rm -rf {} \\;");
+
# Now package it all up using tar
print ("\n\nTARing up all files ...\n");
pchdir ("$targetdir/..");
@@ -1105,51 +1085,51 @@
#
# copy icudata dll
# For ICU 2.6:
- # 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
+ # on AIX, it is called libicudata34.1.a
+ # on Solaris/Linux, it is called libicudata.so.34.1
+ # on HP, it is called libicudata.sl.34.1
#
psystem("rm -f libicudata*");
- 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("cp -f $ICUROOT/lib/libicudata34.1.so .");
+ psystem("cp -f $ICUROOT/lib/libicudata34.1.a .");
+ psystem("cp -f $ICUROOT/lib/libicudata.so.34.1 .");
+ psystem("cp -f $ICUROOT/lib/libicudata.sl.34.1 .");
- 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 'libicudata34.1.so' -exec ln -s {} libicudata.so
\\;");
+ psystem("find . -name 'libicudata34.1.so' -exec ln -s {}
libicudata34.so \\;");
- 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 'libicudata34.1.a' -exec ln -s {} libicudata.a
\\;");
+ psystem("find . -name 'libicudata34.1.a' -exec ln -s {}
libicudata34.a \\;");
- 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.so.34.1' -exec ln -s {}
libicudata.so \\;");
+ psystem("find . -name 'libicudata.so.34.1' -exec ln -s {}
libicudata.so.34 \\;");
- 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 \\;");
+ psystem("find . -name 'libicudata.sl.34.1' -exec ln -s {}
libicudata.sl \\;");
+ psystem("find . -name 'libicudata.sl.34.1' -exec ln -s {}
libicudata.sl.34 \\;");
#
# copy icuuc dll
- # 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
+ # on AIX, it is called libicuuc34.1.a
+ # on Solaris/Linux, it is called libicuuc.so.34.1
+ # on HP, it is called libicuuc.sl.34.1
#
psystem("rm -f libicuuc*");
- 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("cp -f $ICUROOT/lib/libicuuc34.1.so .");
+ psystem("cp -f $ICUROOT/lib/libicuuc34.1.a .");
+ psystem("cp -f $ICUROOT/lib/libicuuc.so.34.1 .");
+ psystem("cp -f $ICUROOT/lib/libicuuc.sl.34.1 .");
- 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 'libicuuc34.1.so' -exec ln -s {} libicuuc.so
\\;");
+ psystem("find . -name 'libicuuc34.1.so' -exec ln -s {} libicuuc34.so
\\;");
- 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 'libicuuc34.1.a' -exec ln -s {} libicuuc.a
\\;");
+ psystem("find . -name 'libicuuc34.1.a' -exec ln -s {} libicuuc34.a
\\;");
- 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.so.34.1' -exec ln -s {} libicuuc.so
\\;");
+ psystem("find . -name 'libicuuc.so.34.1' -exec ln -s {} libicuuc.so.34
\\;");
- 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
\\;");
+ psystem("find . -name 'libicuuc.sl.34.1' -exec ln -s {} libicuuc.sl
\\;");
+ psystem("find . -name 'libicuuc.sl.34.1' -exec ln -s {} libicuuc.sl.34
\\;");
}
Modified: xerces/c/trunk/src/Makefile.am
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/Makefile.am?rev=405055&r1=405054&r2=405055&view=diff
==============================================================================
--- xerces/c/trunk/src/Makefile.am (original)
+++ xerces/c/trunk/src/Makefile.am Mon May 8 06:52:12 2006
@@ -19,6 +19,7 @@
#
DEFS += -DXERCES_BUILDING_LIBRARY
+SUBDIRS =
#
# Specify the convenience libraries for various xerces components
@@ -173,6 +174,8 @@
libmsgicu_ladir = ${includedir}
nobase_libmsgicu_la_HEADERS = ${msgicu_headers}
libmsgicu_la_SOURCES = ${msgicu_sources}
+
+SUBDIRS +=
xercesc/util/MsgLoaders/ICU/resources
endif
if XERCES_USE_MSGLOADER_ICONV
@@ -1218,7 +1221,6 @@
xercesc/util/Platforms/MacOS/MacCarbonFile.cpp \
xercesc/util/Platforms/MacOS/MacOSPlatformUtils.cpp \
xercesc/util/Platforms/MacOS/MacPosixFile.cpp
-
#
# Override generated rules to provide prettier make rules
Added: xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in?rev=405055&view=auto
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in (added)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in Mon
May 8 06:52:12 2006
@@ -0,0 +1,81 @@
+# Copyright (c) 2001-2002 IBM, Inc. and others
+#
+# File
+# icu/source/samples/ufortune/resources/Makefile
+#
+# Two ICU tools are run from this makefile:
+# genrb compiles a resource source file (.txt) into
+# a binary .res file.
+# pkgdata combines all of the .res files into a single
+# shared library that can then be linked with the
+# main application.
+#
+# pkgdata will recursively generate and run yet
+# another makefile, which in turn runs two more
+# icu tools. gencmn combines the individual .res
+# files, and genccode emits the data as C source
+# code that can then be built into a .so
+#
+
+top_srcdir = @top_srcdir@
+ICU_PREFIX = @ICU_PREFIX@
+SHREXT = @SHREXT@
+
+include ../../../../../../version.incl
+
+GENRB=$(ICU_PREFIX)/bin/genrb
+GENRBOPT=--package-name $(PKGNAME)
+PKGDATA=$(ICU_PREFIX)/bin/pkgdata
+PKGDATAOPTS=-v -d .
+RMV=rm -rf
+
+# No conventional target - this dir is resources only.
+TARGET=
+CLEANFILES += *.mak *.[co] *.lst *.a *.$(SO) $(RESFILES) *.ao
README*resources.txt
+
+# Resource shortname
+PKGNAME=XercesMessages$(VER)
+
+# DLL and static modes are identical here
+RESLDFLAGS= -L$(RESDIR) -l$(PKGNAME)
+RESCPPFLAGS=
+
+# target file for resource bundle - this must be set, or 'make all' won't
+# build any resources.
+RESTARGET=$(top_srcdir)/obj/.libs/lib$(PKGNAME)$(SHREXT)
+PKGTARGET=lib$(PKGNAME)$(SHREXT)
+
+# Resource files. Add new ones for additional locales here.
+# keep in sync with the file RESLIST
+RESFILES=$(PKGNAME)_en_US.res
+
+# list of resource bundles - keep in sync with RESFILES
+RESLIST=res-file-list-unix.txt
+
+# list of targets that aren't actually created
+.PHONY: check report
+
+all: $(RESTARGET) $(TARGET)
+
+$(TARGET): $(OBJECTS)
+ $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@ $(XTRALIBS)
+
+$(RESTARGET): $(RESFILES)
+ @echo building $(RESTARGET)
+ $(PKGDATA) --name $(PKGNAME) --mode dll $(PKGDATAOPTS) $(RESLIST)
+ mkdir -p $(top_srcdir)/obj/.libs
+ mv $(PKGTARGET) $(RESTARGET)
+
+# clean out files
+distclean clean: $(CLEAN_SUBDIR)
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+ -rm $(OBJECTS) $(TARGET) $(RESTARGET) $(RESFILES)
+
+## resources
+$(PKGNAME)_%.res: %.txt
+ @echo "generating $@"
+ $(GENRB) $(GENRBOPT) $^
+
+# for installing the library
+install: res-install
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
