CygWin, MSVC hack

Fixed problem with string parser

diff --git a/orte/include/orte_config_omk_win32.h b/orte/include/orte_config_omk_win32.h
deleted file mode 100644 (file)
index 83aa35b..0000000
--- a/orte/include/orte_config_omk_win32.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/* orte/include/config.h.  Generated by configure.  */
-/* orte/include/config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define if linux kernel is found */
-/* #undef CONFIG_ORTE_KERNEL */
-
-/* Define to enable ORTE's RT support */
-/* #undef CONFIG_ORTE_RT */
-
-/* Define if kernel is RTAI patched */
-/* #undef CONFIG_ORTE_RTAI */
-
-/* Define if kernel is RTLinux patched */
-/* #undef CONFIG_ORTE_RTL */
-
-/* Define if is target a unix system */
-/* #undef CONFIG_ORTE_UNIX */
-
-/* Define if is target windows */
-#define CONFIG_ORTE_WIN 1
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-/* #undef HAVE_ARPA_INET_H */
-
-/* Define to 1 if you have the <asm/byteorder.h> header file. */
-/* #undef HAVE_ASM_BYTEORDER_H */
-
-/* Define to 1 if you have the <byteswap.h> header file. */
-/* #undef HAVE_BYTESWAP_H */
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#define HAVE_CTYPE_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `gethostbyname' function. */
-/* #undef HAVE_GETHOSTBYNAME */
-
-/* Define to 1 if you have the <getopt.h> header file. */
-#define HAVE_GETOPT_H 1
-
-/* Define to 1 if you have the `pthread' library (-lpthread). */
-/* #undef HAVE_LIBPTHREAD */
-
-/* Define to 1 if you have the `ws2_32' library (-lws2_32). */
-#define HAVE_LIBWS2_32 1
-
-/* Define to 1 if you have the <linux/ctype.h> header file. */
-/* #undef HAVE_LINUX_CTYPE_H */
-
-/* Define to 1 if you have the <linux/if.h> header file. */
-/* #undef HAVE_LINUX_IF_H */
-
-/* Define to 1 if you have the <linux/in.h> header file. */
-/* #undef HAVE_LINUX_IN_H */
-
-/* Define to 1 if you have the <linux/module.h> header file. */
-/* #undef HAVE_LINUX_MODULE_H */
-
-/* Define to 1 if you have the <linux/socket.h> header file. */
-/* #undef HAVE_LINUX_SOCKET_H */
-
-/* Define to 1 if you have the <linux/string.h> header file. */
-/* #undef HAVE_LINUX_STRING_H */
-
-/* Define to 1 if you have the <linux/time.h> header file. */
-/* #undef HAVE_LINUX_TIME_H */
-
-/* Define to 1 if you have the <linux/types.h> header file. */
-/* #undef HAVE_LINUX_TYPES_H */
-
-/* Define to 1 if you have the <netdb.h> header file. */
-/* #undef HAVE_NETDB_H */
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-/* #undef HAVE_NETINET_IN_H */
-
-/* Define to 1 if you have the <net/if.h> header file. */
-/* #undef HAVE_NET_IF_H */
-
-/* Define to 1 if you have the <nictab.h> header file. */
-/* #undef HAVE_NICTAB_H */
-
-/* Define to 1 if you have the <nic.h> header file. */
-/* #undef HAVE_NIC_H */
-
-/* Define to 1 if you have the <pthread.h> header file. */
-/* #undef HAVE_PTHREAD_H */
-
-/* Define to 1 if you have the <rtl.h> header file. */
-/* #undef HAVE_RTL_H */
-
-/* Define to 1 if you have the <rtl_malloc.h> header file. */
-/* #undef HAVE_RTL_MALLOC_H */
-
-/* Define to 1 if you have the <rtnet.h> header file. */
-/* #undef HAVE_RTNET_H */
-
-/* Define to 1 if you have the <semaphore.h> header file. */
-/* #undef HAVE_SEMAPHORE_H */
-
-/* Define to 1 if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
-
-/* Define to 1 if you have the <stdarg.h> header file. */
-#define HAVE_STDARG_H 1
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strdup' function. */
-#define HAVE_STRDUP 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-/* #undef HAVE_SYS_IOCTL_H */
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-/* #undef HAVE_SYS_SOCKET_H */
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <time.h> header file. */
-/* #undef HAVE_TIME_H */
-
-/* Define to 1 if you have the <udp.h> header file. */
-/* #undef HAVE_UDP_H */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the <windows.h> header file. */
-#define HAVE_WINDOWS_H 1
-
-/* Define to 1 if you have the <winsock2.h> header file. */
-#define HAVE_WINSOCK2_H 1
-
-/* Define to 1 if you have the <ws2tcpip.h> header file. */
-#define HAVE_WS2TCPIP_H 1
-
-/* Name of package */
-#define ORTE_PACKAGE "orte"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define ORTE_PACKAGE_BUGREPORT "petr.smolik@wo.cz"
-
-/* Define to the full name of this package. */
-#define ORTE_PACKAGE_NAME "orte"
-
-/* Define to the full name and version of this package. */
-#define ORTE_PACKAGE_STRING "orte 0.2.0"
-
-/* Define to the one symbol short name of this package. */
-#define ORTE_PACKAGE_TARNAME "orte"
-
-/* Define to the version of this package. */
-#define ORTE_PACKAGE_VERSION "0.2.0"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define ORTE_VERSION "0.2.0"
-
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
-
-
-#ifndef _GNU_SOURCE
-  #define _GNU_SOURCE
-#endif
-
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif

diff --git a/orte/include/rtai/rtai_posix.h.patched b/orte/include/rtai/rtai_posix.h.patched
index f94ff12ba1120739e28e3fe73d48bb3bdfebaa7c..e92ebf32574ee5a434a3f6fe3644ceaa65bf9cf7 100644 (file)
--- a/orte/include/rtai/rtai_posix.h.patched
+++ b/orte/include/rtai/rtai_posix.h.patched
@@ -29,7 +29,7 @@
 
 #define MAX_PRIO       99
 #define MIN_PRIO       1
-#define STACK_SIZE     8192
+#define STACK_SIZE     4096
 #define RR_QUANTUM_NS  1000000
 
 

diff --git a/orte/include/rtl/compat.h b/orte/include/rtl/compat.h
index 921edc25ee7846a8d3caadc2f899d25eebe00753..97ea897a448df0040d6f7da389b77dcbc68c872f 100644 (file)
--- a/orte/include/rtl/compat.h
+++ b/orte/include/rtl/compat.h
@@ -21,6 +21,9 @@
 #ifndef _COMPAT_H
 #define _COMPAT_H
 
+#include <linux/if.h>
+#include <linux/in.h>
+
 #define printf rtl_printf
 #define bswap_16 swab16
 #define bswap_32 swab32
@@ -39,22 +42,20 @@ char *strdup(char *str) {
   return tmp;
 }
 
-static inline int 
-atoi(char *s) {
-  int i = 0;
-  int neg = 0;
-
-  while (isspace(*s)) s++;
-  if (*s == '-') {
-    neg = 1;
-    s++;
-  } else 
-    if (*s == '+') {
-      s++;
-    }
-  while (isdigit(*s))
-    i = i*10 + *s++ - '0';
-  return neg ? -i : i;
+static inline int atoi(const char* nptr)
+{
+    return simple_strtol(nptr, (char **)NULL, 10);
+}
+
+/*static char inet_ntoa_buf[16];
+static inline char *inet_ntoa(struct in_addr in) {
+  unsigned char *octet;
+
+  octet = (unsigned char *)&(in.s_addr);
+  sprintf(inet_ntoa_buf, "%u.%u.%u.%u", octet[0], octet[1], octet[2], octet[3]);
+
+  return inet_ntoa_buf;
 }
+*/
 
 #endif /* _COMPAT_H */

diff --git a/orte/liborte/msvc/Makefile.msc b/orte/liborte/msvc/Makefile.msc
new file mode 100644 (file)
index 0000000..22b9008
--- /dev/null
+++ b/orte/liborte/msvc/Makefile.msc
@@ -0,0 +1,83 @@
+# ---------------------------------------------------------------------
+# Microsoft C/C++ Installation Directory
+#
+# CHANGE this definition to point to your compiler's installation directory
+# ---------------------------------------------------------------------
+MSCDIR=                c:\Progra~1\micros~3\vc98
+
+CFLAGS = -c -Zi -MD $(INCLUDE)
+LIB_CFLAGS=    $(CFLAGS) -LD
+INCLUDE=       -I$(MSCDIR)\include -I..\..\include -I..\..\include\win32
+ORTELIB_OBJS= \
+       "..\ul_gavlprim.obj" \
+       "..\conv.obj" \
+       "..\debug.obj" \
+       "..\event.obj" \
+       "..\fnmatch.obj" \
+       "..\htimerNtp.obj" \
+       "..\objectEntry.obj" \
+       "..\objectEntryTimer.obj" \
+       "..\objectUtils.obj" \
+       "..\ORTEAppRecvMetatrafficThread.obj" \
+       "..\ORTEAppRecvUserdataThread.obj" \
+       "..\ORTEAppSendThread.obj" \
+       "..\ORTEDomain.obj" \
+       "..\ORTEDomainApp.obj" \
+       "..\ORTEDomainMgr.obj" \
+       "..\ORTEInit.obj" \
+       "..\ORTEMisc.obj" \
+       "..\ORTEPattern.obj" \
+       "..\ORTEPublication.obj" \
+       "..\ORTEPublicationTimer.obj" \
+       "..\ORTESubscription.obj" \
+       "..\ORTEThreadUtils.obj" \
+       "..\ORTETypeRegister.obj" \
+       "..\ORTEVerbosity.obj" \
+       "..\parameter.obj" \
+       "..\RTPSAck.obj" \
+       "..\RTPSCSTReader.obj" \
+       "..\RTPSCSTReaderProc.obj" \
+       "..\RTPSCSTReaderTimer.obj" \
+       "..\RTPSCSTWriter.obj" \
+       "..\RTPSCSTWriterTimer.obj" \
+       "..\RTPSGap.obj" \
+       "..\RTPSHeader.obj" \
+       "..\RTPSHeardBeat.obj" \
+       "..\RTPSInfoDST.obj" \
+       "..\RTPSInfoREPLY.obj" \
+       "..\RTPSInfoSRC.obj" \
+       "..\RTPSInfoTS.obj" \
+       "..\RTPSIssue.obj" \
+       "..\RTPSPad.obj" \
+       "..\RTPSUtils.obj" \
+       "..\RTPSVar.obj" \
+       "..\sock.obj" \
+       "..\ul_gavl.obj"
+
+CC=                $(MSCDIR)\bin\cl
+LINK=          $(MSCDIR)\bin\link
+LIBRARIAN=     $(MSCDIR)\bin\lib
+
+TARGETS=liborte.lib
+
+all :  default
+
+default : $(TARGETS)
+
+liborte.lib: $(ORTELIB_OBJS)
+    $(LINK) -lib -out:$@ $(ORTELIB_OBJS)
+
+# ---------------------------------------------------------------------
+# Generic Compilation Rules
+#
+# Do NOT change anything below this point.
+# ---------------------------------------------------------------------
+#.SUFFIXES: .c .obj .exe
+
+.c.obj:
+       $(CC) $(CFLAGS) $< -Fo$*.obj
+    
+clean :
+    del ..\*.obj
+    del *.lib
+    del *.pdb

diff --git a/orte/liborte/msvc/liborte.dsp b/orte/liborte/msvc/liborte.dsp
index 086e1952a51bb95aff32e74aa8331c1294eae081..a04d3fbe2f1111fa473da62355ef77f9b103bb99 100644 (file)
--- a/orte/liborte/msvc/liborte.dsp
+++ b/orte/liborte/msvc/liborte.dsp
@@ -4,7 +4,7 @@
 \r
 # TARGTYPE "Win32 (x86) Static Library" 0x0104\r
 \r
-CFG=liborte - Win32 Debug\r
+CFG=liborte - Win32 Release\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
 !MESSAGE \r
@@ -13,12 +13,11 @@ CFG=liborte - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "liborte.mak" CFG="liborte - Win32 Debug"\r
+!MESSAGE NMAKE /f "liborte.mak" CFG="liborte - Win32 Release"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
 !MESSAGE "liborte - Win32 Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "liborte - Win32 Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -27,9 +26,6 @@ CFG=liborte - Win32 Debug
 # PROP Scc_LocalPath ""\r
 CPP=cl.exe\r
 RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "liborte - Win32 Release"\r
-\r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
 # PROP BASE Output_Dir "Release"\r
@@ -50,37 +46,9 @@ BSC32=bscmake.exe
 LIB32=link.exe -lib\r
 # ADD BASE LIB32 /nologo\r
 # ADD LIB32 /nologo\r
-\r
-!ELSEIF  "$(CFG)" == "liborte - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir ""\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_ORTE_WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../include/win32" /YX /FD /GZ /c\r
-# SUBTRACT CPP /WX /Fr\r
-# ADD BASE RSC /l 0x405 /d "_DEBUG"\r
-# ADD RSC /l 0x405 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo\r
-# ADD LIB32 /nologo\r
-\r
-!ENDIF \r
-\r
 # Begin Target\r
 \r
 # Name "liborte - Win32 Release"\r
-# Name "liborte - Win32 Debug"\r
 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
@@ -102,10 +70,6 @@ SOURCE=..\fnmatch.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\globals.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\htimerNtp.c\r
 # End Source File\r
 # Begin Source File\r
@@ -150,6 +114,10 @@ SOURCE=..\ORTEInit.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\ORTEMisc.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\ORTEPattern.c\r
 # End Source File\r
 # Begin Source File\r

diff --git a/orte/liborte/rtl/Makefile.in b/orte/liborte/rtl/Makefile.in
index d2774987d73c0c476accf945777e52a4b3326c00..86b3277fb6b0dab685dea87636dc13085a3d04e2 100644 (file)
--- a/orte/liborte/rtl/Makefile.in
+++ b/orte/liborte/rtl/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -19,66 +19,78 @@
 #
 #  $Id: Makefile.am,v 1.0 2003/08/04
 #
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../..
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONFIG_ADEOS_FALSE = @CONFIG_ADEOS_FALSE@
+CONFIG_ADEOS_TRUE = @CONFIG_ADEOS_TRUE@
+CONFIG_ORTE_CYGWIN_FALSE = @CONFIG_ORTE_CYGWIN_FALSE@
+CONFIG_ORTE_CYGWIN_TRUE = @CONFIG_ORTE_CYGWIN_TRUE@
 CONFIG_ORTE_KERNEL = @CONFIG_ORTE_KERNEL@
+CONFIG_ORTE_KERNEL_FALSE = @CONFIG_ORTE_KERNEL_FALSE@
+CONFIG_ORTE_KERNEL_TRUE = @CONFIG_ORTE_KERNEL_TRUE@
+CONFIG_ORTE_MINGW_FALSE = @CONFIG_ORTE_MINGW_FALSE@
+CONFIG_ORTE_MINGW_TRUE = @CONFIG_ORTE_MINGW_TRUE@
 CONFIG_ORTE_RT = @CONFIG_ORTE_RT@
+CONFIG_ORTE_RT_FALSE = @CONFIG_ORTE_RT_FALSE@
+CONFIG_ORTE_RT_TRUE = @CONFIG_ORTE_RT_TRUE@
+CONFIG_ORTE_UNIX_FALSE = @CONFIG_ORTE_UNIX_FALSE@
+CONFIG_ORTE_UNIX_TRUE = @CONFIG_ORTE_UNIX_TRUE@
+CONFIG_ORTE_WIN_FALSE = @CONFIG_ORTE_WIN_FALSE@
+CONFIG_ORTE_WIN_TRUE = @CONFIG_ORTE_WIN_TRUE@
+CONFIG_RTHAL_FALSE = @CONFIG_RTHAL_FALSE@
+CONFIG_RTHAL_TRUE = @CONFIG_RTHAL_TRUE@
+CONFIG_RTLINUX_FALSE = @CONFIG_RTLINUX_FALSE@
+CONFIG_RTLINUX_TRUE = @CONFIG_RTLINUX_TRUE@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
 LINUX_AFLAGS = @LINUX_AFLAGS@
 LINUX_ARCH = @LINUX_ARCH@
 LINUX_ARFLAGS = @LINUX_ARFLAGS@
@@ -91,23 +103,76 @@ LINUX_KERNELRELEASE = @LINUX_KERNELRELEASE@
 LINUX_LD = @LINUX_LD@
 LINUX_LDFLAGS = @LINUX_LDFLAGS@
 LINUX_MODULE_EXT = @LINUX_MODULE_EXT@
+LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 ORTE_MAJOR_VERSION = @ORTE_MAJOR_VERSION@
 ORTE_MICRO_VERSION = @ORTE_MICRO_VERSION@
 ORTE_MINOR_VERSION = @ORTE_MINOR_VERSION@
 ORTE_VERSION = @ORTE_VERSION@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
 RTAI_CFLAGS = @RTAI_CFLAGS@
 RTLINUX_CC = @RTLINUX_CC@
 RTLINUX_CFLAGS = @RTLINUX_CFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
+USE_RTAI_FALSE = @USE_RTAI_FALSE@
+USE_RTAI_TRUE = @USE_RTAI_TRUE@
+USE_RTLINUX_FALSE = @USE_RTLINUX_FALSE@
+USE_RTLINUX_TRUE = @USE_RTLINUX_TRUE@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
 modulePROGRAMS_INSTALL = @modulePROGRAMS_INSTALL@
 moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 
 PTHREAD_RWLOCK_SOURCES = \
 ptw32_rwlock_check_need_init.c \
@@ -132,6 +197,7 @@ pthread_rwlock_trywrlock.c
 @USE_RTLINUX_TRUE@rtl_pthread_rwlock_ko_SOURCES = $(PTHREAD_RWLOCK_SOURCES)
 @USE_RTLINUX_TRUE@rtl_pthread_rwlock_ko_LINK = $(top_builddir)/modtool --link -o $@
 subdir = orte/liborte/rtl
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/orte/include/config.h
 CONFIG_CLEAN_FILES =
@@ -139,6 +205,14 @@ CONFIG_CLEAN_FILES =
 @USE_RTLINUX_FALSE@module_PROGRAMS =
 PROGRAMS = $(module_PROGRAMS)
 
+am__rtl_pthread_rwlock_ko_SOURCES_DIST = ptw32_rwlock_check_need_init.c \
+       ptw32_rwlock_cancelwrwait.c pthread_rwlock_init.c \
+       pthread_rwlock_destroy.c pthread_rwlockattr_init.c \
+       pthread_rwlockattr_destroy.c pthread_rwlockattr_getpshared.c \
+       pthread_rwlockattr_setpshared.c pthread_rwlock_rdlock.c \
+       pthread_rwlock_timedrdlock.c pthread_rwlock_wrlock.c \
+       pthread_rwlock_timedwrlock.c pthread_rwlock_unlock.c \
+       pthread_rwlock_tryrdlock.c pthread_rwlock_trywrlock.c
 am__objects_1 = ptw32_rwlock_check_need_init.$(OBJEXT) \
        ptw32_rwlock_cancelwrwait.$(OBJEXT) \
        pthread_rwlock_init.$(OBJEXT) pthread_rwlock_destroy.$(OBJEXT) \
@@ -159,11 +233,7 @@ rtl_pthread_rwlock_ko_LDADD = $(LDADD)
 rtl_pthread_rwlock_ko_DEPENDENCIES =
 rtl_pthread_rwlock_ko_LDFLAGS =
 
-DEFS = @DEFS@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/orte/include
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pthread_rwlock_destroy.Po \
@@ -185,9 +255,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(rtl_pthread_rwlock_ko_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
+DIST_SOURCES = $(am__rtl_pthread_rwlock_ko_SOURCES_DIST)
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
 SOURCES = $(rtl_pthread_rwlock_ko_SOURCES)
 
 all: all-am
@@ -208,7 +277,7 @@ install-modulePROGRAMS: $(module_PROGRAMS)
          ; then \
            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
           echo " $(INSTALL_PROGRAM_ENV) $(modulePROGRAMS_INSTALL) $$p $(DESTDIR)$(moduledir)/$$f"; \
-          $(INSTALL_PROGRAM_ENV) $(modulePROGRAMS_INSTALL) $$p $(DESTDIR)$(moduledir)/$$f; \
+          $(INSTALL_PROGRAM_ENV) $(modulePROGRAMS_INSTALL) $$p $(DESTDIR)$(moduledir)/$$f || exit 1; \
          else :; fi; \
        done
 
@@ -248,26 +317,35 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptw32_rwlock_cancelwrwait.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptw32_rwlock_check_need_init.Po@am__quote@
 
-distclean-depend:
-       -rm -rf ./$(DEPDIR)
-
 .c.o:
-@AMDEP_TRUE@   source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@     -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@   else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@   fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
 
 .c.obj:
-@AMDEP_TRUE@   source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
+@am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@     -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@   else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@   fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
 uninstall-info-am:
 
 ETAGS = etags
 ETAGSFLAGS =
 
+CTAGS = ctags
+CTAGSFLAGS =
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -293,20 +371,41 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
             $$tags $$unique
 
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+
 GTAGS:
        here=`$(am__cd) $(top_builddir) && pwd` \
          && cd $(top_srcdir) \
          && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-       @list='$(DISTFILES)'; for file in $$list; do \
+       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+       list='$(DISTFILES)'; for file in $$list; do \
+         case $$file in \
+           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+         esac; \
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
          if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -332,7 +431,6 @@ all-am: Makefile $(PROGRAMS)
 
 installdirs:
        $(mkinstalldirs) $(DESTDIR)$(moduledir)
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -344,7 +442,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         INSTALL_STRIP_FLAG=-s \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
          `test -z '$(STRIP)' || \
            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -352,7 +450,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -362,9 +460,10 @@ clean: clean-am
 clean-am: clean-generic clean-modulePROGRAMS mostlyclean-am
 
 distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-       distclean-generic distclean-tags
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+       distclean-tags
 
 dvi: dvi-am
 
@@ -385,24 +484,33 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am uninstall-modulePROGRAMS
 
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-       clean-modulePROGRAMS distclean distclean-compile \
-       distclean-depend distclean-generic distclean-tags distdir dvi \
-       dvi-am info info-am install install-am install-data \
-       install-data-am install-exec install-exec-am install-info \
-       install-info-am install-man install-modulePROGRAMS \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-compile mostlyclean-generic tags uninstall \
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+       clean-modulePROGRAMS ctags distclean distclean-compile \
+       distclean-generic distclean-tags distdir dvi dvi-am info \
+       info-am install install-am install-data install-data-am \
+       install-exec install-exec-am install-info install-info-am \
+       install-man install-modulePROGRAMS install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
        uninstall-am uninstall-info-am uninstall-modulePROGRAMS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

diff --git a/orte/manager/mcvs/Makefile.msc b/orte/manager/mcvs/Makefile.msc
index 437d5d8fc8719f67e202f76fd67dbf8d9bf56a5f..ae34d7360799234f6753c637e63c21b7bc0e164e 100644 (file)
--- a/orte/manager/mcvs/Makefile.msc
+++ b/orte/manager/mcvs/Makefile.msc
@@ -39,8 +39,6 @@ ORTEManager.exe: ..\ORTEManager.obj getopt.obj getopt_long.obj
        $(LINK) -out:$@ getopt.obj getopt_long.obj $(ORTELIB) $< $(LIBS)
 
 clean :
-       del *.obj
-        del *.exe
-        del *.pdb
-
-
+    del *.obj
+    del *.exe
+    del *.pdb

diff --git a/orte/manager/mcvs/m.bat b/orte/manager/mcvs/m.bat
deleted file mode 100755 (executable)
index 08eb76f..0000000
--- a/orte/manager/mcvs/m.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-del ORTEManager.exe\r
-make /f Makefile.msc\r
-pause\r
-rem ORTEManager -P 127.0.0.1 -v ALL:10 -r 15\r
-ORTEManager -v ALL:10
\ No newline at end of file

diff --git a/orte/manager/rc/ortemanagerd b/orte/manager/rc/ortemanagerd
index 864bb0c047a8d64651a0c2fbb7dfe4252ff8bd6d..f0450c9afeb81f46fa1f48e6c063491da387f77c 100755 (executable)
--- a/orte/manager/rc/ortemanagerd
+++ b/orte/manager/rc/ortemanagerd
@@ -15,17 +15,17 @@ case "$1" in
   start)
        echo -n "Starting ortemanager: "
 
-       daemon ORTEManager -D
+       daemon ortemanager -D
        RETVAL=$?
        ;;
   stop)
        echo -n "Stopping ortemanager: "
-       killproc ORTEManager
+       killproc ortemanager
        RETVAL=$?
        echo
        ;;
   status)
-       status ORTEManager
+       status ortemanager
        RETVAL=$?
        ;;
   restart|reload)