tng 2002/08/26 07:47:49
Modified: c/samples Makefile.incl configure configure.in runConfigure
c/tests Makefile.incl configure configure.in runConfigure
c/tests/ThreadTest ThreadTest.cpp
Log:
[Bug 12004] Samples/Tests don't build under cygwin. Patch from Abe Backus.
Revision Changes Path
1.50 +11 -1 xml-xerces/c/samples/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/Makefile.incl,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Makefile.incl 8 Aug 2002 16:36:26 -0000 1.49
+++ Makefile.incl 26 Aug 2002 14:47:48 -0000 1.50
@@ -189,6 +189,16 @@
SHLIBSUFFIX=.so
endif
+#=============== CYGWIN SPECIFIC OPTIONS =========================
+ifeq (${PLATFORM}, CYGWIN)
+CMP= -c ${CXXFLAGS}
+CC= ${COMPILER} -c -D__${PLATFORM}__
+LINK = ${COMPILER} -D__${PLATFORM}__ ${LDFLAGS}
+PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
+SHLIBSUFFIX=.dll
+endif
+
#=============== FREEBSD SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, FREEBSD)
CMP= -c ${CXXFLAGS}
1.23 +1 -0 xml-xerces/c/samples/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/configure,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- configure 26 Jul 2002 16:36:31 -0000 1.22
+++ configure 26 Aug 2002 14:47:48 -0000 1.23
@@ -1323,6 +1323,7 @@
*-*-OS400*) platform=OS400 ;;
*-*-osf*) platform=TRU64 ;;
*-apple-*) platform=MACOSX ;;
+ *-*-cygwin*) platform=CYGWIN ;;
*) platform=UNKNOWN ;;
esac
1.21 +1 -0 xml-xerces/c/samples/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/configure.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- configure.in 26 Jul 2002 16:36:31 -0000 1.20
+++ configure.in 26 Aug 2002 14:47:48 -0000 1.21
@@ -51,6 +51,7 @@
*-*-OS400*) platform=OS400 ;;
*-*-osf*) platform=TRU64 ;;
*-apple-*) platform=MACOSX ;;
+ *-*-cygwin*) platform=CYGWIN ;;
*) platform=UNKNOWN ;;
esac
AC_SUBST(platform)
1.34 +3 -3 xml-xerces/c/samples/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/runConfigure,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- runConfigure 8 Jul 2002 15:19:11 -0000 1.33
+++ runConfigure 26 Aug 2002 14:47:48 -0000 1.34
@@ -84,7 +84,7 @@
echo " where options may be any of the following:"
echo " -p <platform> (accepts 'aix', 'linux', 'freebsd', 'solaris',
'hp-10', 'hp-11', 'openserver', 'unixware', 'os400', 'irix',
- 'ptx', 'tru64', 'macosx')"
+ 'ptx', 'tru64', 'macosx', 'cygwin')"
echo " -c <C compiler name> (e.g. gcc, cc, xlc_r, icc or ecc)"
echo " -x <C++ compiler name> (e.g. g++, CC, xlC_r, icc or ecc)"
echo " -d (specifies that you want to build debug version)"
@@ -196,7 +196,7 @@
# Now check if the options are correct or not, bail out if incorrect
#
case $platform in
- aix | openserver | unixware | linux | freebsd | solaris | hp-10 | hp-11 | os400
| irix | ptx | tru64 | macosx)
+ aix | openserver | unixware | linux | freebsd | solaris | hp-10 | hp-11 | os400
| irix | ptx | tru64 | macosx | cygwin)
# platform has been recognized
;;
*)
1.32 +11 -1 xml-xerces/c/tests/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/Makefile.incl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Makefile.incl 8 Aug 2002 16:36:37 -0000 1.31
+++ Makefile.incl 26 Aug 2002 14:47:49 -0000 1.32
@@ -188,6 +188,16 @@
SHLIBSUFFIX=.so
endif
+#=============== CYGWIN SPECIFIC OPTIONS =========================
+ifeq (${PLATFORM}, CYGWIN)
+CMP= -c ${CXXFLAGS}
+CC= ${COMPILER} -c -D__${PLATFORM}__
+LINK = ${COMPILER} -D__${PLATFORM}__ ${LDFLAGS}
+PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
+SHLIBSUFFIX=.dll
+endif
+
#=============== FREEBSD SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, FREEBSD)
CMP= -c ${CXXFLAGS}
1.21 +1 -0 xml-xerces/c/tests/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/configure,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- configure 26 Jul 2002 16:40:19 -0000 1.20
+++ configure 26 Aug 2002 14:47:49 -0000 1.21
@@ -1323,6 +1323,7 @@
*-*-OS400*) platform=OS400 ;;
*-*-osf*) platform=TRU64 ;;
*-apple-*) platform=MACOSX ;;
+ *-*-cygwin*) platform=CYGWIN ;;
*) platform=UNKNOWN ;;
esac
1.25 +1 -0 xml-xerces/c/tests/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/configure.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- configure.in 26 Jul 2002 16:40:19 -0000 1.24
+++ configure.in 26 Aug 2002 14:47:49 -0000 1.25
@@ -51,6 +51,7 @@
*-*-OS400*) platform=OS400 ;;
*-*-osf*) platform=TRU64 ;;
*-apple-*) platform=MACOSX ;;
+ *-*-cygwin*) platform=CYGWIN ;;
*) platform=UNKNOWN ;;
esac
AC_SUBST(platform)
1.24 +3 -3 xml-xerces/c/tests/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/runConfigure,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- runConfigure 8 Jul 2002 15:19:32 -0000 1.23
+++ runConfigure 26 Aug 2002 14:47:49 -0000 1.24
@@ -84,7 +84,7 @@
echo " where options may be any of the following:"
echo " -p <platform> (accepts 'aix', 'linux', 'freebsd', 'solaris',
'hp-10', 'hp-11', 'openserver', 'unixware', 'os400', 'irix',
- 'ptx', 'tru64', 'macosx')"
+ 'ptx', 'tru64', 'macosx', 'cygwin')"
echo " -c <C compiler name> (e.g. gcc, cc, xlc_r, icc or ecc)"
echo " -x <C++ compiler name> (e.g. g++, CC, xlC_r, icc or ecc)"
echo " -d (specifies that you want to build debug version)"
@@ -196,7 +196,7 @@
# Now check if the options are correct or not, bail out if incorrect
#
case $platform in
- aix | openserver | unixware | linux | freebsd | solaris | hp-10 | hp-11 | os400
| irix | ptx | tru64 | macosx)
+ aix | openserver | unixware | linux | freebsd | solaris | hp-10 | hp-11 | os400
| irix | ptx | tru64 | macosx | cygwin)
# platform has been recognized
;;
*)
1.22 +2 -2 xml-xerces/c/tests/ThreadTest/ThreadTest.cpp
Index: ThreadTest.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/ThreadTest/ThreadTest.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ThreadTest.cpp 21 May 2002 18:54:09 -0000 1.21
+++ ThreadTest.cpp 26 Aug 2002 14:47:49 -0000 1.22
@@ -119,7 +119,7 @@
}
-#elif defined (AIX) || defined(SOLARIS) || defined(LINUX) || defined(HPUX) ||
defined (OS390) || defined(FREEBSD)
+#elif defined (AIX) || defined(SOLARIS) || defined(LINUX) || defined(HPUX) ||
defined (OS390) || defined(FREEBSD) || defined(__CYGWIN__)
#include <pthread.h>
#include <unistd.h>
#include <errno.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
