You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2001/05/03 22:50:19 UTC
cvs commit: xml-xerces/c/src Makefile.incl
tng 01/05/03 13:50:19
Modified: c/Projects/Win32/VC6/xerces-all/XercesLib XercesLib.dsp
c/src Makefile.incl
Log:
ICU 1.8 update
Revision Changes Path
1.56 +31 -7 xml-xerces/c/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
Index: XercesLib.dsp
===================================================================
RCS file: /home/cvs/xml-xerces/c/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- XercesLib.dsp 2001/04/19 17:50:32 1.55
+++ XercesLib.dsp 2001/05/03 20:50:13 1.56
@@ -7,19 +7,19 @@
CFG=XercesLib - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "XercesLib.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "XercesLib.mak" CFG="XercesLib - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "XercesLib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "XercesLib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -84,7 +84,7 @@
# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /base:"0x12000000" /version:1.4 /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_1_4D.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_1D.lib" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
-!ENDIF
+!ENDIF
# Begin Target
@@ -291,6 +291,14 @@
# End Source File
# Begin Source File
+SOURCE=..\..\..\..\..\src\util\regx\RangeTokenMap.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\util\regx\RangeTokenMap.hpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\..\src\util\regx\RegularExpression.cpp
# End Source File
# Begin Source File
@@ -1788,6 +1796,22 @@
# Begin Source File
SOURCE=..\..\..\..\..\src\validators\schema\SchemaValidator.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\validators\schema\SubstitutionGroupComparator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\validators\schema\SubstitutionGroupComparator.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\validators\schema\TraverseSchema.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\validators\schema\TraverseSchema.hpp
# End Source File
# Begin Source File
1.40 +16 -16 xml-xerces/c/src/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/Makefile.incl,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Makefile.incl 2001/03/22 15:29:04 1.39
+++ Makefile.incl 2001/05/03 20:50:17 1.40
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.incl,v 1.39 2001/03/22 15:29:04 tng Exp $
+# $Id: Makefile.incl,v 1.40 2001/05/03 20:50:17 tng Exp $
#
###################################################################
@@ -114,7 +114,7 @@
MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared ${LDFLAGS}
ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib \
- -licu-uc -licudata -lm -lgen
+ -licuuc -licudata -lm -lgen
else
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib \
-lm -lgen
@@ -126,7 +126,7 @@
MAKE_SHARED_C = ${CC} -D${PLATFORM} -G ${LDFLAGS}
ifeq (${TRANSCODER}, ICU)
ALLLIBS = -mt ${LIBS} -L/usr/local/SUNWspro/lib -L/usr/ccs/lib \
- -licu-uc -licudata -lc -lgen
+ -licuuc -licudata -lc -lgen
else
ALLLIBS = -mt ${LIBS} -L/usr/local/SUNWspro/lib -L/usr/ccs/lib \
-lc -lgen
@@ -143,7 +143,7 @@
MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared
ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib \
- -licu-uc -licudata -lm -lw -lgen
+ -licuuc -licudata -lm -lw -lgen
else
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib \
-lm -lw -lgen
@@ -155,7 +155,7 @@
MAKE_SHARED_C = ${CC} -D${PLATFORM} -G
ifeq (${TRANSCODER}, ICU)
ALLLIBS = ${LIBS} -L/usr/local/lib -L/usr/ccs/lib \
- -licu-uc -licudata -lm -lw -lC -lc -lgen
+ -licuuc -licudata -lm -lw -lC -lc -lgen
else
ALLLIBS = ${LIBS} -L/usr/local/lib -L/usr/ccs/lib \
-lm -lw -lC -lc -lgen
@@ -171,7 +171,7 @@
PLATFORM_C_COMPILER = cc
ifeq (${TRANSCODER}, ICU)
PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -D${PLATFORM}
- ALLLIBS = ${LIBS} -L${ICUROOT}/lib -lm -lgen -licu-uc
+ ALLLIBS = ${LIBS} -L${ICUROOT}/lib -lm -lgen -licuuc
else
PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -D${PLATFORM}
ALLLIBS = ${LIBS} -lm -lgen
@@ -189,13 +189,13 @@
#PLATFORM_CPP_COMPILER = xlC_r
#PLATFORM_C_COMPILER = xlc_r
#ifdef ICUROOT
-# ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -L${ICUROOT}/lib -licu-uc -licudata -lbsd
+# ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -L${ICUROOT}/lib -licuuc -licudata -lbsd
#else
# ALLLIBS = -L/usr/lpp/xlC/lib -lbsd
#endif
ifeq (${TRANSCODER}, ICU)
- ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -licu-uc -licudata
+ ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -licuuc -licudata
else
ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib
endif
@@ -231,7 +231,7 @@
endif
ifeq (${TRANSCODER}, ICU)
ifeq (${SYSOVR},OS400)
-EXTRA_LINK_OPTIONS = -licu-uc -licudata -lbsd
+EXTRA_LINK_OPTIONS = -licuuc -licudata -lbsd
else
EXTRA_LINK_OPTIONS = -lQZUUC
endif
@@ -248,7 +248,7 @@
MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -fPIC
MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared -fPIC
ifeq (${TRANSCODER}, ICU)
- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licu-uc -licudata -lc
+ ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lc
else
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -lc
endif
@@ -263,7 +263,7 @@
MAKE_SHARED = ${CXX} -D${PLATFORM} -shared
MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared
ifeq (${TRANSCODER}, ICU)
- ALLLIBS = ${LIBS} -lC -licu-uc -licudata
+ ALLLIBS = ${LIBS} -lC -licuuc -licudata
else
ALLLIBS = ${LIBS} -lC
endif
@@ -301,7 +301,7 @@
MAKE_SHARED = ${CXX} -D${PLATFORM} -b
MAKE_SHARED_C = ${CC} -D${PLATFORM} -b
ifeq (${TRANSCODER}, ICU)
- ALLLIBS = ${LIBS} -licu-uc -licudata -lCsup -lstream
+ ALLLIBS = ${LIBS} -licuuc -licudata -lCsup -lstream
else
ALLLIBS = ${LIBS} -lCsup -lstream
endif
@@ -318,7 +318,7 @@
MAKE_SHARED = $(CXX) $(PLATFORM_COMPILE_OPTIONS) $(XML_INCL)
MAKE_SHARED_C = $(CC) $(PLATFORM_COMPILE_OPTIONS) $(XML_INCL)
ifeq (${TRANSCODER}, ICU)
- ALLLIBS = ${LIBS} -licu-uc -licudata
+ ALLLIBS = ${LIBS} -licuuc -licudata
else
ALLLIBS = ${LIBS}
endif
@@ -346,7 +346,7 @@
ifeq (${OS390BATCH},1)
ALLLIBS = "//'${LOADEXP}(IXMICUUC)'"
else
- ALLLIBS = ${ICUROOT}/lib/libicu-uc.x
+ ALLLIBS = ${ICUROOT}/lib/libicuuc.x
endif
else
ALLLIBS =
@@ -364,7 +364,7 @@
MAKE_SHARED = ${CXX} -D${PLATFORM} -shared
PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -D_REENTRANT
ifeq (${TRANSCODER}, ICU)
- ALLLIBS = ${LIBS} -licu-uc -licudata -lc -lrt
+ ALLLIBS = ${LIBS} -licuuc -licudata -lc -lrt
else
ALLLIBS = ${LIBS} -lc -lrt
endif
@@ -372,7 +372,7 @@
MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -ptr ${XERCESCROOT}/.cxx_repository
PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -ptr ${XERCESCROOT}/.cxx_repository
ifeq (${TRANSCODER}, ICU)
- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licu-uc -licudata -lc -lrt
+ ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lc -lrt
else
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -lc -lrt
endif
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org