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/10/04 23:25:21 UTC
cvs commit: xml-xalan/c/xdocs/sources/xalan samples.xml
dmitryh 2005/10/04 14:25:21
Modified: c Makefile.incl.in
c/xdocs/sources entities.ent
c/xdocs/sources/xalan samples.xml
Log:
Fix for XALANC-565.
Revision Changes Path
1.41 +12 -12 xml-xalan/c/Makefile.incl.in
Index: Makefile.incl.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/Makefile.incl.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Makefile.incl.in 20 Sep 2005 13:17:03 -0000 1.40
+++ Makefile.incl.in 4 Oct 2005 21:25:21 -0000 1.41
@@ -166,7 +166,7 @@
CC1 = $(CC2) $(CXXFLAGS)
- CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = $(CXX) -qmkshrobj ${LDFLAGS} ${bitstobuildLink}
@@ -224,7 +224,7 @@
endif
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared ${PIC_OPTION} ${LDFLAGS}
LINK_SONAME = -Wl,-soname,$(SO_NAME)
LINK = $(CXX) -D${PLATFORM} ${PIC_OPTION} ${LDFLAGS}
@@ -255,7 +255,7 @@
endif
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = $(CXX) $(CXXFLAGS) -D${PLATFORM} -shared ${PIC_OPTION} ${LDFLAGS}
LINK = $(CXX) -D${PLATFORM} ${PIC_OPTION} ${LDFLAGS}
@@ -283,7 +283,7 @@
endif
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = $(CXX) $(CXXFLAGS) -D${PLATFORM} -shared ${PIC_OPTION} ${LDFLAGS}
LINK = $(CXX) -D${PLATFORM} ${PIC_OPTION} ${LDFLAGS}
@@ -305,7 +305,7 @@
ALLLIBS = ${LIBS}
SHLIBSUFFIX=.sl
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) $(PLATFORM_CXX_COMPILE_OPTIONS)
- CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = $(CXX) -b +Z ${LDFLAGS} -Wl,+s
LINK_SONAME = -Wl,+h,${SO_NAME}
LINK = $(CXX) $(CXXFLAGS) ${LDFLAGS} $(PLATFORM_COMPILE_OPTIONS) $(PLATFORM_CXX_COMPILE_OPTIONS) -Wl,+s
@@ -331,7 +331,7 @@
EXTRA_LINK_OPTIONS=-lc
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared -fPIC ${LDFLAGS}
LINK = g++ -D${PLATFORM} -fPIC ${LDFLAGS}
@@ -342,7 +342,7 @@
PLATFORM_COMPILE_OPTIONS = -KPIC -mt -xs -ptr$(XSL_OBJ_DIR) -features=rtti -D${PLATFORM} -D_REENTRANT
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- CC4 = $(CC) $(CCFLAGS) -KPIC -mt -xs -D${PLATFORM} -D_REENTRANT
+ CC4 = $(CC) $(CFLAGS) -KPIC -mt -xs -D${PLATFORM} -D_REENTRANT
MAKE_SHARED = ${CXX} -D${PLATFORM} -G -ptr$(XSL_OBJ_DIR) ${LDFLAGS}
LINK_SONAME = -h ${SO_NAME}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -G ${LDFLAGS}
@@ -376,7 +376,7 @@
EXTRA_LINK_OPTIONS=-lc
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared -fPIC ${LDFLAGS}
LINK = g++ -D${PLATFORM} -fPIC ${LDFLAGS}
@@ -395,7 +395,7 @@
else
CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS)
endif
- CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = makeC++SharedLib_r -p 512 ${LDFLAGS} ${bitstobuildLink}
@@ -452,7 +452,7 @@
CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS)
endif
CC3 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CFLAGS) $(PLATFORM_COMPILE_OPTIONS)
CC5 = $(CXX) $(CXXMSGFLAGS) $(PLATFORM_COMPILE_OPTIONS) {$LDFLAGS}
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -Wl,dll ${LDFLAGS}
MAKE_SHARED_MSG = ${CXX} $(CXXMSGFLAGS) -D${PLATFORM} -Wl,dll ${LDFLAGS}
@@ -511,7 +511,7 @@
ALLLIBS = ${LIBS} -L/usr/lib -lm
SHLIBSUFFIX = .so
CC1 = $(CXX) ${CXXFLAGS} $(PLATFORM_COMPILE_OPTIONS) -nocxxstd
- CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} ${CXXFLAGS} -shared -D${PLATFORM} -ptr ${XSL_OBJ_DIR}/.cxx_repository -ieee -pthread -std strict_ansi_errors -nocxxstd ${LDFLAGS}
LINK = ${CXX} $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) ${LDFLAGS}
MAKE_SHARED_LOC=$(MAKE_SHARED)
@@ -557,7 +557,7 @@
CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS2)
endif
CC3 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS2)
- CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CFLAGS) $(PLATFORM_COMPILE_OPTIONS)
TO = qwobj
EXTRA_COMPILE_OPTIONS = -I. -g -qTERASPACE="*YES *NOTSIFC" -qSTGMDL="*INHERIT" -DXML_USE_ICONV400_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSSOR_SOCKET -qTGTRLS="V5R1M0"
EXTRA_LINK_OPTIONS = -qOPTION="*DUPPROC *DUPVAR *NOWARN"
1.48 +2 -2 xml-xalan/c/xdocs/sources/entities.ent
Index: entities.ent
===================================================================
RCS file: /home/cvs/xml-xalan/c/xdocs/sources/entities.ent,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- entities.ent 20 Sep 2005 13:17:07 -0000 1.47
+++ entities.ent 4 Oct 2005 21:25:21 -0000 1.48
@@ -33,8 +33,8 @@
<!ENTITY aix43v5-dist "-aix_433-xlc_50">
<!ENTITY aix51v5-dist "-aix_510-xlc_50">
<!ENTITY aix51v5_64-dist "-aix_510_64-xlc_50">
-<!ENTITY aix51v6-dist "-aix_510-xlc_60_040127">
-<!ENTITY aix51v6_64-dist "-aix_510_64-xlc_60_040127">
+<!ENTITY aix51v6-dist "-aix_510-xlc_60_050623">
+<!ENTITY aix51v6_64-dist "-aix_510_64-xlc_60_050623">
<!ENTITY redhat_72_icc-dist "-redhat_72-icc_71">
<!ENTITY redhat_72_ecc-dist "-redhat_72_64-ecc_71">
<!ENTITY redhat_80_gcc-dist "-redhat_80-gcc_32">
1.46 +1 -1 xml-xalan/c/xdocs/sources/xalan/samples.xml
Index: samples.xml
===================================================================
RCS file: /home/cvs/xml-xalan/c/xdocs/sources/xalan/samples.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- samples.xml 9 May 2005 01:08:08 -0000 1.45
+++ samples.xml 4 Oct 2005 21:25:21 -0000 1.46
@@ -60,7 +60,7 @@
sample, be sure the executable is on the path, and run it from the samples subdirectory that contains the input
files.</note>
<note>The most of the samples are implemented without providing a pluggable memory manager. The <link anchor="simpletransform">SimpleTransform</link> sample illustrates,
- in addition to a simple transformation, the usage of the processor with memory manager</note></note>
+ in addition to a simple transformation, the usage of the processor with memory manager</note>
</s2>
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org