cvs commit: jakarta-tomcat-connectors/jk/native/common jk_connect.c
fuankg 2005/05/13 01:23:11 Modified:jk/native/common jk_connect.c Log: fix for NetWare compiler to deal with different types between AP13 and AP2 SDKs. Revision ChangesPath 1.59 +17 -6 jakarta-tomcat-connectors/jk/native/common/jk_connect.c Index: jk_connect.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- jk_connect.c 27 Apr 2005 18:38:52 - 1.58 +++ jk_connect.c 13 May 2005 08:23:11 - 1.59 @@ -45,6 +45,13 @@ #define JK_GET_SOCKET_ERRNO() ((void)0) #endif /* WIN32 */ +/* our compiler cant deal with char* <-> const char* ... */ +#if defined(NETWARE) && !defined(__NOVELL_LIBC__) +typedef char* SET_TYPE; +#else +typedef const char* SET_TYPE; +#endif + static int soblock(int sd) { /* BeOS uses setsockopt at present for non blocking... */ @@ -263,7 +270,11 @@ /* XXX : WARNING : We should really use gethostbyname_r in multi-threaded env */ /* Fortunatly when APR is available, ie under Apache 2.0, we use it */ +#if defined(NETWARE) && !defined(__NOVELL_LIBC__) +struct hostent *hoste = gethostbyname((char*)host); +#else struct hostent *hoste = gethostbyname(host); +#endif if (!hoste) { return JK_FALSE; } @@ -305,7 +316,7 @@ return -1; } /* Disable Nagle algorithm */ -if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (const char *)&set, +if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (SET_TYPE)&set, sizeof(set))) { jk_log(l, JK_LOG_ERROR, "failed setting TCP_NODELAY with errno=%d", errno); @@ -318,7 +329,7 @@ "socket TCP_NODELAY set to On"); if (keepalive) { set = 1; -if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (const char *)&set, +if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (SET_TYPE)&set, sizeof(set))) { jk_log(l, JK_LOG_ERROR, "failed setting SO_KEEPALIVE with errno=%d", errno); @@ -334,7 +345,7 @@ if (sock_buf > 0) { set = sock_buf; /* Set socket send buffer size */ -if (setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (const char *)&set, +if (setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (SET_TYPE)&set, sizeof(set))) { JK_GET_SOCKET_ERRNO(); jk_log(l, JK_LOG_ERROR, @@ -345,7 +356,7 @@ } set = sock_buf; /* Set socket receive buffer size */ -if (setsockopt(sock, SOL_SOCKET, SO_RCVBUF, (const char *)&set, +if (setsockopt(sock, SOL_SOCKET, SO_RCVBUF, (SET_TYPE)&set, sizeof(set))) { JK_GET_SOCKET_ERRNO(); jk_log(l, JK_LOG_ERROR, @@ -400,7 +411,7 @@ #ifdef SO_LINGER /* Make hard closesocket by disabling lingering */ li.l_linger = li.l_onoff = 0; -if (setsockopt(sock, SOL_SOCKET, SO_LINGER, (const char *)&li, +if (setsockopt(sock, SOL_SOCKET, SO_LINGER, (SET_TYPE)&li, sizeof(li))) { JK_GET_SOCKET_ERRNO(); jk_log(l, JK_LOG_ERROR, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/netscape Makefile.netware
fuankg 2005/03/31 18:58:41 Modified:jk/native/netscape Makefile.netware Log: added new files. Revision ChangesPath 1.5 +3 -1 jakarta-tomcat-connectors/jk/native/netscape/Makefile.netware Index: Makefile.netware === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/Makefile.netware,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.netware 28 Jul 2004 14:24:48 - 1.4 +++ Makefile.netware 1 Apr 2005 02:58:41 - 1.5 @@ -20,7 +20,7 @@ # Edit the vars below to change NLM target settings. TARGET = nsapi_rd VERSION = $(JK_VERSION) -COPYR= Copyright (c) 2000-2004 The Apache Software Foundation. All rights reserved. +COPYR= Copyright (c) 2000-2005 The Apache Software Foundation. All rights reserved. DESCR= Netscape plugin for Jakarta/Tomcat $(JK_VERSION_STR) MTSAFE = NO STACK= 64000 @@ -139,7 +139,9 @@ $(OBJDIR)/jk_md5.o \ $(OBJDIR)/jk_msg_buff.o \ $(OBJDIR)/jk_pool.o \ + $(OBJDIR)/jk_shm.o \ $(OBJDIR)/jk_sockbuf.o \ + $(OBJDIR)/jk_status.o \ $(OBJDIR)/jk_uri_worker_map.o \ $(OBJDIR)/jk_util.o \ $(OBJDIR)/jk_worker.o \ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c
fuankg 2005/02/13 14:32:58 Modified:jk/native/common jk_status.c Log: removed obsolete empty lines since they break CodeWarrior compiler. Revision ChangesPath 1.3 +2 -7 jakarta-tomcat-connectors/jk/native/common/jk_status.c Index: jk_status.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jk_status.c 13 Feb 2005 12:22:31 - 1.2 +++ jk_status.c 13 Feb 2005 22:32:58 - 1.3 @@ -29,14 +29,9 @@ #define HUGE_BUFFER_SIZE (8*1024) -#define JK_STATUS_HEAD "\n" \ - "JK Status Manager\n" \ - "\n" - +#define JK_STATUS_HEAD "\n" \ "JK Status Manager\n" \ "\n" #define JK_STATUS_HEND "\n\n" - typedef struct status_worker status_worker_t; struct status_endpoint - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 Makefile.netware NWGNUmakefile.mak
fuankg 2005/02/13 14:28:07 Modified:jk/native/apache-1.3 Makefile.netware NWGNUmakefile.mak Log: fixed var names. Revision ChangesPath 1.6 +6 -6 jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware Index: Makefile.netware === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile.netware 6 Feb 2005 17:43:09 - 1.5 +++ Makefile.netware 13 Feb 2005 22:28:07 - 1.6 @@ -1,21 +1,21 @@ # # Makefile for mod_jk (NetWare version - gnu make) -# created by Guenter Knauf <[EMAIL PROTECTED]> +# created by Guenter Knauf <[EMAIL PROTECTED]> # # Edit the path below to point to the base of your Apache 1.3 includes. ifndef AP_HOME -AP_HOME = c:/projects/cw/apache_1.3.31 +AP_HOME = c:/projects/cw/apache_1.3.33 endif # Edit the path below to point to the base of your NetWare Java SDK. -ifndef NW_JDK -NW_JDK = c:/projects/sdks/java-nw +ifndef JAVA_HOME +JAVA_HOME= c:/projects/sdks/java-nw endif # Edit the path below to point to the base of your Novell NDK. ifndef NDKBASE NDKBASE = c:/novell endif -INSTDIR = s:/apache/modules +INSTDIR = s:/apache/modules # Edit the vars below to change NLM target settings. TARGET = mod_jk @@ -103,7 +103,7 @@ JKCOMMON = ../common INCLUDES = -I$(AP_HOME)/src/include -I$(AP_HOME)/src/os/netware -INCLUDES += -I$(JKCOMMON) -I$(NW_JDK)/include -I$(NW_JDK)/include/netware +INCLUDES += -I$(JKCOMMON) -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/netware ifeq ($(LIBARCH),LIBC) INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks 1.2 +4 -4 jakarta-tomcat-connectors/jk/native/apache-1.3/NWGNUmakefile.mak Index: NWGNUmakefile.mak === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/NWGNUmakefile.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NWGNUmakefile.mak 13 Feb 2005 22:15:15 - 1.1 +++ NWGNUmakefile.mak 13 Feb 2005 22:28:07 - 1.2 @@ -8,8 +8,8 @@ # # Edit the path below to point to the base of your NetWare Java SDK. -ifndef NW_JDK -NW_JDK = d:/projects/sdks/java-nw +ifndef JAVA_HOME +JAVA_HOME = c:/projects/sdks/java-nw endif JKCOMMON = ../common @@ -29,8 +29,8 @@ # XINCDIRS += \ $(JKCOMMON) \ - $(NW_JDK)/include \ - $(NW_JDK)/include/netware \ + $(JAVA_HOME)/include \ + $(JAVA_HOME)/include/netware \ $(SRC)\include \ $(NWOS) \ $(EOLIST) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 NWGNUmakefile NWGNUmakefile.mak
fuankg 2005/02/13 14:15:15 Added: jk/native/apache-1.3 NWGNUmakefile NWGNUmakefile.mak Log: added new Apache 1.3.x NetWare build system makefiles. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native/apache-1.3/NWGNUmakefile Index: NWGNUmakefile === # # Declare the sub-directories to be built here # SUBDIRS = \ $(EOLIST) # # Get the 'head' of the build environment. This includes default targets and # paths to tools # include $(AP_WORK)\NWGNUhead.inc # # build this level's files ifeq "$(wildcard NWGNUmakefile.mak)" "NWGNUmakefile.mak" include NWGNUmakefile.mak endif # # You can use this target if all that is needed is to copy files to the # installation area # install :: nlms FORCE 1.1 jakarta-tomcat-connectors/jk/native/apache-1.3/NWGNUmakefile.mak Index: NWGNUmakefile.mak === # # Makefile for mod_jk (NetWare version - gnu make) # created by Guenter Knauf <[EMAIL PROTECTED]> # # # Make sure all needed macro's are defined # # Edit the path below to point to the base of your NetWare Java SDK. ifndef NW_JDK NW_JDK= d:/projects/sdks/java-nw endif JKCOMMON = ../common # # Get the 'head' of the build environment if necessary. This includes default # targets and paths to tools # ifndef EnvironmentDefined include $(AP_WORK)\NWGNUhead.inc endif # # These directories will be at the beginning of the include list, followed by # INCDIRS # XINCDIRS += \ $(JKCOMMON) \ $(NW_JDK)/include \ $(NW_JDK)/include/netware \ $(SRC)\include \ $(NWOS) \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ $(EOLIST) # # These defines will come after DEFINES # XDEFINES += \ $(EOLIST) # # These flags will be added to the link.opt file # XLFLAGS += \ $(EOLIST) # # These values will be appended to the correct variables based on the value of # RELEASE # ifeq "$(RELEASE)" "debug" XINCDIRS += \ $(EOLIST) XCFLAGS += \ $(EOLIST) XDEFINES += \ $(EOLIST) XLFLAGS += \ $(EOLIST) endif ifeq "$(RELEASE)" "noopt" XINCDIRS += \ $(EOLIST) XCFLAGS += \ $(EOLIST) XDEFINES += \ $(EOLIST) XLFLAGS += \ $(EOLIST) endif ifeq "$(RELEASE)" "release" XINCDIRS += \ $(EOLIST) XCFLAGS += \ $(EOLIST) XDEFINES += \ $(EOLIST) XLFLAGS += \ $(EOLIST) endif # # These are used by the link target if an NLM is being generated # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # NLM_NAME = mod_jk # # This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(AP_VERSION_STR) plugin for Jakarta/Tomcat $(JK_VERSION_STR) # # This is used by the '-threadname' directive. If left blank, # NLM_NAME Thread will be used. # NLM_THREAD_NAME = JK Module # # If this is specified, it will override VERSION value in # $(AP_WORK)\NWGNUenvironment.inc # NLM_VERSION = $(JK_VERSION) # # If this is specified, it will override the default of 64K # NLM_STACK_SIZE= 49152 # # If this is specified it will be used by the link '-entry' directive # NLM_ENTRY_SYM = _lib_start #NLM_ENTRY_SYM= _lib_start_ws # # If this is specified it will be used by the link '-exit' directive # NLM_EXIT_SYM = _lib_stop #NLM_EXIT_SYM = _lib_stop_ws # # If this is specified it will be used by the link '-flags' directive # NLM_FLAGS = # # Declare all target files (you must add your files here) # # # If there is an NLM target, put it here # TARGET_nlm = \ $(OBJDIR)/$(NLM_NAME).nlm \ $(EOLIST) # # If there is an LIB target, put it here # TARGET_lib = \ $(EOLIST) # # These are the OBJ fi
cvs commit: jakarta-tomcat-connectors/jk/native STATUS.txt
fuankg 2005/01/15 18:07:47 Modified:jk/native STATUS.txt Log: update with recent release. Revision ChangesPath 1.4 +4 -2 jakarta-tomcat-connectors/jk/native/STATUS.txt Index: STATUS.txt === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/STATUS.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- STATUS.txt23 Jul 2004 09:23:38 - 1.3 +++ STATUS.txt16 Jan 2005 02:07:47 - 1.4 @@ -3,7 +3,9 @@ Release: -1.2.7 : in progress +1.2.9 : in progress +1.2.8 : released Dezember 24, 2004 +1.2.7 : not released 1.2.6 : released July 23, 2004 1.2.5 : released September 30, 2003 1.2.4 : released May 27, 2003 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_mt.h
fuankg 2005/01/12 07:25:51 Modified:jk/native/common jk_mt.h Log: fix to make Apache 1.3 module and NS plugins for NetWare compile again. Revision ChangesPath 1.13 +4 -2 jakarta-tomcat-connectors/jk/native/common/jk_mt.h Index: jk_mt.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_mt.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- jk_mt.h 24 Dec 2004 08:04:29 - 1.12 +++ jk_mt.h 12 Jan 2005 15:25:51 - 1.13 @@ -28,6 +28,8 @@ #if defined(WIN32) #define jk_gettid()((int)GetCurrentThreadId()) +#elif defined(NETWARE) && !defined(__NOVELL_LIBC__) +#define getpid() ((int)GetThreadGroupID()) #endif @@ -35,7 +37,7 @@ * All WIN32 code is MT, UNIX code that uses pthreads is marked by the POSIX * _REENTRANT define. */ -#if defined (WIN32) || defined(_REENTRANT) || defined(NETWARE) +#if defined (WIN32) || defined(_REENTRANT) || (defined(NETWARE) && defined(__NOVELL_LIBC__)) /* * Marks execution under MT compilation - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/ajp/ajplib/test ajp.h testajp.c
fuankg 2004/07/30 12:57:47 Modified:ajp/ajplib/test ajp.h testajp.c Log: introduce default host and port. Revision ChangesPath 1.20 +7 -0 jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h Index: ajp.h === RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ajp.h 30 Jul 2004 18:01:11 - 1.19 +++ ajp.h 30 Jul 2004 19:57:47 - 1.20 @@ -40,6 +40,13 @@ #include #endif +#define AJP13_DEF_HOST "127.0.0.1" +#ifdef NETWARE +#define AJP13_DEF_PORT 9009 /* default to 9009 since 8009 is used by OS */ +#else +#define AJP13_DEF_PORT 8009 +#endif + #if APR_CHARSET_EBCDIC #define USE_CHARSET_EBCDIC 1.11 +1 -1 jakarta-tomcat-connectors/ajp/ajplib/test/testajp.c Index: testajp.c === RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/testajp.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- testajp.c 30 Jul 2004 19:18:59 - 1.10 +++ testajp.c 30 Jul 2004 19:57:47 - 1.11 @@ -208,7 +208,7 @@ */ /* 1. Obtain a connection to backend*/ -if ((rc = connect_to_backend(&sock, &con, "127.0.0.1", 8009, +if ((rc = connect_to_backend(&sock, &con, AJP13_DEF_HOST, AJP13_DEF_PORT, main_server, r->pool)) != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, rc, NULL, "connect_to_backend"); rv = -1; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/ajp/ajplib/test Makefile.netware
fuankg 2004/07/30 10:06:28 Added: ajp/ajplib/test Makefile.netware Log: Initial check-in so we can play on NetWare too. Revision ChangesPath 1.1 jakarta-tomcat-connectors/ajp/ajplib/test/Makefile.netware Index: Makefile.netware === # # Makefile for ajplib (NetWare version - gnu make) # created by Guenter Knauf <[EMAIL PROTECTED]> # # Edit the path below to point to the base of your Apache 2.x includes. ifndef AP_HOME AP_HOME = c:/projects/gccnlm/apache_2.0.50-sdk endif # Edit the path below to point to the base of your NetWare Java SDK. ifndef NW_JDK NW_JDK= c:/projects/sdks/java-nw endif # Edit the path below to point to the base of your Novell NDK. ifndef NDKBASE NDKBASE = c:/novell endif ifndef INSTDIR INSTDIR = ../dist-$(AJP_VERSION_STR)-bin-nw endif # Edit the vars below to change NLM target settings. TARGETS = testajp.nlm LTARGET = libajp.lib VERSION = $(AJP_VERSION) COPYR = Copyright (c) 2000-2004 The Apache Software Foundation. All rights reserved. DESCR = AJP lib for Jakarta/Tomcat $(AJP_VERSION_STR) MTSAFE= YES STACK = 64000 #SCREEN = none MODULES = aprlib #EXPORTS = # Comment the line below if you dont want to load protected automatically. LDRING= 3 # Edit the var below to point to your lib architecture. ifndef LIBARCH LIBARCH = LIBC endif NW_WINSOCK = 1 # must be equal to DEBUG or NDEBUG DB= NDEBUG # DB = DEBUG # DB = CURLDEBUG # Optimization: -O or debugging: -g ifeq ($(DB),NDEBUG) OPT = -O2 OBJDIR = release else OPT = -g OBJDIR = debug endif # Include the version info retrieved from ajp.h #-include $(OBJDIR)/version.inc AJP_VERSION = 1,0,0 AJP_VERSION_STR = 1.0.0-dev-beta # Check if we are on Linux in order to set the echo delimiter if needed. ifeq ($(findstring linux,$(OSTYPE)),linux) DL= ' #-include $(NDKBASE)/nlmconv/ncpfs.inc endif # The following line defines your compiler. ifdef METROWERKS CC = mwccnlm else CC = gcc endif YACC = bison -y CP= cp -afv # RM = rm -f # if you want to mark the target as MTSAFE you will need a tool for # generating the xdc data for the linker; here's a minimal tool: # http://www.gknw.com/development/prgtools/mkxdc.zip MPKXDC= mkxdc # Global flags for all compilers CFLAGS= $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc CFLAGS+= -DAJP_USE_HTTPD_WRAP ifeq ($(CC),mwccnlm) LD= mwldnlm LDFLAGS = -nostdlib $(PRELUDE) $(OBJS) $(OBJWRAP) $(<:.def=.o) -o $@ -commandfile AR= mwldnlm ARFLAGS = -type library -w nocmdline $(OBJDIR)/*.o -o CFLAGS+= -msgstyle gcc -gccinc -inline off -opt nointrinsics -proc 586 CFLAGS+= -relax_pointers CFLAGS+= -w on,nounused ifeq ($(LIBARCH),LIBC) PRELUDE = $(SDK_LIBC)/imports/libcpre.o CFLAGS += -align 4 else PRELUDE = "$(METROWERKS)/Novell Support/libraries/runtime/prelude.obj" # CFLAGS += -include "$(METROWERKS)/Novell Support/headers/nlm_prefix.h" CFLAGS += -align 1 endif else LD= nlmconv LDFLAGS = -T AR= ar ARFLAGS = -cq CFLAGS+= -fno-builtin -fpack-struct -fpcc-struct-return CFLAGS+= -Wall -Wno-format # -pedantic ifeq ($(LIBARCH),LIBC) PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o else PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h endif endif NDK_ROOT = $(NDKBASE)/ndk SDK_CLIB = $(NDK_ROOT)/nwsdk SDK_LIBC = $(NDK_ROOT)/libc INCLUDES += -I$(AP_HOME)/include ifeq ($(LIBARCH),LIBC) INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks INCLUDES += -I$(SDK_LIBC)/include/winsock CFLAGS += -D_POSIX_SOURCE # CFLAGS += -D__ANSIC__ else INCLUDES += -I$(SDK_CLIB)/include/nlm -I$(SDK_CLIB)/include # INCLUDES += -I$(SDK_CLIB)/include/nlm/obsolete CFLAGS += -DNETDB_USE_INTERNET endif CFLAGS+= -I. $(INCLUDES) ifeq ($(MTSAFE),YES) XDCOPT = -n endif ifeq ($(MTSAFE),NO) XDCOPT = -u endif OBJS = \ $(OBJDIR)/ajp_header.o \ $(OBJDIR)/ajp_link.o \ $(OBJDIR)/ajp_msg.o OBJWRAP = $(OBJDIR)/httpd_wrap.o .PHONY: lib nlm prebuild dist install clean nlm: prebuild $(TARGETS) lib: prebuild $(LTARGET) prebuild: $(OBJDIR) $(OBJDIR)/version.inc config.h dist: all -$(RM) $(OBJS) $(OBJDIR)/*.map $(OBJDIR)/*.ncv -$(RM) $(OBJDIR)/*.def $(OBJDIR)/*.xdc $(OBJDIR)/version.inc install: $(INSTDIR) all @$(CP) *.nlm $(INSTDIR) @$(CP) ../CHANGES $(INSTD
cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 Makefile.netware
fuankg 2004/07/28 07:35:46 Modified:jk/native/apache-1.3 Makefile.netware Log: few minor Makefile tweaks. Revision ChangesPath 1.4 +14 -11jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware Index: Makefile.netware === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.netware 16 Mar 2004 12:58:37 - 1.3 +++ Makefile.netware 28 Jul 2004 14:35:46 - 1.4 @@ -4,14 +4,17 @@ # # Edit the path below to point to the base of your Apache 1.3 includes. -#AP_HOME = c:/projects/cw/apache-1.3 -AP_HOME = c:/projects/cw/apache_1.3.29 - +ifndef AP_HOME +AP_HOME = c:/projects/cw/apache_1.3.31 +endif # Edit the path below to point to the base of your NetWare Java SDK. -JDK = c:/projects/sdks/java-nw - +ifndef NW_JDK +NW_JDK = c:/projects/sdks/java-nw +endif # Edit the path below to point to the base of your Novell NDK. -BASE = c:/novell +ifndef NDKBASE +NDKBASE = c:/novell +endif INSTDIR = s:/apache/modules # Edit the vars below to change NLM target settings. @@ -84,7 +87,7 @@ #CFLAGS += -D__ANSIC__ else #PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o - CFLAGS += -include $(BASE)/nlmconv/genlm.h + CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h endif endif CFLAGS += -include "precomp.h" @@ -94,20 +97,20 @@ endif -NDK_ROOT = $(BASE)/ndk +NDK_ROOT = $(NDKBASE)/ndk SDK_CLIB = $(NDK_ROOT)/nwsdk SDK_LIBC = $(NDK_ROOT)/libc JKCOMMON = ../common INCLUDES = -I$(AP_HOME)/src/include -I$(AP_HOME)/src/os/netware -INCLUDES += -I$(JKCOMMON) -I$(JDK)/include -I$(JDK)/include/netware +INCLUDES += -I$(JKCOMMON) -I$(NW_JDK)/include -I$(NW_JDK)/include/netware ifeq ($(LIBARCH),LIBC) INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks INCLUDES += -I$(SDK_LIBC)/include/winsock else INCLUDES += -I$(SDK_CLIB)/include/nlm -I$(SDK_CLIB)/include - INCLUDES += -I$(BASE)/ws295sdk/include + INCLUDES += -I$(NDKBASE)/ws295sdk/include CFLAGS += -DNETDB_USE_INTERNET endif CFLAGS += $(INCLUDES) @@ -118,7 +121,7 @@ ifeq ($(OSTYPE),linux) DL = ' --include $(BASE)/nlmconv/ncpfs.inc +-include $(NDKBASE)/nlmconv/ncpfs.inc endif OBJS = \ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/netscape Makefile.netware
fuankg 2004/07/28 07:24:48 Modified:jk/native/jni Makefile.netware jk/native/netscape Makefile.netware Log: few minor Makefile tweaks. Revision ChangesPath 1.4 +14 -11jakarta-tomcat-connectors/jk/native/jni/Makefile.netware Index: Makefile.netware === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/jni/Makefile.netware,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.netware 16 Mar 2004 12:58:37 - 1.3 +++ Makefile.netware 28 Jul 2004 14:24:48 - 1.4 @@ -4,14 +4,17 @@ # # Edit the path below to point to the base of your Netscape includes. +ifndef NS_HOME NS_HOME = c:/projects/sdks/netscape - +endif # Edit the path below to point to the base of your NetWare Java SDK. -JDK = c:/projects/sdks/java-nw - +ifndef NW_JDK +NW_JDK = c:/projects/sdks/java-nw +endif # Edit the path below to point to the base of your Novell NDK. -# BASE = /usr/prg/nlm -BASE = c:/novell +ifndef NDKBASE +NDKBASE = c:/novell +endif INSTDIR = /mnt/sys/novonyx/modules # Edit the vars below to change NLM target settings. @@ -64,7 +67,7 @@ # CP = cp -fv # if you want to mark the target as MTSAFE you will need a tool for # generating the xdc data for the linker; here's a minimal tool: -# http://www.gknw.de/development/prgtools/mkxdc.zip +# http://www.gknw.com/development/prgtools/mkxdc.zip MPKXDC = mkxdc # Global flags for all compilers @@ -94,19 +97,19 @@ #CFLAGS += -D__ANSIC__ else PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o - CFLAGS += -include $(BASE)/nlmconv/genlm.h + CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h endif endif LDLIBS = -NDK_ROOT = $(BASE)/ndk +NDK_ROOT = $(NDKBASE)/ndk SDK_CLIB = $(NDK_ROOT)/nwsdk SDK_LIBC = $(NDK_ROOT)/libc JKCOMMON = ../common INCLUDES = -I$(NS_HOME)/include -I$(NS_HOME)/include/base -INCLUDES += -I$(JKCOMMON) -I$(JDK)/include -I$(JDK)/include/netware +INCLUDES += -I$(JKCOMMON) -I$(NW_JDK)/include -I$(NW_JDK)/include/netware ifeq ($(LIBARCH),LIBC) INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks @@ -122,9 +125,9 @@ XDCDATA = $(OBJDIR)/$(TARGET).xdc endif -ifeq ($(OSTYPE),linux) +ifeq ($(findstring linux,$(OSTYPE)),linux) DL = ' --include $(BASE)/nlmconv/ncpfs.inc +#-include $(NDKBASE)/nlmconv/ncpfs.inc endif OBJS = \ 1.4 +13 -10jakarta-tomcat-connectors/jk/native/netscape/Makefile.netware Index: Makefile.netware === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/Makefile.netware,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.netware 16 Mar 2004 12:58:37 - 1.3 +++ Makefile.netware 28 Jul 2004 14:24:48 - 1.4 @@ -4,14 +4,17 @@ # # Edit the path below to point to the base of your Netscape includes. +ifndef NS_HOME NS_HOME = c:/projects/sdks/netscape - +endif # Edit the path below to point to the base of your NetWare Java SDK. -JDK = c:/projects/sdks/java-nw - +ifndef NW_JDK +NW_JDK = c:/projects/sdks/java-nw +endif # Edit the path below to point to the base of your Novell NDK. -# BASE = /usr/prg/nlm -BASE = c:/novell +ifndef NDKBASE +NDKBASE = c:/novell +endif INSTDIR = /mnt/sys/novonyx/modules # Edit the vars below to change NLM target settings. @@ -87,19 +90,19 @@ #CFLAGS += -D__ANSIC__ else PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o - CFLAGS += -include $(BASE)/nlmconv/genlm.h + CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h endif endif LDLIBS = -NDK_ROOT = $(BASE)/ndk +NDK_ROOT = $(NDKBASE)/ndk SDK_CLIB = $(NDK_ROOT)/nwsdk SDK_LIBC = $(NDK_ROOT)/libc JKCOMMON = ../common INCLUDES = -I$(NS_HOME)/include -I$(NS_HOME)/include/base -INCLUDES += -I$(JKCOMMON) -I$(JDK)/include -I$(JDK)/include/netware +INCLUDES += -I$(JKCOMMON) -I$(NW_JDK)/include -I$(NW_JDK)/include/netware ifeq ($(LIBARCH),LIBC) INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks @@ -115,9 +118,9 @@ XDCDATA = $(OBJDIR)/$(TARGET).xdc endif -ifeq ($(OSTYPE),linux) +ifeq ($(findstring linux,$(OSTYPE)),linux) DL = ' --include $(BASE)/nlmconv/ncpfs.inc +#-include $(NDKBASE)/nlmconv/ncpfs.inc endif OBJS = \ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_global.h
fuankg 2004/07/22 11:23:46 Modified:jk/native/common jk_global.h Log: post 1.2.6 fix since NetWare doesnt have portable.h (no autoconf here). the jk 1.2.6 NetWare binaries will be generated with this patch. Revision ChangesPath 1.33 +5 -1 jakarta-tomcat-connectors/jk/native/common/jk_global.h Index: jk_global.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- jk_global.h 22 Jul 2004 16:31:06 - 1.32 +++ jk_global.h 22 Jul 2004 18:23:46 - 1.33 @@ -24,12 +24,14 @@ #ifndef JK_GLOBAL_H #define JK_GLOBAL_H +#ifndef NETWARE #if !defined(WIN32) && !defined(AS400) #include "portable.h" #else #define HAVE_VSNPRINTF #define HAVE_SNPRINTF #endif +#endif #include "jk_version.h" @@ -66,6 +68,8 @@ #define __sys_socket_h__ #define __netdb_h__ #define __netinet_in_h__ +#define HAVE_VSNPRINTF +#define HAVE_SNPRINTF #endif #include #include - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native STATUS.txt
fuankg 2004/06/02 14:38:08 Added: jk/native STATUS.txt Log: added STATUS file for native. Please correct if someone knows the exact release dates; I grabbed the dates from the latest file date inside the archives Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native/STATUS.txt Index: STATUS.txt === JAKARTA TOMCAT CONNECTORS (JK) STATUS:-*-text-*- Last modified at [$Date: 2004/06/02 21:38:08 $] Release: 1.2.6 : in progress 1.2.5 : released September 30, 2003 1.2.4 : released May 27, 2003 1.2.3 : released May 16, 2003 1.2.2 : released Dezember 17, 2002 RELEASE SHOWSTOPPERS: RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: STUFF FOR THE FUTURE: * enter mature phase ... ? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 STATUS.txt
fuankg 2004/06/02 09:01:59 Modified:jk/native2 STATUS.txt Log: update to recent status. Revision ChangesPath 1.5 +3 -2 jakarta-tomcat-connectors/jk/native2/STATUS.txt Index: STATUS.txt === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/STATUS.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- STATUS.txt2 Feb 2004 20:12:07 - 1.4 +++ STATUS.txt2 Jun 2004 16:01:59 - 1.5 @@ -3,7 +3,8 @@ Release: -2.0.4 : in progress +2.0.5 : in progress +2.0.4 : released March 29, 2004 2.0.3 : not released 2.0.2 : released November 27, 2002 2.0.1 : released October 6, 2002 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 NWGNUmakefile
fuankg 2004/04/09 13:00:18 Modified:jk/native2/server/apache2 NWGNUmakefile jk/native/apache-2.0 NWGNUmakefile Log: fix problem with differences between Apache2 build systems of 2.0.x and 2.1.x Revision ChangesPath 1.4 +1 -7 jakarta-tomcat-connectors/jk/native2/server/apache2/NWGNUmakefile Index: NWGNUmakefile === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/NWGNUmakefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- NWGNUmakefile 6 Apr 2004 16:07:58 - 1.3 +++ NWGNUmakefile 9 Apr 2004 20:00:18 - 1.4 @@ -329,13 +329,7 @@ # Any specialized rules here # -$(OBJDIR)/%.o: $(JKCOMMON)/%.c $(OBJDIR)\cc.opt - @echo Compiling $< - $(CC) $(JKCOMMON)/$(