dbertoni 01/04/10 19:40:38
Modified: c/src config.guess config.sub configure Makefile.in
Log:
Changes for OS/390 port.
Revision Changes Path
1.3 +4 -1 xml-xalan/c/src/config.guess
Index: config.guess
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/config.guess,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.guess 2000/11/29 17:57:56 1.2
+++ config.guess 2001/04/11 02:40:37 1.3
@@ -242,7 +242,10 @@
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
*:OS/390:*:*)
- echo i370-ibm-openedition
+ echo i390-ibm-mvs${UNAME_RELEASE}
+ exit 0 ;;
+ *:z/OS:*:*)
+ echo i390-ibm-mvs${UNAME_RELEASE}
exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
1.3 +5 -5 xml-xalan/c/src/config.sub
Index: config.sub
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/config.sub,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.sub 2000/11/29 17:57:58 1.2
+++ config.sub 2001/04/11 02:40:37 1.3
@@ -211,7 +211,7 @@
| hppa64 \
| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
| alphaev6[78] \
- | we32k | ns16k | clipper | i370 | sh | sh[34] \
+ | we32k | ns16k | clipper | i390 | sh | sh[34] \
| powerpc | powerpcle \
| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el
\
| mips64orion | mips64orionel | mipstx39 | mipstx39el \
@@ -481,8 +481,8 @@
basic_machine=hppa1.1-hp
os=-proelf
;;
- i370-ibm* | ibm*)
- basic_machine=i370-ibm
+ i390-ibm* | ibm*)
+ basic_machine=i390-ibm
;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i[34567]86v32)
@@ -580,7 +580,7 @@
os=-msdos
;;
mvs)
- basic_machine=i370-ibm
+ basic_machine=i390-ibm
os=-mvs
;;
ncr3000)
@@ -1207,7 +1207,7 @@
*-ns)
os=-genix
;;
- i370-*)
+ i390-*)
os=-mvs
;;
*-next)
1.3 +1 -1 xml-xalan/c/src/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure 2000/02/03 20:13:12 1.2
+++ configure 2001/04/11 02:40:37 1.3
@@ -1418,7 +1418,7 @@
s%\]%\\&%g
s%\$%$$%g
EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+DEFS=`sed -f conftest.defs confdefs.h | tr '\n' ' '`
rm -f conftest.defs
1.35 +54 -1 xml-xalan/c/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Makefile.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Makefile.in 2001/02/22 19:33:46 1.34
+++ Makefile.in 2001/04/11 02:40:37 1.35
@@ -226,19 +226,49 @@
endif
+#=============== OS390 SPECIFIC OPTIONS =========================
+
+ifeq ($(PLATFORM), OS390)
+
+
+ifndef STLPORTROOT
+nostlportroot:
+ @echo STLPORTROOT must be defined
+endif
+
+SUPPORTED = TRUE
+PLATFORM_COMPILE_OPTIONS =-Wc,dll
-W0,"langlvl(extended),notempinc,float(ieee)" -D${PLATFORM} -D_OPEN_THREADS
-D_XOPEN_SOURCE_EXTENDED -I ${STLPORTROOT}/stlport
+ALLLIBS =
+SHLIBSUFFIX=.dll
+OS390SIDEDECK=.x
+
+CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -Wl,dll
+LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+
+endif
+
ifndef SUPPORTED
nogood:
- @echo Linux Solaris AIX and HPUX are the only unix platforms supported.
+ @echo Linux Solaris, AIX and HPUX are the only unix platforms supported.
endif
# We need the Xerces library
+ifeq ($(PLATFORM), OS390)
+ALLLIBS += $(XERCESCROOT)/lib/libxerces-c1_4.x
+else
ALLLIBS += -L$(XERCESCROOT)/lib -lxerces-c1_4
+endif
# We need the ICU library if we are using the ICUBridge
ifdef XALAN_USE_ICU
+ifeq ($(PLATFORM), OS390)
+ALLLIBS += ${ICUROOT}/lib/libicu-uc.x ${ICUROOT}/lib/libicu-i18n.x
+else
ALLLIBS += -L/usr/local/lib -licu-uc
ALLLIBS += -L/usr/local/lib -licu-i18n
endif
+endif
# We have to use the includes from the source distribution, since we use
@@ -247,7 +277,11 @@
# We need the ICU library if we are using the ICUBridge
ifdef XALAN_USE_ICU
+ifeq ($(PLATFORM), OS390)
+XSL_INCL += -I ${ICUROOT}/include/
+else
XSL_INCL += -I/usr/local/include/
+endif
XSL_BUILD_OPTIONS += -DXALAN_USE_ICU
endif
@@ -309,19 +343,35 @@
testXSLT: lib $(BINTARGETDIR)/testXSLT
+ifeq ($(PLATFORM), OS390)
+$(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+ ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$^ -o $@
+${ALL_OBJECTS_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
+ $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
+else
$(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$^ -o $@
${ALL_OBJECTS_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
+endif
testXPath: lib $(BINTARGETDIR)/testXPath
+ifeq ($(PLATFORM), OS390)
$(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o
${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
+ ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+${ALL_OBJECTS_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
+ $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
+else
+$(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o
${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o
+ ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
+endif
Samples: lib CompileStylesheet ExternalFunction SimpleTransform
StreamTransform TraceListen UseStylesheetParam XalanTransform XPathWrapper #
ThreadSafe
@@ -411,6 +461,9 @@
$(THISLIB)$(VER)$(SHLIBSUFFIX): $(ALL_OBJECTS)
$(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS)
$^ -o $@
+ifeq ($(PLATFORM), OS390)
+ cp -p *.x ${LIB_DIR}
+endif
clean:
rm -rf $(ALL_OBJECTS_DIR)/*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
