Author: markt
Date: Tue Sep 27 19:00:58 2016
New Revision: 1762540
URL: http://svn.apache.org/viewvc?rev=1762540&view=rev
Log:
Align make files for x86 and x64
Modified:
tomcat/jk/trunk/native/iis/Makefile.amd64
tomcat/jk/trunk/native/iis/Makefile.x86
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/iis/Makefile.amd64
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=1762540&r1=1762539&r2=1762540&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.amd64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.amd64 Tue Sep 27 19:00:58 2016
@@ -13,12 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Microsoft Developer Studio Generated NMAKE File, Based on isapi.dsp
-# Use Platform SDK:
-# SetEnv.cmd /X64 /RETAIL
-# nmake -f Makefile.amd64
-#
-
TARGET=isapi_redirect$(SO_VERSION)
CPP=cl.exe
@@ -30,8 +24,16 @@ INTDIR=.\Release_amd64
OutDir=.\Release_amd64
# End Custom Macros
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\$(TARGET).dll"
+
+!ELSE
+
ALL : "pcre_amd64" "$(OUTDIR)\$(TARGET).dll"
+!ENDIF
+
!IF "$(RECURSE)" == "1"
CLEAN :"pcre_amd64CLEAN"
!ELSE
@@ -111,7 +113,7 @@ LINK32_OBJS= \
IF EXIST $(OUTDIR)\$(TARGET).manifest \
mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest
-outputresource:$(OUTDIR)\$(TARGET).dll;2
-CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "pcre" /D
"WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /D
"PCRE_STATIC" /D "JK_ISAPI" /D "ISAPI_EXPORTS" $(CFLAGS) /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "pcre"
$(CFLAGS) /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D
"_WIN64" /D "PCRE_STATIC" /D "JK_ISAPI" /D "ISAPI_EXPORTS" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
Modified: tomcat/jk/trunk/native/iis/Makefile.x86
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=1762540&r1=1762539&r2=1762540&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.x86 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.x86 Tue Sep 27 19:00:58 2016
@@ -24,21 +24,21 @@ INTDIR=.\Release_x86
OutDir=.\Release_x86
# End Custom Macros
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\$(TARGET).dll"
-!ELSE
+!ELSE
ALL : "pcre_x86" "$(OUTDIR)\$(TARGET).dll"
-!ENDIF
+!ENDIF
-!IF "$(RECURSE)" == "1"
-CLEAN :"pcre_x86CLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1"
+CLEAN :"pcre_x86CLEAN"
+!ELSE
CLEAN :
-!ENDIF
+!ENDIF
-@erase "$(INTDIR)\jk.res"
-@erase "$(INTDIR)\isapi_redirector_src.idb"
-@erase "$(INTDIR)\isapi_redirector_src.pdb"
@@ -73,11 +73,11 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\isapi.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\isapi.bsc"
BSC32_SBRS= \
-
+
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib
strsafe.lib $(EXTRA_LIBS) /nologo /base:"0x6A6B0000" /dll /incremental:no
/pdb:"$(OUTDIR)\$(TARGET).pdb" /debug /machine:I386 /def:".\isapi.def"
/out:"$(OUTDIR)\$(TARGET).dll" /implib:"$(OUTDIR)\isapi_redirect.lib"
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib
strsafe.lib $(EXTRA_LIBS) /nologo /base:"0x6A6B0000" /dll /incremental:no
/pdb:"$(OUTDIR)\$(TARGET).pdb" /debug /machine:I386 /def:".\isapi.def"
/out:"$(OUTDIR)\$(TARGET).dll" /implib:"$(OUTDIR)\isapi_redirect.lib"
DEF_FILE= \
".\isapi.def"
LINK32_OBJS= \
@@ -113,40 +113,40 @@ LINK32_OBJS= \
IF EXIST $(OUTDIR)\$(TARGET).manifest \
mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest
-outputresource:$(OUTDIR)\$(TARGET).dll;2
-CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "pcre"
$(CFLAGS) /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /D "JK_ISAPI"
/D "ISAPI_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "pcre"
$(CFLAGS) /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /D "JK_ISAPI"
/D "ISAPI_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_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_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\jk.res" /i "..\common" /d "JK_ISAPI" /d
"NDEBUG"
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\jk.res" /i "..\common" /d "JK_ISAPI" /d
"NDEBUG"
SOURCE=..\common\jk.rc
@@ -285,12 +285,12 @@ SOURCE=..\common\jk_worker.c
$(CPP) $(CPP_PROJ) $(SOURCE)
-"pcre_x86" :
+"pcre_x86" :
cd ".\pcre"
$(MAKE) /$(MAKEFLAGS) /F ".\pcre.x86"
cd ".."
-"pcre_x86CLEAN" :
+"pcre_x86CLEAN" :
cd ".\pcre"
- $(MAKE) /$(MAKEFLAGS) /F ".\pcre.x86" CLEAN
+ $(MAKE) /$(MAKEFLAGS) /F ".\pcre.x86" CLEAN
cd ".."
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1762540&r1=1762539&r2=1762540&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Tue Sep 27 19:00:58 2016
@@ -40,6 +40,14 @@
new documentation project for JK was started.
</p>
</section>
+<section name="Changes between 1.2.42 and 1.2.43">
+ <br />
+ <subsection name="Native">
+ <changelog>
+ ISAPI: Align the make files for 32-bit and 64-bit builds. (markt)
+ </changelog>
+ </subsection>
+</section>
<section name="Changes between 1.2.41 and 1.2.42">
<br />
<subsection name="Native">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
