You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pi...@apache.org on 2001/08/06 04:47:21 UTC
cvs commit: jakarta-tomcat-connectors/webapp/lib .cvsignore pr_warp.h
pier 01/08/05 19:47:21
Modified: webapp Makefile.in configure.in
webapp/lib .cvsignore pr_warp.h
Log:
Now WARP packet type signatures are held only in the Java source, and
are "copied over" to the C part during the execution of "configure"
Revision Changes Path
1.14 +2 -1 jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.in 2001/07/18 18:45:05 1.13
+++ Makefile.in 2001/08/06 02:47:21 1.14
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <ma...@eng.sun.com>
-# @version $Id: Makefile.in,v 1.13 2001/07/18 18:45:05 pier Exp $
+# @version $Id: Makefile.in,v 1.14 2001/08/06 02:47:21 pier Exp $
include @SRCDIR@/Makedefs
@@ -64,6 +64,7 @@
APRDIR = @APRDIR@
CFGS = @CONFIGFILES@ \
+ ./lib/pr_warp_defs.h \
config.cache \
config.log \
config.status
1.19 +14 -1 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure.in 2001/07/18 18:31:29 1.18
+++ configure.in 2001/08/06 02:47:21 1.19
@@ -58,7 +58,7 @@
dnl --------------------------------------------------------------------------
dnl Author Pier Fumagalli <ma...@eng.sun.com>
dnl Author Jon S. Stevens <ma...@latchkey.com>
-dnl Version $Id: configure.in,v 1.18 2001/07/18 18:31:29 pier Exp $
+dnl Version $Id: configure.in,v 1.19 2001/08/06 02:47:21 pier Exp $
dnl --------------------------------------------------------------------------
dnl --------------------------------------------------------------------------
@@ -68,6 +68,9 @@
AC_PATH_PROG(test,test,${PATH})
AC_PATH_PROG(true,true,${PATH})
AC_PATH_PROG(echo,echo,${PATH})
+ AC_PATH_PROG(grep,grep,${PATH})
+ AC_PATH_PROG(cat,cat,${PATH})
+ AC_PATH_PROG(sed,sed,${PATH})
AC_PATH_PROG(rm,rm,${PATH})
])
@@ -307,9 +310,19 @@
TGTDIRS="${TGTDIRS} ${SRCDIR}/lib"
AC_SUBST(TGTDIRS)
+dnl --------------------------------------------------------------------------
+dnl Output files
+dnl --------------------------------------------------------------------------
CONFIGFILES="./Makedefs ./Makefile ./lib/Makefile ./java/Makefile"
CONFIGFILES="$CONFIGFILES ./java/Constants.java ${makefile}"
AC_SUBST(CONFIGFILES)
+
+AC_MSG_RESULT([creating ./lib/pr_warp_defs.h])
+${cat} ./java/Constants.java.in | \
+ ${grep} "TYPE_" | \
+ ${sed} s/public\ static\ final\ int/\#define/g | \
+ ${sed} s/\=/\ /g | \
+ ${sed} s/\;/\ /g > ./lib/pr_warp_defs.h
AC_OUTPUT(${CONFIGFILES})
1.6 +1 -0 jakarta-tomcat-connectors/webapp/lib/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 2001/07/18 19:08:35 1.5
+++ .cvsignore 2001/08/06 02:47:21 1.6
@@ -9,6 +9,7 @@
pr_warp.o
pr_warp_config.lo
pr_warp_config.o
+pr_warp_defs.h
pr_warp_network.lo
pr_warp_network.o
pr_warp_packet.lo
1.7 +2 -32 jakarta-tomcat-connectors/webapp/lib/pr_warp.h
Index: pr_warp.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/pr_warp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pr_warp.h 2001/07/25 22:32:05 1.6
+++ pr_warp.h 2001/08/06 02:47:21 1.7
@@ -54,7 +54,7 @@
* *
* ========================================================================= */
-/* @version $Id: pr_warp.h,v 1.6 2001/07/25 22:32:05 pier Exp $ */
+/* @version $Id: pr_warp.h,v 1.7 2001/08/06 02:47:21 pier Exp $ */
#ifndef _PR_WARP_H_
#define _PR_WARP_H_
@@ -104,37 +104,7 @@
/* WARP definitions */
#define VERS_MAJOR 0
#define VERS_MINOR 9
-
-#define TYPE_INVALID -1
-#define TYPE_ERROR 0x00
-#define TYPE_DISCONNECT 0xfe
-#define TYPE_FATAL 0xff
-
-#define TYPE_CONF_WELCOME 0x01
-#define TYPE_CONF_DEPLOY 0x02
-#define TYPE_CONF_APPLIC 0x03
-#define TYPE_CONF_DONE 0x04
-#define TYPE_CONF_PROCEED 0x05
-
-#define TYPE_REQ_INIT 0x10
-#define TYPE_REQ_CONTENT 0x11
-#define TYPE_REQ_SCHEME 0x12
-#define TYPE_REQ_AUTH 0x13
-#define TYPE_REQ_HEADER 0x14
-#define TYPE_REQ_SERVER 0x15
-#define TYPE_REQ_CLIENT 0x16
-#define TYPE_REQ_PROCEED 0x1f
-
-#define TYPE_RES_STATUS 0x20
-#define TYPE_RES_HEADER 0x21
-#define TYPE_RES_COMMIT 0x2f
-#define TYPE_RES_BODY 0x30
-#define TYPE_RES_DONE 0x3f
-
-#define TYPE_CBK_READ 0x40
-#define TYPE_CBK_DATA 0x41
-#define TYPE_CBK_DONE 0x42
-
+#include "pr_warp_defs.h"
/* ************************************************************************* */
/* PACKET FUNCTIONS FROM PR_WARP_PACKET.C */