You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2010/10/22 10:50:28 UTC
svn commit: r1026249 - in /tomcat/jk/trunk/native: apache-2.0/Makefile.vc
iis/Makefile.amd64 iis/Makefile.ia64 iis/Makefile.x86 iis/README
netscape/Makefile.vc netscape/README
Author: mturk
Date: Fri Oct 22 08:50:28 2010
New Revision: 1026249
URL: http://svn.apache.org/viewvc?rev=1026249&view=rev
Log:
JK_VERSION is part of jk_version.h file. Use SO_VERSION instead
Modified:
tomcat/jk/trunk/native/apache-2.0/Makefile.vc
tomcat/jk/trunk/native/iis/Makefile.amd64
tomcat/jk/trunk/native/iis/Makefile.ia64
tomcat/jk/trunk/native/iis/Makefile.x86
tomcat/jk/trunk/native/iis/README
tomcat/jk/trunk/native/netscape/Makefile.vc
tomcat/jk/trunk/native/netscape/README
Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=1026249&r1=1026248&r2=1026249&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Fri Oct 22 08:50:28 2010
@@ -36,7 +36,7 @@ APU_LIB=libaprutil-1.lib
!ERROR Missing APACHE2_HOME environment variable.
!ENDIF
-TARGET=mod_jk$(JK_VERSION)$(HTTPD_VERSION)
+TARGET=mod_jk$(SO_VERSION)$(SO_HTTPD_VERSION)
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
Modified: tomcat/jk/trunk/native/iis/Makefile.amd64
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=1026249&r1=1026248&r2=1026249&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.amd64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.amd64 Fri Oct 22 08:50:28 2010
@@ -19,7 +19,7 @@
# nmake -f Makefile.amd64
#
-TARGET=isapi_redirect$(JK_VERSION)
+TARGET=isapi_redirect$(SO_VERSION)
CPP=cl.exe
MTL=midl.exe
Modified: tomcat/jk/trunk/native/iis/Makefile.ia64
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.ia64?rev=1026249&r1=1026248&r2=1026249&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.ia64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.ia64 Fri Oct 22 08:50:28 2010
@@ -19,7 +19,7 @@
# nmake -f Makefile.ia64
#
-TARGET=isapi_redirect$(JK_VERSION)
+TARGET=isapi_redirect$(SO_VERSION)
CPP=cl.exe
MTL=midl.exe
Modified: tomcat/jk/trunk/native/iis/Makefile.x86
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=1026249&r1=1026248&r2=1026249&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.x86 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.x86 Fri Oct 22 08:50:28 2010
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-TARGET=isapi_redirect$(JK_VERSION)
+TARGET=isapi_redirect$(SO_VERSION)
CPP=cl.exe
MTL=midl.exe
Modified: tomcat/jk/trunk/native/iis/README
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/README?rev=1026249&r1=1026248&r2=1026249&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/README (original)
+++ tomcat/jk/trunk/native/iis/README Fri Oct 22 08:50:28 2010
@@ -37,9 +37,7 @@ The steps that you need to take are:
1. Change directory to the isapi redirector plugins source directory.
2. Execute the following command:
- nmake -f Makefile.x86 [JK_VERSION=-1.2.31]
-
-This will build both release and debug versions of the redirector plugin.
+ nmake -f Makefile.x86 [SO_VERSION=-1.2.31]
An alternative will be to open the isapi workspace file (isapi.dsw) in msdev and
build it using the build menu.
Modified: tomcat/jk/trunk/native/netscape/Makefile.vc
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.vc?rev=1026249&r1=1026248&r2=1026249&view=diff
==============================================================================
--- tomcat/jk/trunk/native/netscape/Makefile.vc (original)
+++ tomcat/jk/trunk/native/netscape/Makefile.vc Fri Oct 22 08:50:28 2010
@@ -24,7 +24,7 @@ NULL=
NULL=nul
!ENDIF
-TARGET=nsapi_redirect$(JK_VERSION)
+TARGET=nsapi_redirect$(SO_VERSION)
OUTDIR=.\nsapi_release
INTDIR=.\nsapi_release
Modified: tomcat/jk/trunk/native/netscape/README
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/README?rev=1026249&r1=1026248&r2=1026249&view=diff
==============================================================================
--- tomcat/jk/trunk/native/netscape/README (original)
+++ tomcat/jk/trunk/native/netscape/README Fri Oct 22 08:50:28 2010
@@ -25,10 +25,7 @@ The steps that you need to take are:
directory or edit the nsapi.dsp and replace all $(IPLANET_HOME)
occurrences with the real path
3. Execute the following command:
- MSDEV nsapi.dsp /MAKE ALL
- If msdev is not in your path, enter the full path to msdev.exe
-
-This will build both release and debug versions of the redirector plugin.
+ nmake -f Makefile.vc [SO_VERSION=-1.2.31]
An alternative will be to open the isapi workspace file (nsapi.dsw) in msdev and
build it using the build menu.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org