Author: mturk
Date: Fri Oct 22 05:13:19 2010
New Revision: 1026212
URL: http://svn.apache.org/viewvc?rev=1026212&view=rev
Log:
Unify the server variable across platforms. Oracle is now again calling that
iPlanet, as once originaly was
Modified:
tomcat/jk/trunk/native/netscape/Makefile.linux
tomcat/jk/trunk/native/netscape/Makefile.solaris
tomcat/jk/trunk/native/netscape/Makefile.vc
tomcat/jk/trunk/native/netscape/nsapi.dsp
Modified: tomcat/jk/trunk/native/netscape/Makefile.linux
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.linux?rev=1026212&r1=1026211&r2=1026212&view=diff
==============================================================================
--- tomcat/jk/trunk/native/netscape/Makefile.linux (original)
+++ tomcat/jk/trunk/native/netscape/Makefile.linux Fri Oct 22 05:13:19 2010
@@ -31,7 +31,7 @@ CC_CMD=$(CC) $(CFLAGS) $(EXTRA_CFLAGS) \
LD_SHAREDCMD=$(CC) $(LDFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
OS_TYPE=linux
-INCLUDEDIR=$(SUITSPOT_HOME)/include
+INCLUDEDIR=$(IPLANET_HOME)/include
JAVA_INCLUDE=$(JAVA_HOME)/include
JK_DIR=../common
VPATH=.:$(JK_DIR)
@@ -46,7 +46,7 @@ PLUGIN_OBJ = jk_nsapi_plugin.o
INCLUDE_FLAGS= -I$(JK_DIR) -I$(INCLUDEDIR) -I$(INCLUDEDIR)/base \
-I$(INCLUDEDIR)/frame -I$(JAVA_INCLUDE)
-I$(JAVA_INCLUDE)/$(OS_TYPE)
-all: nsapi_redirector.so
+all: nsapi_redirector.so
nsapi_redirector.so: $(JK_OBJS) $(PLUGIN_OBJ)
Modified: tomcat/jk/trunk/native/netscape/Makefile.solaris
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.solaris?rev=1026212&r1=1026211&r2=1026212&view=diff
==============================================================================
--- tomcat/jk/trunk/native/netscape/Makefile.solaris (original)
+++ tomcat/jk/trunk/native/netscape/Makefile.solaris Fri Oct 22 05:13:19 2010
@@ -36,7 +36,6 @@ LDFLAGS=-shared
# Change this according to location where on installed the server.
# Don't forget to do the ./configure --enable-netscape=/opt/SUNWwbsvr/plugins
# before doing gmake -f Makefile.solaris
-SUITSPOT_HOME=/opt/SUNWwbsvr/plugins
CC_CMD=$(CC) $(CFLAGS) $(EXTRA_CFLAGS) \
-DNET_SSL -DSOLARIS -D_REENTRANT -DXP_UNIX -DMCC_HTTPD -DSPAPI20
-DJK_NSAPI
@@ -48,7 +47,7 @@ all:
prepare:
OS_TYPE=solaris
-INCLUDEDIR=$(SUITSPOT_HOME)/include
+INCLUDEDIR=$(IPLANET_HOME)/include
JAVA_INCLUDE=$(JAVA_HOME)/include
JK_DIR=../common
VPATH=.:$(JK_DIR)
@@ -72,7 +71,7 @@ PLUGIN_OBJ = jk_nsapi_plugin.o
INCLUDE_FLAGS= -I$(JK_DIR) -I$(INCLUDEDIR) -I$(INCLUDEDIR)/base \
-I$(INCLUDEDIR)/frame -I$(JAVA_INCLUDE)
-I$(JAVA_INCLUDE)/$(OS_TYPE)
-all: nsapi_redirector.so
+all: nsapi_redirector.so
nsapi_redirector.so: $(JK_OBJS) $(PLUGIN_OBJ)
Modified: tomcat/jk/trunk/native/netscape/Makefile.vc
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.vc?rev=1026212&r1=1026211&r2=1026212&view=diff
==============================================================================
--- tomcat/jk/trunk/native/netscape/Makefile.vc (original)
+++ tomcat/jk/trunk/native/netscape/Makefile.vc Fri Oct 22 05:13:19 2010
@@ -2,27 +2,27 @@
!IF "$(CFG)" == ""
CFG=nsapi - Win32 Release
!MESSAGE No configuration specified. Defaulting to nsapi - Win32 Release.
-!ENDIF
+!ENDIF
!IF "$(CFG)" != "nsapi - Win32 Release"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "nsapi.mak" CFG="nsapi - Win32 Release"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "nsapi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE
!ERROR An invalid configuration is specified.
-!ENDIF
+!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
-!ELSE
+!ELSE
NULL=nul
-!ENDIF
+!ENDIF
OUTDIR=.\nsapi_release
INTDIR=.\nsapi_release
@@ -67,48 +67,48 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I
"$(SUNONE_HOME)\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D "MCC_HTTPD" /D
"SPAPI20" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\nsapi_redirect_src" /FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I
"$(IPLANET_HOME)\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D "MCC_HTTPD" /D
"SPAPI20" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\nsapi_redirect_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.obj::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
.c{$(INTDIR)}.sbr::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.sbr::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.sbr::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\jk.res" /i "..\common" /d "JK_NSAPI" /d
"NDEBUG"
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\jk.res" /i "..\common" /d "JK_NSAPI" /d
"NDEBUG"
BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\nsapi.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\nsapi.bsc"
BSC32_SBRS= \
-
+
LINK32=link.exe
-LINK32_FLAGS=ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib
mswsock.lib $(EXTRA_LIBS) /nologo /base:"0x6A6B0000" /dll /incremental:no
/pdb:"$(OUTDIR)\nsapi_redirect.pdb" /debug /machine:I386
/out:"$(OUTDIR)\nsapi_redirect.dll" /implib:"$(OUTDIR)\nsapi_redirect.lib"
/libpath:"$(SUNONE_HOME)\lib"
+LINK32_FLAGS=ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib
mswsock.lib $(EXTRA_LIBS) /nologo /base:"0x6A6B0000" /dll /incremental:no
/pdb:"$(OUTDIR)\nsapi_redirect.pdb" /debug /machine:I386
/out:"$(OUTDIR)\nsapi_redirect.dll" /implib:"$(OUTDIR)\nsapi_redirect.lib"
/libpath:"$(IPLANET_HOME)\lib"
LINK32_OBJS= \
"$(INTDIR)\jk_ajp12_worker.obj" \
"$(INTDIR)\jk_ajp13.obj" \
@@ -281,5 +281,5 @@ SOURCE=..\common\jk_worker.c
-!ENDIF
+!ENDIF
Modified: tomcat/jk/trunk/native/netscape/nsapi.dsp
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/nsapi.dsp?rev=1026212&r1=1026211&r2=1026212&view=diff
==============================================================================
--- tomcat/jk/trunk/native/netscape/nsapi.dsp (original)
+++ tomcat/jk/trunk/native/netscape/nsapi.dsp Fri Oct 22 05:13:19 2010
@@ -7,19 +7,19 @@
CFG=nsapi - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "nsapi.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "nsapi.mak" CFG="nsapi - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "nsapi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "nsapi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /I "..\common" /I
"$(SUNONE_HOME)\plugins\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D "MCC_HTTPD" /D
"SPAPI20" /Fd"Release/nsapi_redirect_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /I "..\common" /I
"$(IPLANET_HOME)\plugins\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D "MCC_HTTPD" /D
"SPAPI20" /Fd"Release/nsapi_redirect_src" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib
mswsock.lib /nologo /base:"0x6A6B0000" /dll /debug /machine:I386
/out:"nsapi_release/nsapi_redirect.dll" /libpath:"$(SUNONE_HOME)\plugins\lib"
+# ADD LINK32 ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib
mswsock.lib /nologo /base:"0x6A6B0000" /dll /debug /machine:I386
/out:"nsapi_release/nsapi_redirect.dll" /libpath:"$(IPLANET_HOME)\plugins\lib"
!ELSEIF "$(CFG)" == "nsapi - Win32 Debug"
@@ -69,7 +69,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /YX /FD /GZ
/c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I
"$(SUNONE_HOME)\plugins\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D "MCC_HTTPD" /D
"SPAPI20" /Fd"Debug/nsapi_redirect_src" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I
"$(IPLANET_HOME)\plugins\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D "MCC_HTTPD" /D
"SPAPI20" /Fd"Debug/nsapi_redirect_src" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -79,9 +79,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib
mswsock.lib /nologo /base:"0x6A6B0000" /dll /debug /machine:I386
/out:"nsapi_debug/nsapi_redirect.dll" /pdbtype:sept
/libpath:"$(SUNONE_HOME)\plugins\lib"
+# ADD LINK32 ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib
mswsock.lib /nologo /base:"0x6A6B0000" /dll /debug /machine:I386
/out:"nsapi_debug/nsapi_redirect.dll" /pdbtype:sept
/libpath:"$(IPLANET_HOME)\plugins\lib"
-!ENDIF
+!ENDIF
# Begin Target
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
