Author: mturk
Date: Mon Sep 13 16:50:19 2010
New Revision: 996600
URL: http://svn.apache.org/viewvc?rev=996600&view=rev
Log:
Add ASL headers to the hand-crafted files.
Modified:
tomcat/jk/trunk/native/apache-2.0/Makefile.vc
tomcat/jk/trunk/native/apache-2.0/config.m4
tomcat/jk/trunk/native/iis/Makefile.amd64
tomcat/jk/trunk/native/iis/pcre/dftables.x86
tomcat/jk/trunk/native/iis/pcre/pcre.amd64
tomcat/jk/trunk/native/iis/pcre/pcre.ia64
tomcat/jk/trunk/native/iis/pcre/pcre.x86
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=996600&r1=996599&r2=996600&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Mon Sep 13 16:50:19 2010
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
!IFDEF APACHE22
APACHE2_HOME=$(APACHE22_HOME)
APR_LIB=libapr-1.lib
@@ -60,11 +75,11 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_jk.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_jk.bsc"
BSC32_SBRS= \
-
+
LINK32=link.exe
-LINK32_FLAGS=libhttpd.lib $(APR_LIB) $(APU_LIB) kernel32.lib user32.lib
advapi32.lib mswsock.lib ws2_32.lib /nologo /base:"0x6A6B0000"
/subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_jk.pdb" /debug
/machine:I386 /out:"$(OUTDIR)\mod_jk.so" /implib:"$(OUTDIR)\mod_jk.lib"
/libpath:"$(APACHE2_HOME)\lib" /opt:ref
+LINK32_FLAGS=libhttpd.lib $(APR_LIB) $(APU_LIB) kernel32.lib user32.lib
advapi32.lib mswsock.lib ws2_32.lib /nologo /base:"0x6A6B0000"
/subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_jk.pdb" /debug
/machine:I386 /out:"$(OUTDIR)\mod_jk.so" /implib:"$(OUTDIR)\mod_jk.lib"
/libpath:"$(APACHE2_HOME)\lib" /opt:ref
LINK32_OBJS= \
"$(INTDIR)\jk_ajp12_worker.obj" \
"$(INTDIR)\jk_ajp13.obj" \
@@ -98,36 +113,36 @@ LINK32_OBJS= \
mt -nologo -manifest $(OUTDIR)\mod_jk.manifest
-outputresource:$(OUTDIR)\mod_jk.so;2
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /D "NDEBUG" /D
"WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_jk_src" /FD /c
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /D "NDEBUG" /D
"WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_jk_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
Modified: tomcat/jk/trunk/native/apache-2.0/config.m4
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/config.m4?rev=996600&r1=996599&r2=996600&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/config.m4 (original)
+++ tomcat/jk/trunk/native/apache-2.0/config.m4 Mon Sep 13 16:50:19 2010
@@ -1,3 +1,19 @@
+dnl -------------------------------------------------------- -*- autoconf -*-
+dnl Licensed to the Apache Software Foundation (ASF) under one or more
+dnl contributor license agreements. See the NOTICE file distributed with
+dnl this work for additional information regarding copyright ownership.
+dnl The ASF licenses this file to You under the Apache License, Version 2.0
+dnl (the "License"); you may not use this file except in compliance with
+dnl the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
+
AC_MSG_CHECKING(for mod_jk module)
AC_ARG_WITH(mod_jk,
[ --with-mod_jk Include the mod_jk (static).],
@@ -14,5 +30,5 @@ EOF
MODLIST="$MODLIST $module"
AC_MSG_RESULT(added $withval)
],
- [ AC_MSG_RESULT(no mod_jk added)
+ [ AC_MSG_RESULT(no mod_jk added)
])
Modified: tomcat/jk/trunk/native/iis/Makefile.amd64
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=996600&r1=996599&r2=996600&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.amd64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.amd64 Mon Sep 13 16:50:19 2010
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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
@@ -12,21 +27,21 @@ INTDIR=.\Release_amd64
OutDir=.\Release_amd64
# End Custom Macros
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\isapi_redirect.dll"
-!ELSE
+!ELSE
ALL : "pcre_amd64" "$(OUTDIR)\isapi_redirect.dll"
-!ENDIF
+!ENDIF
-!IF "$(RECURSE)" == "1"
-CLEAN :"pcre_amd64CLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1"
+CLEAN :"pcre_amd64CLEAN"
+!ELSE
CLEAN :
-!ENDIF
+!ENDIF
-...@erase "$(INTDIR)\jk.res"
-...@erase "$(INTDIR)\isapi_redirector_src.idb"
-...@erase "$(INTDIR)\isapi_redirector_src.pdb"
@@ -62,11 +77,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 bufferoverflowu.lib /nologo /dll /incremental:no
/pdb:"$(OUTDIR)\isapi_redirect.pdb" /debug /machine:AMD64 /def:".\isapi.def"
/out:"$(OUTDIR)\isapi_redirect.dll" /implib:"$(OUTDIR)\isapi_redirect.lib"
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib
strsafe.lib bufferoverflowu.lib /nologo /dll /incremental:no
/pdb:"$(OUTDIR)\isapi_redirect.pdb" /debug /machine:AMD64 /def:".\isapi.def"
/out:"$(OUTDIR)\isapi_redirect.dll" /implib:"$(OUTDIR)\isapi_redirect.lib"
DEF_FILE= \
".\isapi.def"
LINK32_OBJS= \
@@ -103,40 +118,40 @@ LINK32_OBJS= \
IF EXIST $(OUTDIR)\isapi_redirect.manifest \
mt -nologo -manifest $(OUTDIR)\isapi_redirect.manifest
-outputresource:$(OUTDIR)\isapi_redirect.dll;2
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D
"JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" $(CFLAGS)
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D
"JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" $(CFLAGS)
/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)\isapi_redirect.res" /i "..\common" /d
BASENAME="isapi_redirect" /d "NDEBUG"
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\isapi_redirect.res" /i "..\common" /d
BASENAME="isapi_redirect" /d "NDEBUG"
SOURCE=..\common\jk.rc
@@ -281,12 +296,12 @@ SOURCE=..\common\jk_worker.c
$(CPP) $(CPP_PROJ) $(SOURCE)
-"pcre_amd64" :
+"pcre_amd64" :
cd ".\pcre"
$(MAKE) /$(MAKEFLAGS) /F ".\pcre.amd64"
cd ".."
-"pcre_amd64CLEAN" :
+"pcre_amd64CLEAN" :
cd ".\pcre"
- $(MAKE) /$(MAKEFLAGS) /F ".\pcre.amd64" RECURSE=1 CLEAN
+ $(MAKE) /$(MAKEFLAGS) /F ".\pcre.amd64" RECURSE=1 CLEAN
cd ".."
Modified: tomcat/jk/trunk/native/iis/pcre/dftables.x86
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/dftables.x86?rev=996600&r1=996599&r2=996600&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/dftables.x86 (original)
+++ tomcat/jk/trunk/native/iis/pcre/dftables.x86 Mon Sep 13 16:50:19 2010
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
CPP=cl.exe
RSC=rc.exe
OUTDIR=.
@@ -18,11 +33,11 @@ CLEAN :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\dftables.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\dftables.bsc"
BSC32_SBRS= \
-
+
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:console /incremental:no
/pdb:"$(OUTDIR)\Release\dftables.pdb" /machine:I386
/out:"$(OUTDIR)\dftables.exe" /opt:ref
+LINK32_FLAGS=kernel32.lib /nologo /subsystem:console /incremental:no
/pdb:"$(OUTDIR)\Release\dftables.pdb" /machine:I386
/out:"$(OUTDIR)\dftables.exe" /opt:ref
LINK32_OBJS= \
"$(INTDIR)\dftables.obj"
@@ -31,36 +46,36 @@ LINK32_OBJS= \
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
-CPP_PROJ=/nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\dftables" /FD /wd4996 /c
+CPP_PROJ=/nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\dftables" /FD /wd4996 /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) $<
<<
@@ -74,21 +89,21 @@ SOURCE=.\config.hw
InputPath=.\config.hw
".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- <<tempfile.bat
- @echo off
+ <<tempfile.bat
+ @echo off
type .\config.hw > .\config.h
-<<
-
+<<
+
SOURCE=.\maketables.c
SOURCE=.\pcre.hw
InputPath=.\pcre.hw
".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- <<tempfile.bat
- @echo off
+ <<tempfile.bat
+ @echo off
type .\pcre.hw > .\pcre.h
-<<
-
+<<
+
-!ENDIF
+!ENDIF
Modified: tomcat/jk/trunk/native/iis/pcre/pcre.amd64
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/pcre.amd64?rev=996600&r1=996599&r2=996600&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/pcre.amd64 (original)
+++ tomcat/jk/trunk/native/iis/pcre/pcre.amd64 Mon Sep 13 16:50:19 2010
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# Microsoft Developer Studio Generated NMAKE File, Based on pcre.dsp
# Use Platform SDK:
# SetEnv.cmd /X64 /RETAIL
@@ -12,15 +27,15 @@ INTDIR=.\Release_amd64
OutDir=.\Release_amd64
# End Custom Macros
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\pcre.lib"
-!ELSE
+!ELSE
ALL : "$(OUTDIR)\pcre.lib"
-!ENDIF
+!ENDIF
CLEAN :
-...@erase "$(INTDIR)\get.obj"
@@ -35,11 +50,11 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\pcre.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\pcre.bsc"
BSC32_SBRS= \
-
+
LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\pcre.lib"
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\pcre.lib"
LIB32_OBJS= \
"$(INTDIR)\get.obj" \
"$(INTDIR)\maketables.obj" \
@@ -51,47 +66,47 @@ LIB32_OBJS= \
$(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
<<
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_AMD64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D "PCRE_STATIC"
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_src" /FD /c
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_AMD64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D "PCRE_STATIC"
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_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) $<
<<
SOURCE=.\dftables.exe
InputPath=.\dftables.exe
".\chartables.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- <<tempfile.bat
- @echo off
- .\dftables.exe chartables.c
-<<
-
+ <<tempfile.bat
+ @echo off
+ .\dftables.exe chartables.c
+<<
+
SOURCE=.\get.c
"$(INTDIR)\get.obj" : $(SOURCE) "$(INTDIR)" ".\config.h" ".\pcre.h"
@@ -116,16 +131,16 @@ SOURCE=.\config.hw
InputPath=.\config.hw
".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- <<tempfile.bat
- @echo off
+ <<tempfile.bat
+ @echo off
type .\config.hw > .\config.h
-<<
-
+<<
+
SOURCE=.\pcre.hw
InputPath=.\pcre.hw
".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- <<tempfile.bat
- @echo off
+ <<tempfile.bat
+ @echo off
type .\pcre.hw > .\pcre.h
-<<
+<<
Modified: tomcat/jk/trunk/native/iis/pcre/pcre.ia64
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/pcre.ia64?rev=996600&r1=996599&r2=996600&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/pcre.ia64 (original)
+++ tomcat/jk/trunk/native/iis/pcre/pcre.ia64 Mon Sep 13 16:50:19 2010
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# Microsoft Developer Studio Generated NMAKE File, Based on pcre.dsp
# Use Platform SDK:
# SetEnv.cmd /SRV64 /RETAIL
@@ -12,15 +27,15 @@ INTDIR=.\Release_ia64
OutDir=.\Release_ia64
# End Custom Macros
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\pcre.lib"
-!ELSE
+!ELSE
ALL : "$(OUTDIR)\pcre.lib"
-!ENDIF
+!ENDIF
CLEAN :
-...@erase "$(INTDIR)\get.obj"
@@ -35,11 +50,11 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\pcre.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\pcre.bsc"
BSC32_SBRS= \
-
+
LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\pcre.lib"
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\pcre.lib"
LIB32_OBJS= \
"$(INTDIR)\get.obj" \
"$(INTDIR)\maketables.obj" \
@@ -51,47 +66,47 @@ LIB32_OBJS= \
$(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
<<
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_IA64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D "PCRE_STATIC"
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_src" /FD /c
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_IA64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D "PCRE_STATIC"
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_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) $<
<<
SOURCE=.\dftables.exe
InputPath=.\dftables.exe
".\chartables.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- <<tempfile.bat
- @echo off
- .\dftables.exe chartables.c
-<<
-
+ <<tempfile.bat
+ @echo off
+ .\dftables.exe chartables.c
+<<
+
SOURCE=.\get.c
"$(INTDIR)\get.obj" : $(SOURCE) "$(INTDIR)" ".\config.h" ".\pcre.h"
@@ -116,17 +131,17 @@ SOURCE=.\config.hw
InputPath=.\config.hw
".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- <<tempfile.bat
- @echo off
+ <<tempfile.bat
+ @echo off
type .\config.hw > .\config.h
-<<
-
+<<
+
SOURCE=.\pcre.hw
InputPath=.\pcre.hw
".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- <<tempfile.bat
- @echo off
+ <<tempfile.bat
+ @echo off
type .\pcre.hw > .\pcre.h
-<<
-
+<<
+
Modified: tomcat/jk/trunk/native/iis/pcre/pcre.x86
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/pcre.x86?rev=996600&r1=996599&r2=996600&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/pcre.x86 (original)
+++ tomcat/jk/trunk/native/iis/pcre/pcre.x86 Mon Sep 13 16:50:19 2010
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
CPP=cl.exe
RSC=rc.exe
OUTDIR=.\Release_x86
@@ -6,21 +21,21 @@ INTDIR=.\Release_x86
OutDir=.\Release_x86
# End Custom Macros
-!IF "$(RECURSE)" == "0"
+!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\pcre.lib"
-!ELSE
+!ELSE
ALL : "dftables_x86" "$(OUTDIR)\pcre.lib"
-!ENDIF
+!ENDIF
-!IF "$(RECURSE)" == "1"
-CLEAN :"dftables_x86CLEAN"
-!ELSE
+!IF "$(RECURSE)" == "1"
+CLEAN :"dftables_x86CLEAN"
+!ELSE
CLEAN :
-!ENDIF
+!ENDIF
-...@erase "$(INTDIR)\get.obj"
-...@erase "$(INTDIR)\maketables.obj"
-...@erase "$(INTDIR)\pcre.obj"
@@ -33,11 +48,11 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\pcre.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\pcre.bsc"
BSC32_SBRS= \
-
+
LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\pcre.lib"
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\pcre.lib"
LIB32_OBJS= \
"$(INTDIR)\get.obj" \
"$(INTDIR)\maketables.obj" \
@@ -49,47 +64,47 @@ LIB32_OBJS= \
$(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
<<
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_src" /FD /c
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_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) $<
<<
SOURCE=.\dftables.exe
InputPath=.\dftables.exe
".\chartables.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- <<tempfile.bat
- @echo off
- .\dftables.exe chartables.c
-<<
-
+ <<tempfile.bat
+ @echo off
+ .\dftables.exe chartables.c
+<<
+
SOURCE=.\get.c
"$(INTDIR)\get.obj" : $(SOURCE) "$(INTDIR)" ".\config.h" ".\pcre.h"
@@ -114,26 +129,26 @@ SOURCE=.\config.hw
InputPath=.\config.hw
".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- <<tempfile.bat
- @echo off
+ <<tempfile.bat
+ @echo off
type .\config.hw > .\config.h
-<<
-
+<<
+
SOURCE=.\pcre.hw
InputPath=.\pcre.hw
".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- <<tempfile.bat
- @echo off
+ <<tempfile.bat
+ @echo off
type .\pcre.hw > .\pcre.h
-<<
+<<
-"dftables_x86" :
+"dftables_x86" :
cd "."
- $(MAKE) /$(MAKEFLAGS) /F ".\dftables.x86" CFG="dftables_x86"
+ $(MAKE) /$(MAKEFLAGS) /F ".\dftables.x86" CFG="dftables_x86"
cd "."
-"dftables_x86CLEAN" :
+"dftables_x86CLEAN" :
cd "."
- $(MAKE) /$(MAKEFLAGS) /F ".\dftables.x86" CFG="dftables_x86" RECURSE=1
CLEAN
+ $(MAKE) /$(MAKEFLAGS) /F ".\dftables.x86" CFG="dftables_x86" RECURSE=1 CLEAN
cd "."
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
