manoj 99/01/06 13:57:08
Modified: htdocs/manual install-tpf.html readme-tpf.html
src Configure Makefile.tmpl
src/os/tpf TPFExport os.h
Log:
Submitted by: Joe Moenich <[EMAIL PROTECTED]>
Reviewed by: Manoj Kasichainula <[EMAIL PROTECTED]>
Various TPF tweaks, simplifying installation, etc.
Revision Changes Path
1.3 +0 -6 apache-1.3/htdocs/manual/install-tpf.html
Index: install-tpf.html
===================================================================
RCS file: /home/cvs/apache-1.3/htdocs/manual/install-tpf.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- install-tpf.html 1998/11/04 19:31:50 1.2
+++ install-tpf.html 1999/01/06 21:56:57 1.3
@@ -101,12 +101,6 @@
document lists the modules that have been tested on TPF.
</ol>
<br>
-<li>Overlay src/Makefile.tmpl with src/Makefile.tpf:
- <tt><strong>cp Makefile.tpf Makefile.tmpl</strong></tt>
- <br><br>
-<li>Overlay src/main/Makefile.tmpl with src/main/Makefile.tpf:
-
<tt><strong>cp main/Makefile.tpf main/Makefile.tmpl</strong></tt>
- <br><br>
<li>Set the TPF environment variables:
<tt><strong>. os/tpf/TPFExport</strong></tt>
<br>
1.3 +0 -15 apache-1.3/htdocs/manual/readme-tpf.html
Index: readme-tpf.html
===================================================================
RCS file: /home/cvs/apache-1.3/htdocs/manual/readme-tpf.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- readme-tpf.html 1998/11/04 19:31:50 1.2
+++ readme-tpf.html 1999/01/06 21:56:57 1.3
@@ -49,21 +49,6 @@
</ul>
</p>
-<a name="auto_generated_files"> </a>
-<h2 align=center>Automatically Generated Files</h2>
-<p>
- Some files that are automatically generated by Makefile on other platforms
- are included in the src/os/tpf directory...
- <ul>
- <li>test_char.h
- <li>uri_delims.h
- </ul>
-
- These files could not be automatically created for TPF because the
- Makefile platform is not the same as the run-time platform.
- (That is, you don't run Makefile on TPF itself.)
-</p>
-
<a name="whats_available"> </a>
<h2 align=center>What's Available in this Version</h2>
1.320 +1 -0 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -u -r1.319 -r1.320
--- Configure 1999/01/04 04:11:38 1.319
+++ Configure 1999/01/06 21:57:01 1.320
@@ -609,6 +609,7 @@
CFLAGS="$CFLAGS -DTPF -DCHARSET_EBCDIC -D_POSIX_SOURCE"
DEF_WANTHSREGEX=yes
LIBS="$LIBS"
+ SUBTARGET="target_compile_only"
;;
*-sni-sysv4*)
OS='SVR4'
1.108 +3 -0 apache-1.3/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-1.3/src/Makefile.tmpl,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -u -r1.107 -r1.108
--- Makefile.tmpl 1998/12/01 23:59:54 1.107
+++ Makefile.tmpl 1999/01/06 21:57:02 1.108
@@ -30,6 +30,9 @@
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \
-o $(TARGET) buildmark.o $(OBJS) $(REGLIB) $(LIBS)
+target_compile_only: subdirs modules.o
+ $(CC) -c $(INCLUDES) $(CFLAGS) buildmark.c
+
target_shared: lib$(TARGET).ep
$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \
-o $(TARGET) -DSHARED_CORE_BOOTSTRAP main/http_main.c
1.2 +3 -22 apache-1.3/src/os/tpf/TPFExport
Index: TPFExport
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/tpf/TPFExport,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- TPFExport 1998/11/03 22:06:30 1.1
+++ TPFExport 1999/01/06 21:57:04 1.2
@@ -1,26 +1,7 @@
#!/bin/sh
echo " Setting TPF/c89 environment variables"
-TZ=EST5EDT
-PATH="$PATH:/usr/sbin:/usr/share/lib/terminfo/:.:/etc:$HOME"
-NLSPATH=/usr/lpp/tcpip/usr/lib/nls/msg/%L:/usr/lib/nls/msg/%L/%N
-LIBPATH=/usr/lib
-LANG=C
-export TZ PATH NLSPATH LANG
-# Commands Reference
-# umask g=rx,o=x
-umask 022
- export _C89_CCMODE=1
- export _C89_CVERSION="0x21040000"
- export _C89_PVERSION="0x11080000"
- export _C89_CNAME="CBCDRVR"
- export _C89_PNAME="EDCPRLK"
- export _C89_PMSGS="EDCPMSGE"
- export _C89_CLIB_PREFIX="TSCTEST.OSV2R4M0"
- export _C89_PLIB_PREFIX="SHARE.CEE180"
- export _C89_INCDIRS="/u/tpf41/currentmaint/include
/u/tpf41/currentmaint/include/oco //DD:SYSLIB //'SHARE.CEE180.SCEEH.NET.H'
//'SHARE.CEE180.SCEEH.H' //'SHARE.CEE180.SCEEH.NETINET.H'"
- export _C89_SSYSLIB=SHARE.CEE180.SCEEMAC
- export _C89_WORK_UNIT="VIO"
-export _BPX_SHAREAS=YES
-export PATH NLSPATH LIBPATH
+export _C89_CCMODE=1
+# replace the following with the location of your TPF include files
+export _C89_INCDIRS="/u/tpf41/currentmaint/include
/u/tpf41/currentmaint/include/oco"
export TPF=YES
echo "Done"
1.3 +2 -2 apache-1.3/src/os/tpf/os.h
Index: os.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/tpf/os.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- os.h 1998/12/15 08:55:16 1.2
+++ os.h 1999/01/06 21:57:05 1.3
@@ -48,7 +48,7 @@
#undef __FD_MASK
#endif
-typedef int __FD_MASK;
+typedef long __FD_MASK;
#ifdef __NBBY
#undef __NBBY
@@ -72,7 +72,7 @@
#define FD_SET(n, p)((p)->fds_bits[(n)/__NFDBITS] |= (1 <<((n) %
__NFDBITS)))
-#define FD_CLR(n, p)((p)->fds_bits[(n)/__NFDBITS] &= ~(1 \ << ((n) %
__NFDBITS)))
+#define FD_CLR(n, p)((p)->fds_bits[(n)/__NFDBITS] &= ~(1 << ((n) %
__NFDBITS)))
#define FD_ISSET(n, p)((p)->fds_bits[(n)/__NFDBITS] & (1 <<((n) %
__NFDBITS)))
