mhoyt 2004/11/10 12:27:42
Modified: c Makefile.incl.in
c/src/xalanc/PlatformSupport XalanICUMessageLoader.cpp
c/src/xalanc/TestXSLT process.cpp
Log:
Improved ICU Message loader naming, and removed extraneous space in Makefiles
to enable builds
Revision Changes Path
1.24 +1 -1 xml-xalan/c/Makefile.incl.in
Index: Makefile.incl.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/Makefile.incl.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile.incl.in 8 Oct 2004 04:35:09 -0000 1.23
+++ Makefile.incl.in 10 Nov 2004 20:27:42 -0000 1.24
@@ -66,7 +66,7 @@
ifndef ICUI18NROOT
ICUI18NROOT=${ICUROOT}
endif
- ICULIB_LOC=$(ICUROOT)/lib
+ ICULIB_LOC=$(ICUROOT)/lib
endif
# required libraries
1.12 +24 -22
xml-xalan/c/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp
Index: XalanICUMessageLoader.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XalanICUMessageLoader.cpp 8 Nov 2004 18:11:05 -0000 1.11
+++ XalanICUMessageLoader.cpp 10 Nov 2004 20:27:42 -0000 1.12
@@ -18,19 +18,25 @@
// Class header file.
-#include "xalanc/Include/XalanVersion.hpp"
+#include "XalanICUMessageLoader.hpp"
+
+#include "PlatformSupportInit.hpp"
-#include <xalanc/PlatformSupport/XalanICUMessageLoader.hpp>
-#include <xalanc/PlatformSupport/PlatformSupportInit.hpp>
-#include <xalanc/PlatformSupport/DOMStringHelper.hpp>
+#include "DOMStringHelper.hpp"
#include "unicode/uloc.h"
+
#include "unicode/udata.h"
-#include <xercesc/util/XMLMsgLoader.hpp>
+#include <xercesc/util/XMLMsgLoader.hpp>
+
#include <xercesc/util/XMLString.hpp>
-#define XALAN_MESSAGES_NAME XalanMessages_
+#include "xalanc/Include/XalanVersion.hpp"
+
+#define XALAN_MESSAGES_NAME xalanMsg
+
+#define XALAN_MESSAGES_NAME_W_UNDERSCORE
INVK_CAT2_RAW_NUMERIC(XALAN_MESSAGES_NAME,_)
#define MAKE_STRING(a) #a
#define INVK_MAKE_STRING(a) MAKE_STRING(a)
@@ -55,25 +61,25 @@
#endif // NDEBUG_SYMBOLS
-#define ICUDLL_ENTRYPOINT_NAME INVK_CAT3_RAW_NUMERIC(XALAN_MESSAGES_NAME,\
-
INVK_CAT2_RAW_NUMERIC_SEP_UNDERSCORE(XALAN_VERSION_MAJOR,XALAN_VERSION_MINOR),\
+#define ICUDLL_ENTRYPOINT_NAME
INVK_CAT3_RAW_NUMERIC(XALAN_MESSAGES_NAME_W_UNDERSCORE,\
+
INVK_CAT3_RAW_NUMERIC_SEP_UNDERSCORE(XALAN_VERSION_MAJOR,XALAN_VERSION_MINOR,XALAN_VERSION_REVISION),\
ENTRY_POINT_SUFFIX)
-#define PACKAGE_NAME INVK_CAT3_RAW_NUMERIC(XALAN_MESSAGES_NAME,\
-
INVK_CAT2_RAW_NUMERIC_SEP_UNDERSCORE(XALAN_VERSION_MAJOR,XALAN_VERSION_MINOR),\
+#define PACKAGE_NAME INVK_CAT3_RAW_NUMERIC(XALAN_MESSAGES_NAME_W_UNDERSCORE,\
+
INVK_CAT3_RAW_NUMERIC_SEP_UNDERSCORE(XALAN_VERSION_MAJOR,XALAN_VERSION_MINOR,XALAN_VERSION_REVISION),\
PACKAGE_NAME_SUFFIX)
-
-extern "C" const char U_IMPORT ICUDLL_ENTRYPOINT_NAME [];
-
-static const char* const sPackageName=INVK_MAKE_STRING(PACKAGE_NAME)
;
#else // NON-WIN32 systems
-extern "C" const char U_IMPORT xalanMsg_dat [];
-static const char* const sPackageName="xalanMsg";
+#define ICUDLL_ENTRYPOINT_NAME
INVK_CAT2_RAW_NUMERIC(XALAN_MESSAGES_NAME_W_UNDERSCORE,dat)
+
+#define PACKAGE_NAME XALAN_MESSAGES_NAME
#endif // WIN32
+static const char* const sPackageName=INVK_MAKE_STRING(PACKAGE_NAME);
+
+extern "C" const char U_IMPORT ICUDLL_ENTRYPOINT_NAME [];
XALAN_CPP_NAMESPACE_BEGIN
@@ -101,18 +107,14 @@
-XalanICUMessageLoader::XalanICUMessageLoader(MemoryManagerType& theManage):
+XalanICUMessageLoader::XalanICUMessageLoader(MemoryManagerType &theManager):
m_localeBundle(0),
m_domainBundle(0),
- m_unknownMessage(XALAN_STATIC_UCODE_STRING("The message was not found
in the ICU resource bundle."), theManage)
+ m_unknownMessage(XALAN_STATIC_UCODE_STRING("The message was not found
in the ICU resource bundle."), theManager)
{
UErrorCode err = U_ZERO_ERROR;
-#ifdef WIN32
udata_setAppData(sPackageName, &ICUDLL_ENTRYPOINT_NAME, &err);
-#else
- udata_setAppData(sPackageName, &xalanMsg_dat, &err);
-#endif
if (! U_SUCCESS(err))
{
1.13 +1 -1 xml-xalan/c/src/xalanc/TestXSLT/process.cpp
Index: process.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/TestXSLT/process.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- process.cpp 10 Nov 2004 19:09:11 -0000 1.12
+++ process.cpp 10 Nov 2004 20:27:42 -0000 1.13
@@ -996,7 +996,7 @@
#if defined(XALAN_USE_ICU)
// Create a collation function for the ICU, and have it
// cache collators...
- ICUBridgeCollationCompareFunctor theICUFunctor(true);
+ ICUBridgeCollationCompareFunctor theICUFunctor(theManager, true);
theExecutionContext.installCollationCompareFunctor(&theICUFunctor);
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
