You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by dm...@apache.org on 2005/07/08 19:30:49 UTC
cvs commit: xml-xalan/c/src/xalanc/Utils/MsgCreator MsgCreator.cpp
dmitryh 2005/07/08 10:30:49
Modified: c Makefile.incl.in runConfigure
c/src/xalanc/Harness XalanFileUtility.cpp
c/src/xalanc/Utils Makefile.in
c/src/xalanc/Utils/MsgCreator MsgCreator.cpp
Log:
Fix for XALANC-526
Revision Changes Path
1.37 +3 -3 xml-xalan/c/Makefile.incl.in
Index: Makefile.incl.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/Makefile.incl.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Makefile.incl.in 12 May 2005 03:31:13 -0000 1.36
+++ Makefile.incl.in 8 Jul 2005 17:30:49 -0000 1.37
@@ -98,16 +98,16 @@
MESSAGELIB = ${XSL_LIB_DIR}/${LOC_LIB}
EXTRA_LOC_LINK_OPTIONS = $(EXTRA_LINK_OPTIONS)
-ifeq ($(MESSAGELOADER),NLS)
+ifeq ($(MESSAGELOADER),nls)
LOCAL_LIB =
XSL_BUILD_OPTIONS += -DXALAN_NLS_MSG_LOADER
endif
-ifeq ($(MESSAGELOADER),ICU)
+ifeq ($(MESSAGELOADER),icu)
XSL_BUILD_OPTIONS += -DXALAN_ICU_MSG_LOADER
LOCAL_LIB = -L${XSL_LIB_DIR} -l$(LOC_PROJECT_NAME)
endif
-ifeq ($(MESSAGELOADER),INMEM)
+ifeq ($(MESSAGELOADER),inmem)
XSL_BUILD_OPTIONS += -DXALAN_INMEM_MSG_LOADER
LOCAL_LIB = -L${XSL_LIB_DIR} -l$(LOC_PROJECT_NAME)
endif
1.12 +7 -4 xml-xalan/c/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xalan/c/runConfigure,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- runConfigure 19 Apr 2004 14:54:08 -0000 1.11
+++ runConfigure 8 Jul 2005 17:30:49 -0000 1.12
@@ -17,6 +17,9 @@
#
#
# $Log$
+# Revision 1.12 2005/07/08 17:30:49 dmitryh
+# Fix for XALANC-526
+#
# Revision 1.11 2004/04/19 14:54:08 dmitryh
# Fix for Bugzilla Bug 28452
#
@@ -411,16 +414,16 @@
echo '***Error*** ICUROOT environment variable not defined. Exiting...'
exit ${ERROR_EXIT_CODE};
fi
- XALAN_LOCALE_SYSTEM=ICU;;
+ XALAN_LOCALE_SYSTEM=icu;;
inmem)
- XALAN_LOCALE_SYSTEM=INMEM;;
+ XALAN_LOCALE_SYSTEM=inmem;;
nls)
- XALAN_LOCALE_SYSTEM=NLS;;
+ XALAN_LOCALE_SYSTEM=nls;;
default)
- XALAN_LOCALE_SYSTEM=INMEM;;
+ XALAN_LOCALE_SYSTEM=inmem;;
*)
echo "Unknown locale '$localSys'. Using default."
1.8 +8 -8 xml-xalan/c/src/xalanc/Harness/XalanFileUtility.cpp
Index: XalanFileUtility.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Harness/XalanFileUtility.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanFileUtility.cpp 22 Apr 2005 20:52:41 -0000 1.7
+++ XalanFileUtility.cpp 8 Jul 2005 17:30:49 -0000 1.8
@@ -273,7 +273,7 @@
//
for (int i = 2; i < argc && fSuccess == true; ++i)
{
- if(!stricmp("-out", argv[i]))
+ if(!strcmp("-out", argv[i]))
{
++i;
if(i < argc && argv[i][0] != '-')
@@ -289,7 +289,7 @@
fSuccess = false;
}
}
- else if(!stricmp("-gold", argv[i]))
+ else if(!strcmp("-gold", argv[i]))
{
++i;
if(i < argc && argv[i][0] != '-')
@@ -314,17 +314,17 @@
fSuccess = false;
}
}
- else if(!stricmp("-source", argv[i]))
+ else if(!strcmp("-source", argv[i]))
{
++i;
if(i < argc && argv[i][0] != '-')
{
- if (stricmp(argv[i],"XPL") == 0)
+ if (strcmp(argv[i],"XPL") == 0)
{
args.source = 1;
outDir = "DOM-XALAN";
}
- else if (stricmp(argv[i], "DOM") == 0)
+ else if (strcmp(argv[i], "DOM") == 0)
{
args.source = 2;
outDir = "DOM-XERCES";
@@ -341,7 +341,7 @@
fSuccess = false;
}
}
- else if(!stricmp("-sub", argv[i]))
+ else if(!strcmp("-sub", argv[i]))
{
++i;
if(i < argc && argv[i][0] != '-')
@@ -354,11 +354,11 @@
fSuccess = false;
}
}
- else if(!stricmp("-i", argv[i]))
+ else if(!strcmp("-i", argv[i]))
{
args.skip = false;
}
- else if(!stricmp("-iter", argv[i]))
+ else if(!strcmp("-iter", argv[i]))
{
++i;
1.10 +5 -5 xml-xalan/c/src/xalanc/Utils/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Utils/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 6 Apr 2004 15:08:45 -0000 1.9
+++ Makefile.in 8 Jul 2005 17:30:49 -0000 1.10
@@ -54,7 +54,7 @@
##=================== End of Common for all localization systems area =====
## ----------------------------------------------------------------------------
-ifeq ($(MESSAGELOADER),INMEM)
+ifeq ($(MESSAGELOADER),inmem)
@@ -76,11 +76,11 @@
prepare: doCommonPrepare
-endif # end of ($(MESSAGELOADER),INMEM))
+endif # end of ($(MESSAGELOADER),inmem))
## ----------------------------------------------------------------------------
-ifeq ($(MESSAGELOADER),ICU)
+ifeq ($(MESSAGELOADER),icu)
##=============================== Specific for ICU variables ================================
GENRB = $(ICUROOT)/bin/genrb
@@ -126,10 +126,10 @@
endif ## OS390
-endif # end of ($(MESSAGELOADER),ICU)
+endif # end of ($(MESSAGELOADER),icu)
##=============================== NLS SYSTEM =====================================================
-ifeq ($(MESSAGELOADER),NLS)
+ifeq ($(MESSAGELOADER),nls)
locale: $(XSL_NLS_DIR)/$(LOCALE)/$(CATALOG_NAME).cat
1.11 +7 -30 xml-xalan/c/src/xalanc/Utils/MsgCreator/MsgCreator.cpp
Index: MsgCreator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Utils/MsgCreator/MsgCreator.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MsgCreator.cpp 26 Feb 2004 22:36:20 -0000 1.10
+++ MsgCreator.cpp 8 Jul 2005 17:30:49 -0000 1.11
@@ -56,7 +56,7 @@
"Options:\n"
" <XML file> XLIFF file with messages. Required. \n"
- " -TYPE xxx Type of localization [ICU | NLS | InMem*]\n"
+ " -TYPE xxx Type of localization [icu | nls | inmem*]\n"
" -LOCALE Example: [ fr | fr_FR ]; The default value is 'en_US' \n"
" * = Default if not provided explicitly.\n\n"
" -? Show this help.\n\n"
@@ -99,29 +99,6 @@
};
-#if defined(OS390)
-#include <strings.h>
-
-int
-compareNoCase(
- const char* str1,
- const char* str2)
-{
- return strcasecmp(str1, str2);
-}
-
-#else
-
-int
-compareNoCase(
- const char* str1,
- const char* str2)
-{
- return stricmp(str1, str2);
-}
-
-#endif
-
bool
getArgs(
int argc,
@@ -142,11 +119,11 @@
for (int i = 1; i < argc && fSuccess == true; ++i)
{
- if (!compareNoCase("-h", argv[i]) || !compareNoCase("-?", argv[i]))
+ if (!strcmp("-h", argv[i]) || !strcmp("-?", argv[i]))
{
fSuccess = false;
}
- else if (!compareNoCase("-LOCALE", argv[i]) )
+ else if (!strcmp("-LOCALE", argv[i]) )
{
++i;
if( i < argc && argv[i][0] != '-' )
@@ -175,22 +152,22 @@
}
}
}
- else if (!compareNoCase("-TYPE", argv[i]) )
+ else if (!strcmp("-TYPE", argv[i]) )
{
++i;
if( i < argc && argv[i][0] != '-' )
{
- if( !compareNoCase("ICU",argv[i] ))
+ if( !strcmp("icu",argv[i] ))
{
p.enTypeOfLocaleMsg = CmdLineParams::ICU_LOCALMSG;
- }else if( !compareNoCase("NLS",argv[i] ))
+ }else if( !strcmp("nls",argv[i] ))
{
p.enTypeOfLocaleMsg = CmdLineParams::NLS_LOCALMSG;
}
- else if( !compareNoCase("InMem",argv[i] ))
+ else if( !strcmp("inmem",argv[i] ))
{
p.enTypeOfLocaleMsg = CmdLineParams::INMEM_LOCALMSG;
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org