Menu
▾
▴
[Oorexx-svn] SF.net SVN: oorexx: [43] interpreter/trunk
|
From: <wda...@us...> - 2006-11-02 16:18:25
|
Revision: 43
http://svn.sourceforge.net/oorexx/?rev=43&view=rev
Author: wdashley
Date: 2006-11-02 08:18:01 -0800 (Thu, 02 Nov 2006)
Log Message:
-----------
ArtifactID: None
Comment: utilities/rxapi and shared changes.
Modified Paths:
--------------
interpreter/trunk/configure.ac
interpreter/trunk/utilities/rxapi/Makefile.am
Added Paths:
-----------
interpreter/trunk/shared/ClientMessage.cpp
interpreter/trunk/shared/ClientMessage.hpp
interpreter/trunk/shared/Encodings.hpp
interpreter/trunk/utilities/rxapi/RexxService.h
Removed Paths:
-------------
interpreter/trunk/kernel/client/ClientMessage.cpp
interpreter/trunk/kernel/client/ClientMessage.hpp
interpreter/trunk/kernel/client/Encodings.hpp
interpreter/trunk/utilities/rxapi/platform/RexxService.h
Modified: interpreter/trunk/configure.ac
===================================================================
--- interpreter/trunk/configure.ac 2006-11-02 15:57:05 UTC (rev 42)
+++ interpreter/trunk/configure.ac 2006-11-02 16:18:01 UTC (rev 43)
@@ -215,7 +215,8 @@
OOREXX_INCLUDES="-I\$(top_srcdir)/api \
-I\$(top_srcdir)/api/platform/unix \
- -I\$(top_srcdir)/kernel/messages"
+ -I\$(top_srcdir)/kernel/messages \
+ -I\$(top_srcdir)/shared"
AC_SUBST(OOREXX_INCLUDES)
OOREXX_COMMONHEADERS="\$(top_srcdir)/api/InternalAPI.hpp \
@@ -230,22 +231,15 @@
\$(top_srcdir)/shared/SystemException.hpp"
AC_SUBST(OOREXX_COMMONHEADERS)
-OOREXX_LIBS="-L\$(top_srcdir)/shared \
- -L\$(top_srcdir)/rexxapi \
+OOREXX_LIBS="-L\$(top_srcdir)/rexxapi \
-L\$(top_srcdir)/kernel \
-lpthread \
-ldl"
AC_SUBST(OOREXX_LIBS)
-OOREXX_LINK_LIBS="-L\$(top_srcdir)/shared \
- -L\$(top_srcdir)/kernel \
- -lpthread \
- -ldl"
-AC_SUBST(OOREXX_LINK_LIBS)
-
AC_CONFIG_FILES([
ooRexx.pc \
rexxapi/daemon/platform/unix/rxapid.sh \
Deleted: interpreter/trunk/kernel/client/ClientMessage.cpp
===================================================================
--- interpreter/trunk/kernel/client/ClientMessage.cpp 2006-11-02 15:57:05 UTC (rev 42)
+++ interpreter/trunk/kernel/client/ClientMessage.cpp 2006-11-02 16:18:01 UTC (rev 43)
@@ -1,66 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/* */
-/* Copyright (c) 1995, 2004 IBM Corporation. All rights reserved. */
-/* Copyright (c) 2005-2006 Rexx Language Association. All rights reserved. */
-/* */
-/* This program and the accompanying materials are made available under */
-/* the terms of the Common Public License v1.0 which accompanies this */
-/* distribution. A copy is also available at the following address: */
-/* http://www.ibm.com/developerworks/oss/CPLv1.0.htm */
-/* */
-/* Redistribution and use in source and binary forms, with or */
-/* without modification, are permitted provided that the following */
-/* conditions are met: */
-/* */
-/* Redistributions of source code must retain the above copyright */
-/* notice, this list of conditions and the following disclaimer. */
-/* Redistributions in binary form must reproduce the above copyright */
-/* notice, this list of conditions and the following disclaimer in */
-/* the documentation and/or other materials provided with the distribution. */
-/* */
-/* Neither the name of Rexx Language Association nor the names */
-/* of its contributors may be used to endorse or promote products */
-/* derived from this software without specific prior written permission. */
-/* */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT */
-/* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED */
-/* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, */
-/* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY */
-/* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING */
-/* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS */
-/* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/*----------------------------------------------------------------------------*/
-
-#include "ClientMessage.hpp"
-#include "ServiceException.hpp"
-#include "LocalAPIManager.hpp"
-
-
-/**
- * Send a message to the rxapi server, and wait for a reply.
- */
-void ClientMessage::send()
-{
- session = LocalAPIManager::getInstance()->getSession();
- LocalAPIManager::getInstance()->getUserID(userid);
-
- SysClientStream pipe;
-
- // open the pipe to the connection->
- if (!pipe.open("localhost", REXX_API_PORT))
- {
- throw new ServiceException(SERVER_FAILURE, "ServiceMessage::send() Failure connecting to rxapi server");
- }
-
- // write the message and get the result reply.
- writeMessage(pipe);
- readResult(pipe);
-
- // close the connection.
- pipe.close();
-}
Deleted: interpreter/trunk/kernel/client/ClientMessage.hpp
===================================================================
--- interpreter/trunk/kernel/client/ClientMessage.hpp 2006-11-02 15:57:05 UTC (rev 42)
+++ interpreter/trunk/kernel/client/ClientMessage.hpp 2006-11-02 16:18:01 UTC (rev 43)
@@ -1,72 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/* */
-/* Copyright (c) 1995, 2004 IBM Corporation. All rights reserved. */
-/* Copyright (c) 2005-2006 Rexx Language Association. All rights reserved. */
-/* */
-/* This program and the accompanying materials are made available under */
-/* the terms of the Common Public License v1.0 which accompanies this */
-/* distribution. A copy is also available at the following address: */
-/* http://www.ibm.com/developerworks/oss/CPLv1.0.htm */
-/* */
-/* Redistribution and use in source and binary forms, with or */
-/* without modification, are permitted provided that the following */
-/* conditions are met: */
-/* */
-/* Redistributions of source code must retain the above copyright */
-/* notice, this list of conditions and the following disclaimer. */
-/* Redistributions in binary form must reproduce the above copyright */
-/* notice, this list of conditions and the following disclaimer in */
-/* the documentation and/or other materials provided with the distribution. */
-/* */
-/* Neither the name of Rexx Language Association nor the names */
-/* of its contributors may be used to endorse or promote products */
-/* derived from this software without specific prior written permission. */
-/* */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT */
-/* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED */
-/* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, */
-/* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY */
-/* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING */
-/* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS */
-/* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/*----------------------------------------------------------------------------*/
-
-#ifndef ClientMessage_HPP_INCLUDED
-#define ClientMessage_HPP_INCLUDED
-
-#include "oorexx.h"
-#include "ServiceMessage.hpp"
-
-class ClientMessage : public ServiceMessage
-{
-public:
- inline ClientMessage(ServerManager target, ServerOperation op)
- {
- messageTarget = target;
- operation = op;
- }
-
- inline ClientMessage(ServerManager target, ServerOperation op, uintptr_t p1)
- {
- messageTarget = target;
- operation = op;
- parameter1 = p1;
- }
-
- inline ClientMessage(ServerManager target, ServerOperation op, char *p1)
- {
- messageTarget = target;
- operation = op;
- strcpy(nameArg, p1);
- }
-
- void send();
-};
-
-#endif
-
Deleted: interpreter/trunk/kernel/client/Encodings.hpp
===================================================================
--- interpreter/trunk/kernel/client/Encodings.hpp 2006-11-02 15:57:05 UTC (rev 42)
+++ interpreter/trunk/kernel/client/Encodings.hpp 2006-11-02 16:18:01 UTC (rev 43)
@@ -1,51 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/* */
-/* Copyright (c) 1995, 2004 IBM Corporation. All rights reserved. */
-/* Copyright (c) 2005-2006 Rexx Language Association. All rights reserved. */
-/* */
-/* This program and the accompanying materials are made available under */
-/* the terms of the Common Public License v1.0 which accompanies this */
-/* distribution. A copy is also available at the following address: */
-/* http://www.ibm.com/developerworks/oss/CPLv1.0.htm */
-/* */
-/* Redistribution and use in source and binary forms, with or */
-/* without modification, are permitted provided that the following */
-/* conditions are met: */
-/* */
-/* Redistributions of source code must retain the above copyright */
-/* notice, this list of conditions and the following disclaimer. */
-/* Redistributions in binary form must reproduce the above copyright */
-/* notice, this list of conditions and the following disclaimer in */
-/* the documentation and/or other materials provided with the distribution. */
-/* */
-/* Neither the name of Rexx Language Association nor the names */
-/* of its contributors may be used to endorse or promote products */
-/* derived from this software without specific prior written permission. */
-/* */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT */
-/* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED */
-/* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, */
-/* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY */
-/* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING */
-/* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS */
-/* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/*----------------------------------------------------------------------------*/
-
-#ifndef Encodings_HPP_INCLUDED
-#define Encodings_HPP_INCLUDED
-
-enum
-{
- ch_PERIOD = '.',
- ch_QUESTION_MARK = '?',
- ch_EXCLAMATION = '!',
- ch_UNDERSCORE = '_'
-};
-
-#endif
-
Copied: interpreter/trunk/shared/ClientMessage.cpp (from rev 40, interpreter/trunk/kernel/client/ClientMessage.cpp)
===================================================================
--- interpreter/trunk/shared/ClientMessage.cpp (rev 0)
+++ interpreter/trunk/shared/ClientMessage.cpp 2006-11-02 16:18:01 UTC (rev 43)
@@ -0,0 +1,66 @@
+/*----------------------------------------------------------------------------*/
+/* */
+/* Copyright (c) 1995, 2004 IBM Corporation. All rights reserved. */
+/* Copyright (c) 2005-2006 Rexx Language Association. All rights reserved. */
+/* */
+/* This program and the accompanying materials are made available under */
+/* the terms of the Common Public License v1.0 which accompanies this */
+/* distribution. A copy is also available at the following address: */
+/* http://www.ibm.com/developerworks/oss/CPLv1.0.htm */
+/* */
+/* Redistribution and use in source and binary forms, with or */
+/* without modification, are permitted provided that the following */
+/* conditions are met: */
+/* */
+/* Redistributions of source code must retain the above copyright */
+/* notice, this list of conditions and the following disclaimer. */
+/* Redistributions in binary form must reproduce the above copyright */
+/* notice, this list of conditions and the following disclaimer in */
+/* the documentation and/or other materials provided with the distribution. */
+/* */
+/* Neither the name of Rexx Language Association nor the names */
+/* of its contributors may be used to endorse or promote products */
+/* derived from this software without specific prior written permission. */
+/* */
+/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
+/* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
+/* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
+/* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT */
+/* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, */
+/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED */
+/* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, */
+/* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY */
+/* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING */
+/* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS */
+/* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+/* */
+/*----------------------------------------------------------------------------*/
+
+#include "ClientMessage.hpp"
+#include "ServiceException.hpp"
+#include "LocalAPIManager.hpp"
+
+
+/**
+ * Send a message to the rxapi server, and wait for a reply.
+ */
+void ClientMessage::send()
+{
+ session = LocalAPIManager::getInstance()->getSession();
+ LocalAPIManager::getInstance()->getUserID(userid);
+
+ SysClientStream pipe;
+
+ // open the pipe to the connection->
+ if (!pipe.open("localhost", REXX_API_PORT))
+ {
+ throw new ServiceException(SERVER_FAILURE, "ServiceMessage::send() Failure connecting to rxapi server");
+ }
+
+ // write the message and get the result reply.
+ writeMessage(pipe);
+ readResult(pipe);
+
+ // close the connection.
+ pipe.close();
+}
Copied: interpreter/trunk/shared/ClientMessage.hpp (from rev 40, interpreter/trunk/kernel/client/ClientMessage.hpp)
===================================================================
--- interpreter/trunk/shared/ClientMessage.hpp (rev 0)
+++ interpreter/trunk/shared/ClientMessage.hpp 2006-11-02 16:18:01 UTC (rev 43)
@@ -0,0 +1,72 @@
+/*----------------------------------------------------------------------------*/
+/* */
+/* Copyright (c) 1995, 2004 IBM Corporation. All rights reserved. */
+/* Copyright (c) 2005-2006 Rexx Language Association. All rights reserved. */
+/* */
+/* This program and the accompanying materials are made available under */
+/* the terms of the Common Public License v1.0 which accompanies this */
+/* distribution. A copy is also available at the following address: */
+/* http://www.ibm.com/developerworks/oss/CPLv1.0.htm */
+/* */
+/* Redistribution and use in source and binary forms, with or */
+/* without modification, are permitted provided that the following */
+/* conditions are met: */
+/* */
+/* Redistributions of source code must retain the above copyright */
+/* notice, this list of conditions and the following disclaimer. */
+/* Redistributions in binary form must reproduce the above copyright */
+/* notice, this list of conditions and the following disclaimer in */
+/* the documentation and/or other materials provided with the distribution. */
+/* */
+/* Neither the name of Rexx Language Association nor the names */
+/* of its contributors may be used to endorse or promote products */
+/* derived from this software without specific prior written permission. */
+/* */
+/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
+/* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
+/* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
+/* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT */
+/* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, */
+/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED */
+/* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, */
+/* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY */
+/* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING */
+/* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS */
+/* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+/* */
+/*----------------------------------------------------------------------------*/
+
+#ifndef ClientMessage_HPP_INCLUDED
+#define ClientMessage_HPP_INCLUDED
+
+#include "oorexx.h"
+#include "ServiceMessage.hpp"
+
+class ClientMessage : public ServiceMessage
+{
+public:
+ inline ClientMessage(ServerManager target, ServerOperation op)
+ {
+ messageTarget = target;
+ operation = op;
+ }
+
+ inline ClientMessage(ServerManager target, ServerOperation op, uintptr_t p1)
+ {
+ messageTarget = target;
+ operation = op;
+ parameter1 = p1;
+ }
+
+ inline ClientMessage(ServerManager target, ServerOperation op, char *p1)
+ {
+ messageTarget = target;
+ operation = op;
+ strcpy(nameArg, p1);
+ }
+
+ void send();
+};
+
+#endif
+
Copied: interpreter/trunk/shared/Encodings.hpp (from rev 40, interpreter/trunk/kernel/client/Encodings.hpp)
===================================================================
--- interpreter/trunk/shared/Encodings.hpp (rev 0)
+++ interpreter/trunk/shared/Encodings.hpp 2006-11-02 16:18:01 UTC (rev 43)
@@ -0,0 +1,51 @@
+/*----------------------------------------------------------------------------*/
+/* */
+/* Copyright (c) 1995, 2004 IBM Corporation. All rights reserved. */
+/* Copyright (c) 2005-2006 Rexx Language Association. All rights reserved. */
+/* */
+/* This program and the accompanying materials are made available under */
+/* the terms of the Common Public License v1.0 which accompanies this */
+/* distribution. A copy is also available at the following address: */
+/* http://www.ibm.com/developerworks/oss/CPLv1.0.htm */
+/* */
+/* Redistribution and use in source and binary forms, with or */
+/* without modification, are permitted provided that the following */
+/* conditions are met: */
+/* */
+/* Redistributions of source code must retain the above copyright */
+/* notice, this list of conditions and the following disclaimer. */
+/* Redistributions in binary form must reproduce the above copyright */
+/* notice, this list of conditions and the following disclaimer in */
+/* the documentation and/or other materials provided with the distribution. */
+/* */
+/* Neither the name of Rexx Language Association nor the names */
+/* of its contributors may be used to endorse or promote products */
+/* derived from this software without specific prior written permission. */
+/* */
+/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
+/* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
+/* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
+/* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT */
+/* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, */
+/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED */
+/* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, */
+/* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY */
+/* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING */
+/* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS */
+/* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+/* */
+/*----------------------------------------------------------------------------*/
+
+#ifndef Encodings_HPP_INCLUDED
+#define Encodings_HPP_INCLUDED
+
+enum
+{
+ ch_PERIOD = '.',
+ ch_QUESTION_MARK = '?',
+ ch_EXCLAMATION = '!',
+ ch_UNDERSCORE = '_'
+};
+
+#endif
+
Modified: interpreter/trunk/utilities/rxapi/Makefile.am
===================================================================
--- interpreter/trunk/utilities/rxapi/Makefile.am 2006-11-02 15:57:05 UTC (rev 42)
+++ interpreter/trunk/utilities/rxapi/Makefile.am 2006-11-02 16:18:01 UTC (rev 43)
@@ -38,20 +38,12 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = platform
DIST_SUBDIRS = platform
# get version details from our external file
include $(top_srcdir)/oorexx.ver
-INCLUDES = @OOREXX_INCLUDES@ \
- -I$(top_srcdir)/rexxapi \
- -I$(top_srcdir)/rexxapi/api \
- -I$(top_srcdir)/rexxapi/api/platform/unix \
- -I$(top_srcdir)/rexxapi/daemon \
- -I$(top_srcdir)/rexxapi/daemon/platform/unix \
- -I$(top_srcdir)/shared \
- -I$(top_srcdir)/shared/unix
+INCLUDES = @OOREXX_INCLUDES@
#################### rxapi #########################
@@ -61,32 +53,35 @@
#
# Sources for rxapi
#
-rxapi_SOURCES = Encodings.hpp \
- ServiceException.hpp \
- ServiceMessage.cpp \
- ServiceMessage.hpp \
- ../../APIServer.cpp \
- ../../APIServer.hpp \
- ../..APIServerInstance.cpp \
- ../../APIServerInstance.hpp \
- ../../MacroSpaceManager.cpp \
- ../../MacroSpaceManager.hpp \
- ../../QueueManager.cpp \
- ../../QueueManager.hpp \
- ../../RegistrationManager.cpp \
- ../../RegistrationManager.hpp \
- ../../platform/unix/APIService.cpp
+rxapi_SOURCES = $(top_srcdir)/shared/ClientMessage.cpp \
+ $(top_srcdir)/shared/ClientMessage.hpp \
+ $(top_srcdir)/shared/Encodings.hpp \
+ $(top_srcdir)/shared/ServiceException.hpp \
+ $(top_srcdir)/shared/ServiceMessage.cpp \
+ $(top_srcdir)/shared/ServiceMessage.hpp \
+ APIServer.cpp \
+ APIServer.hpp \
+ APIServerInstance.cpp \
+ APIServerInstance.hpp \
+ MacroSpaceManager.cpp \
+ MacroSpaceManager.hpp \
+ QueueManager.cpp \
+ QueueManager.hpp \
+ RegistrationManager.cpp \
+ RegistrationManager.hpp \
+ RexxService.h \
+ platform/unix/APIService.cpp
#
# C++ compiler flags for rxapi sources
#
-rxapi_CXXFLAGS = -DORX_VER=$(MAJOR) -DORX_REL=$(MINOR) \
- -DORX_MOD=$(MOD_LVL)
+rxapi_CXXFLAGS = -DORX_VER=$(MAJOR) -DORX_REL=$(MINOR) -DORX_MOD=$(MOD_LVL) \
+ $(INCLUDES)
#
# additional libraries for rxapi objects
#
-rxapi_LDADD = -lrxshared -lrexxapi @OOREXX_LIBS@
+rxapi_LDADD = -lrexx @OOREXX_LIBS@
#
# linker flags for rxapi objects
Copied: interpreter/trunk/utilities/rxapi/RexxService.h (from rev 40, interpreter/trunk/utilities/rxapi/platform/RexxService.h)
===================================================================
--- interpreter/trunk/utilities/rxapi/RexxService.h (rev 0)
+++ interpreter/trunk/utilities/rxapi/RexxService.h 2006-11-02 16:18:01 UTC (rev 43)
@@ -0,0 +1,55 @@
+/*----------------------------------------------------------------------------*/
+/* */
+/* Copyright (c) 1995, 2004 IBM Corporation. All rights reserved. */
+/* Copyright (c) 2005-2006 Rexx Language Association. All rights reserved. */
+/* */
+/* This program and the accompanying materials are made available under */
+/* the terms of the Common Public License v1.0 which accompanies this */
+/* distribution. A copy is also available at the following address: */
+/* http://www.ibm.com/developerworks/oss/CPLv1.0.htm */
+/* */
+/* Redistribution and use in source and binary forms, with or */
+/* without modification, are permitted provided that the following */
+/* conditions are met: */
+/* */
+/* Redistributions of source code must retain the above copyright */
+/* notice, this list of conditions and the following disclaimer. */
+/* Redistributions in binary form must reproduce the above copyright */
+/* notice, this list of conditions and the following disclaimer in */
+/* the documentation and/or other materials provided with the distribution. */
+/* */
+/* Neither the name of Rexx Language Association nor the names */
+/* of its contributors may be used to endorse or promote products */
+/* derived from this software without specific prior written permission. */
+/* */
+/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
+/* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
+/* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
+/* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT */
+/* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, */
+/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED */
+/* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, */
+/* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY */
+/* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING */
+/* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS */
+/* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+/* */
+/*----------------------------------------------------------------------------*/
+
+
+#ifndef REXXSERVICE_H_INCLUDED
+#define REXXSERVICE_H_INCLUDED
+
+
+#define SERVICENAME "RXAPI"
+#define MAJORVERSION 4
+#define MINORVERSION 0
+#define SUBVERSION 0
+#define SERVICEDESCRIPTION "RXAPI Service for Open Object Rexx version 4.0.0.0"
+
+// This entry is only used by Windows
+#define SERVICE_CONTROL_USER 128
+
+
+#endif
+
Deleted: interpreter/trunk/utilities/rxapi/platform/RexxService.h
===================================================================
--- interpreter/trunk/utilities/rxapi/platform/RexxService.h 2006-11-02 15:57:05 UTC (rev 42)
+++ interpreter/trunk/utilities/rxapi/platform/RexxService.h 2006-11-02 16:18:01 UTC (rev 43)
@@ -1,55 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/* */
-/* Copyright (c) 1995, 2004 IBM Corporation. All rights reserved. */
-/* Copyright (c) 2005-2006 Rexx Language Association. All rights reserved. */
-/* */
-/* This program and the accompanying materials are made available under */
-/* the terms of the Common Public License v1.0 which accompanies this */
-/* distribution. A copy is also available at the following address: */
-/* http://www.ibm.com/developerworks/oss/CPLv1.0.htm */
-/* */
-/* Redistribution and use in source and binary forms, with or */
-/* without modification, are permitted provided that the following */
-/* conditions are met: */
-/* */
-/* Redistributions of source code must retain the above copyright */
-/* notice, this list of conditions and the following disclaimer. */
-/* Redistributions in binary form must reproduce the above copyright */
-/* notice, this list of conditions and the following disclaimer in */
-/* the documentation and/or other materials provided with the distribution. */
-/* */
-/* Neither the name of Rexx Language Association nor the names */
-/* of its contributors may be used to endorse or promote products */
-/* derived from this software without specific prior written permission. */
-/* */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT */
-/* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED */
-/* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, */
-/* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY */
-/* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING */
-/* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS */
-/* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/*----------------------------------------------------------------------------*/
-
-
-#ifndef REXXSERVICE_H_INCLUDED
-#define REXXSERVICE_H_INCLUDED
-
-
-#define SERVICENAME "RXAPI"
-#define MAJORVERSION 4
-#define MINORVERSION 0
-#define SUBVERSION 0
-#define SERVICEDESCRIPTION "RXAPI Service for Open Object Rexx version 4.0.0.0"
-
-// This entry is only used by Windows
-#define SERVICE_CONTROL_USER 128
-
-
-#endif
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|