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 2012/03/08 12:37:26 UTC

svn commit: r1298367 - in /tomcat/jk/trunk/native/iis: Makefile.amd64 Makefile.ia64 Makefile.x86 pcre/chartables.hw pcre/pcre.amd64 pcre/pcre.ia64 pcre/pcre.x86

Author: mturk
Date: Thu Mar  8 11:37:26 2012
New Revision: 1298367

URL: http://svn.apache.org/viewvc?rev=1298367&view=rev
Log:
Pre-generate chartables for windows. It never changes anyhow. This allows to build pcre 64-bit without creating 32-bit in front

Added:
    tomcat/jk/trunk/native/iis/pcre/chartables.hw
Modified:
    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/pcre/pcre.amd64
    tomcat/jk/trunk/native/iis/pcre/pcre.ia64
    tomcat/jk/trunk/native/iis/pcre/pcre.x86

Modified: tomcat/jk/trunk/native/iis/Makefile.amd64
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=1298367&r1=1298366&r2=1298367&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.amd64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.amd64 Thu Mar  8 11:37:26 2012
@@ -30,16 +30,8 @@ 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
@@ -298,5 +290,5 @@ SOURCE=..\common\jk_worker.c
 
 "pcre_amd64CLEAN" :
    cd ".\pcre"
-   $(MAKE) /$(MAKEFLAGS) /F ".\pcre.amd64" RECURSE=1 CLEAN
+   $(MAKE) /$(MAKEFLAGS) /F ".\pcre.amd64" CLEAN
    cd ".."

Modified: tomcat/jk/trunk/native/iis/Makefile.ia64
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.ia64?rev=1298367&r1=1298366&r2=1298367&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.ia64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.ia64 Thu Mar  8 11:37:26 2012
@@ -30,16 +30,8 @@ INTDIR=.\Release_ia64
 OutDir=.\Release_ia64
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\$(TARGET).dll"
-
-!ELSE 
-
 ALL : "pcre_ia64" "$(OUTDIR)\$(TARGET).dll"
 
-!ENDIF 
-
 !IF "$(RECURSE)" == "1" 
 CLEAN :"pcre_ia64CLEAN" 
 !ELSE 
@@ -298,5 +290,5 @@ SOURCE=..\common\jk_worker.c
 
 "pcre_ia64CLEAN" : 
    cd ".\pcre"
-   $(MAKE) /$(MAKEFLAGS) /F ".\pcre.ia64" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\pcre.ia64" CLEAN 
    cd ".."

Modified: tomcat/jk/trunk/native/iis/Makefile.x86
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=1298367&r1=1298366&r2=1298367&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.x86 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.x86 Thu Mar  8 11:37:26 2012
@@ -287,10 +287,10 @@ SOURCE=..\common\jk_worker.c
 
 "pcre_x86" : 
    cd ".\pcre"
-   $(MAKE) /$(MAKEFLAGS) /F ".\pcre.x86" CFG="pcre_x86" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\pcre.x86"
    cd ".."
 
 "pcre_x86CLEAN" : 
    cd ".\pcre"
-   $(MAKE) /$(MAKEFLAGS) /F ".\pcre.x86" CFG="pcre_x86" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\pcre.x86" CLEAN 
    cd ".."

Added: tomcat/jk/trunk/native/iis/pcre/chartables.hw
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/chartables.hw?rev=1298367&view=auto
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/chartables.hw (added)
+++ tomcat/jk/trunk/native/iis/pcre/chartables.hw Thu Mar  8 11:37:26 2012
@@ -0,0 +1,183 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* This file is automatically written by the dftables auxiliary 
+program. If you edit it by hand, you might like to edit the Makefile to 
+prevent its ever being regenerated.
+
+This file is #included in the compilation of pcre.c to build the default
+character tables which are used when no tables are passed to the compile
+function. */
+
+static unsigned char pcre_default_tables[] = {
+
+/* This table is a lower casing table. */
+
+    0,  1,  2,  3,  4,  5,  6,  7,
+    8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23,
+   24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39,
+   40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55,
+   56, 57, 58, 59, 60, 61, 62, 63,
+   64, 97, 98, 99,100,101,102,103,
+  104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,
+  120,121,122, 91, 92, 93, 94, 95,
+   96, 97, 98, 99,100,101,102,103,
+  104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,
+  120,121,122,123,124,125,126,127,
+  128,129,130,131,132,133,134,135,
+  136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,
+  152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,
+  168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,
+  184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,
+  200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,
+  216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,
+  232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,
+  248,249,250,251,252,253,254,255,
+
+/* This table is a case flipping table. */
+
+    0,  1,  2,  3,  4,  5,  6,  7,
+    8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23,
+   24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39,
+   40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55,
+   56, 57, 58, 59, 60, 61, 62, 63,
+   64, 97, 98, 99,100,101,102,103,
+  104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,
+  120,121,122, 91, 92, 93, 94, 95,
+   96, 65, 66, 67, 68, 69, 70, 71,
+   72, 73, 74, 75, 76, 77, 78, 79,
+   80, 81, 82, 83, 84, 85, 86, 87,
+   88, 89, 90,123,124,125,126,127,
+  128,129,130,131,132,133,134,135,
+  136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,
+  152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,
+  168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,
+  184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,
+  200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,
+  216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,
+  232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,
+  248,249,250,251,252,253,254,255,
+
+/* This table contains bit maps for various character classes.
+Each map is 32 bytes long and the bits run from the least
+significant end of each byte. The classes that have their own
+maps are: space, xdigit, digit, upper, lower, word, graph
+print, punct, and cntrl. Other classes are built from combinations. */
+
+  0x00,0x3e,0x00,0x00,0x01,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
+  0x7e,0x00,0x00,0x00,0x7e,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0xfe,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0x07,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
+  0xfe,0xff,0xff,0x87,0xfe,0xff,0xff,0x07,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0xfe,0xff,0x00,0xfc,
+  0x01,0x00,0x00,0xf8,0x01,0x00,0x00,0x78,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+/* This table identifies various classes of character by individual bits:
+  0x01   white space character
+  0x02   letter
+  0x04   decimal digit
+  0x08   hexadecimal digit
+  0x10   alphanumeric or '_'
+  0x80   regular expression metacharacter or binary zero
+*/
+
+  0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
+  0x00,0x01,0x01,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  16- 23 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31 */
+  0x01,0x00,0x00,0x00,0x80,0x00,0x00,0x00, /*    - '  */
+  0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x00, /*  ( - /  */
+  0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c, /*  0 - 7  */
+  0x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x80, /*  8 - ?  */
+  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  @ - G  */
+  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  H - O  */
+  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  P - W  */
+  0x12,0x12,0x12,0x80,0x00,0x00,0x80,0x10, /*  X - _  */
+  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  ` - g  */
+  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  h - o  */
+  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  p - w  */
+  0x12,0x12,0x12,0x80,0x80,0x00,0x00,0x00, /*  x -127 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 128-135 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 136-143 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144-151 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 152-159 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 160-167 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 168-175 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 176-183 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 184-191 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 192-199 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 200-207 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 208-215 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 216-223 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 224-231 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 232-239 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
+
+/* End of chartables.c */

Modified: tomcat/jk/trunk/native/iis/pcre/pcre.amd64
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/pcre.amd64?rev=1298367&r1=1298366&r2=1298367&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/pcre.amd64 (original)
+++ tomcat/jk/trunk/native/iis/pcre/pcre.amd64 Thu Mar  8 11:37:26 2012
@@ -27,16 +27,8 @@ INTDIR=.\Release_amd64
 OutDir=.\Release_amd64
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0"
-
-ALL : "$(OUTDIR)\pcre.lib"
-
-!ELSE
-
 ALL : "$(OUTDIR)\pcre.lib"
 
-!ENDIF
-
 CLEAN :
 	-@erase "$(INTDIR)\get.obj"
 	-@erase "$(INTDIR)\maketables.obj"
@@ -98,15 +90,16 @@ CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -
    $(CPP_PROJ) $<
 <<
 
-SOURCE=.\dftables.exe
-InputPath=.\dftables.exe
+SOURCE=.\chartables.hw
+InputPath=.\chartables.hw
 
 ".\chartables.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat
 	@echo off
-	.\dftables.exe chartables.c
+	type .\chartables.hw > .\chartables.c
 <<
 
+
 SOURCE=.\get.c
 
 "$(INTDIR)\get.obj" : $(SOURCE) "$(INTDIR)" ".\config.h" ".\pcre.h"
@@ -136,6 +129,7 @@ InputPath=.\config.hw
 	type .\config.hw > .\config.h
 <<
 
+
 SOURCE=.\pcre.hw
 InputPath=.\pcre.hw
 
@@ -144,3 +138,4 @@ InputPath=.\pcre.hw
 	@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=1298367&r1=1298366&r2=1298367&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/pcre.ia64 (original)
+++ tomcat/jk/trunk/native/iis/pcre/pcre.ia64 Thu Mar  8 11:37:26 2012
@@ -27,16 +27,8 @@ INTDIR=.\Release_ia64
 OutDir=.\Release_ia64
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0"
-
-ALL : "$(OUTDIR)\pcre.lib"
-
-!ELSE
-
 ALL : "$(OUTDIR)\pcre.lib"
 
-!ENDIF
-
 CLEAN :
 	-@erase "$(INTDIR)\get.obj"
 	-@erase "$(INTDIR)\maketables.obj"
@@ -98,15 +90,16 @@ CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -
    $(CPP_PROJ) $<
 <<
 
-SOURCE=.\dftables.exe
-InputPath=.\dftables.exe
+SOURCE=.\chartables.hw
+InputPath=.\chartables.hw
 
 ".\chartables.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat
 	@echo off
-	.\dftables.exe chartables.c
+	type .\chartables.hw > .\chartables.c
 <<
 
+
 SOURCE=.\get.c
 
 "$(INTDIR)\get.obj" : $(SOURCE) "$(INTDIR)" ".\config.h" ".\pcre.h"
@@ -136,6 +129,7 @@ InputPath=.\config.hw
 	type .\config.hw > .\config.h
 <<
 
+
 SOURCE=.\pcre.hw
 InputPath=.\pcre.hw
 

Modified: tomcat/jk/trunk/native/iis/pcre/pcre.x86
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/pcre.x86?rev=1298367&r1=1298366&r2=1298367&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/pcre/pcre.x86 (original)
+++ tomcat/jk/trunk/native/iis/pcre/pcre.x86 Thu Mar  8 11:37:26 2012
@@ -21,21 +21,9 @@ INTDIR=.\Release_x86
 OutDir=.\Release_x86
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0"
-
 ALL : "$(OUTDIR)\pcre.lib"
 
-!ELSE
-
-ALL : "dftables_x86" "$(OUTDIR)\pcre.lib"
-
-!ENDIF
-
-!IF "$(RECURSE)" == "1"
-CLEAN :"dftables_x86CLEAN"
-!ELSE
 CLEAN :
-!ENDIF
 	-@erase "$(INTDIR)\get.obj"
 	-@erase "$(INTDIR)\maketables.obj"
 	-@erase "$(INTDIR)\pcre.obj"
@@ -96,15 +84,16 @@ CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -
    $(CPP_PROJ) $<
 <<
 
-SOURCE=.\dftables.exe
-InputPath=.\dftables.exe
+SOURCE=.\chartables.hw
+InputPath=.\chartables.hw
 
 ".\chartables.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat
 	@echo off
-	.\dftables.exe chartables.c
+	type .\chartables.hw > .\chartables.c
 <<
 
+
 SOURCE=.\get.c
 
 "$(INTDIR)\get.obj" : $(SOURCE) "$(INTDIR)" ".\config.h" ".\pcre.h"
@@ -134,6 +123,7 @@ InputPath=.\config.hw
 	type .\config.hw > .\config.h
 <<
 
+
 SOURCE=.\pcre.hw
 InputPath=.\pcre.hw
 
@@ -143,12 +133,3 @@ InputPath=.\pcre.hw
 	type .\pcre.hw > .\pcre.h
 <<
 
-"dftables_x86" :
-   cd "."
-   $(MAKE) /$(MAKEFLAGS) /F ".\dftables.x86" CFG="dftables_x86"
-   cd "."
-
-"dftables_x86CLEAN" :
-   cd "."
-   $(MAKE) /$(MAKEFLAGS) /F ".\dftables.x86" CFG="dftables_x86" RECURSE=1 CLEAN
-   cd "."



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: svn commit: r1298367 - in /tomcat/jk/trunk/native/iis: Makefile.amd64 Makefile.ia64 Makefile.x86 pcre/chartables.hw pcre/pcre.amd64 pcre/pcre.ia64 pcre/pcre.x86

Posted by Mladen Turk <mt...@apache.org>.
On 03/08/2012 01:15 PM, Konstantin Kolinko wrote:
> 2012/3/8<mt...@apache.org>:
>> Added:
>>     tomcat/jk/trunk/native/iis/pcre/chartables.hw
>
> The added file seems to be a C source text, so it needs svn:eol-style=native
>

Probably, but since its not meant to be editable its irrelevant.
It'll be compiled regardless of EOL and thats what matters ;)


Regards
-- 
^TM

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: svn commit: r1298367 - in /tomcat/jk/trunk/native/iis: Makefile.amd64 Makefile.ia64 Makefile.x86 pcre/chartables.hw pcre/pcre.amd64 pcre/pcre.ia64 pcre/pcre.x86

Posted by Konstantin Kolinko <kn...@gmail.com>.
2012/3/8  <mt...@apache.org>:
> Author: mturk
> Date: Thu Mar  8 11:37:26 2012
> New Revision: 1298367
>
> URL: http://svn.apache.org/viewvc?rev=1298367&view=rev
> Log:
> Pre-generate chartables for windows. It never changes anyhow. This allows to build pcre 64-bit without creating 32-bit in front
>
> Added:
>    tomcat/jk/trunk/native/iis/pcre/chartables.hw

The added file seems to be a C source text, so it needs svn:eol-style=native

> Modified:
>    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/pcre/pcre.amd64
>    tomcat/jk/trunk/native/iis/pcre/pcre.ia64
>    tomcat/jk/trunk/native/iis/pcre/pcre.x86
>
(...)
> Added: tomcat/jk/trunk/native/iis/pcre/chartables.hw
> URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/chartables.hw?rev=1298367&view=auto
> ==============================================================================
> --- tomcat/jk/trunk/native/iis/pcre/chartables.hw (added)
> +++ tomcat/jk/trunk/native/iis/pcre/chartables.hw Thu Mar  8 11:37:26 2012
> @@ -0,0 +1,183 @@
> +/*************************************************
> +*      Perl-Compatible Regular Expressions       *
> +*************************************************/
> +
> +/* This file is automatically written by the dftables auxiliary
> +program. If you edit it by hand, you might like to edit the Makefile to
> +prevent its ever being regenerated.
> +
> +This file is #included in the compilation of pcre.c to build the default
> +character tables which are used when no tables are passed to the compile
> +function. */
> +
> +static unsigned char pcre_default_tables[] = {
> +
> +/* This table is a lower casing table. */
> +
> +    0,  1,  2,  3,  4,  5,  6,  7,
> +    8,  9, 10, 11, 12, 13, 14, 15,
> +   16, 17, 18, 19, 20, 21, 22, 23,
> +   24, 25, 26, 27, 28, 29, 30, 31,
> +   32, 33, 34, 35, 36, 37, 38, 39,
> +   40, 41, 42, 43, 44, 45, 46, 47,
> +   48, 49, 50, 51, 52, 53, 54, 55,
> +   56, 57, 58, 59, 60, 61, 62, 63,
> +   64, 97, 98, 99,100,101,102,103,
> +  104,105,106,107,108,109,110,111,
> +  112,113,114,115,116,117,118,119,
> +  120,121,122, 91, 92, 93, 94, 95,
> +   96, 97, 98, 99,100,101,102,103,
> +  104,105,106,107,108,109,110,111,
> +  112,113,114,115,116,117,118,119,
> +  120,121,122,123,124,125,126,127,
> +  128,129,130,131,132,133,134,135,
> +  136,137,138,139,140,141,142,143,
> +  144,145,146,147,148,149,150,151,
> +  152,153,154,155,156,157,158,159,
> +  160,161,162,163,164,165,166,167,
> +  168,169,170,171,172,173,174,175,
> +  176,177,178,179,180,181,182,183,
> +  184,185,186,187,188,189,190,191,
> +  192,193,194,195,196,197,198,199,
> +  200,201,202,203,204,205,206,207,
> +  208,209,210,211,212,213,214,215,
> +  216,217,218,219,220,221,222,223,
> +  224,225,226,227,228,229,230,231,
> +  232,233,234,235,236,237,238,239,
> +  240,241,242,243,244,245,246,247,
> +  248,249,250,251,252,253,254,255,
> +
> +/* This table is a case flipping table. */
> +
> +    0,  1,  2,  3,  4,  5,  6,  7,
> +    8,  9, 10, 11, 12, 13, 14, 15,
> +   16, 17, 18, 19, 20, 21, 22, 23,
> +   24, 25, 26, 27, 28, 29, 30, 31,
> +   32, 33, 34, 35, 36, 37, 38, 39,
> +   40, 41, 42, 43, 44, 45, 46, 47,
> +   48, 49, 50, 51, 52, 53, 54, 55,
> +   56, 57, 58, 59, 60, 61, 62, 63,
> +   64, 97, 98, 99,100,101,102,103,
> +  104,105,106,107,108,109,110,111,
> +  112,113,114,115,116,117,118,119,
> +  120,121,122, 91, 92, 93, 94, 95,
> +   96, 65, 66, 67, 68, 69, 70, 71,
> +   72, 73, 74, 75, 76, 77, 78, 79,
> +   80, 81, 82, 83, 84, 85, 86, 87,
> +   88, 89, 90,123,124,125,126,127,
> +  128,129,130,131,132,133,134,135,
> +  136,137,138,139,140,141,142,143,
> +  144,145,146,147,148,149,150,151,
> +  152,153,154,155,156,157,158,159,
> +  160,161,162,163,164,165,166,167,
> +  168,169,170,171,172,173,174,175,
> +  176,177,178,179,180,181,182,183,
> +  184,185,186,187,188,189,190,191,
> +  192,193,194,195,196,197,198,199,
> +  200,201,202,203,204,205,206,207,
> +  208,209,210,211,212,213,214,215,
> +  216,217,218,219,220,221,222,223,
> +  224,225,226,227,228,229,230,231,
> +  232,233,234,235,236,237,238,239,
> +  240,241,242,243,244,245,246,247,
> +  248,249,250,251,252,253,254,255,
> +
> +/* This table contains bit maps for various character classes.
> +Each map is 32 bytes long and the bits run from the least
> +significant end of each byte. The classes that have their own
> +maps are: space, xdigit, digit, upper, lower, word, graph
> +print, punct, and cntrl. Other classes are built from combinations. */
> +
> +  0x00,0x3e,0x00,0x00,0x01,0x00,0x00,0x00,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +
> +  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
> +  0x7e,0x00,0x00,0x00,0x7e,0x00,0x00,0x00,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +
> +  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +  0xfe,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +  0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0x07,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +
> +  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
> +  0xfe,0xff,0xff,0x87,0xfe,0xff,0xff,0x07,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +
> +  0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
> +  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +
> +  0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
> +  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +
> +  0x00,0x00,0x00,0x00,0xfe,0xff,0x00,0xfc,
> +  0x01,0x00,0x00,0xf8,0x01,0x00,0x00,0x78,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +
> +  0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
> +
> +/* This table identifies various classes of character by individual bits:
> +  0x01   white space character
> +  0x02   letter
> +  0x04   decimal digit
> +  0x08   hexadecimal digit
> +  0x10   alphanumeric or '_'
> +  0x80   regular expression metacharacter or binary zero
> +*/
> +
> +  0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
> +  0x00,0x01,0x01,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  16- 23 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31 */
> +  0x01,0x00,0x00,0x00,0x80,0x00,0x00,0x00, /*    - '  */
> +  0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x00, /*  ( - /  */
> +  0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c, /*  0 - 7  */
> +  0x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x80, /*  8 - ?  */
> +  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  @ - G  */
> +  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  H - O  */
> +  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  P - W  */
> +  0x12,0x12,0x12,0x80,0x00,0x00,0x80,0x10, /*  X - _  */
> +  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  ` - g  */
> +  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  h - o  */
> +  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  p - w  */
> +  0x12,0x12,0x12,0x80,0x80,0x00,0x00,0x00, /*  x -127 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 128-135 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 136-143 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144-151 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 152-159 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 160-167 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 168-175 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 176-183 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 184-191 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 192-199 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 200-207 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 208-215 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 216-223 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 224-231 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 232-239 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
> +  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
> +
> +/* End of chartables.c */
>

Best regards,
Konstantin Kolinko

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org