You are viewing a plain text version of this content. The canonical link for it is here.
Posted to win32-msi-cvs@httpd.apache.org by wr...@apache.org on 2008/12/10 07:57:01 UTC
svn commit: r725016 [1/3] - in /httpd/httpd/win32-msi/trunk:
apache_2.2-win32.ism awk/proctab.c awk/ytab.c awk/ytab.h
Author: wrowe
Date: Tue Dec 9 22:57:01 2008
New Revision: 725016
URL: http://svn.apache.org/viewvc?rev=725016&view=rev
Log:
very simple transition to 2.2.11
Modified:
httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism
httpd/httpd/win32-msi/trunk/awk/proctab.c
httpd/httpd/win32-msi/trunk/awk/ytab.c
httpd/httpd/win32-msi/trunk/awk/ytab.h
Modified: httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism
URL: http://svn.apache.org/viewvc/httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism?rev=725016&r1=725015&r2=725016&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism (original)
+++ httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism Tue Dec 9 22:57:01 2008
@@ -2420,8 +2420,8 @@
<col def="S255">Value</col>
<col def="S255">TestValue</col>
<col def="i4">Type</col>
- <row><td>ApacheBuildFolder</td><td>d:\asf-build\build-2.2.10\</td><td/><td>2</td></row>
- <row><td>ApacheTargetFolder</td><td>d:\asf-build\target-2.2.10\</td><td/><td>2</td></row>
+ <row><td>ApacheBuildFolder</td><td>d:\asf-build\build-2.2.11\</td><td/><td>2</td></row>
+ <row><td>ApacheTargetFolder</td><td>d:\asf-build\target-2.2.11\</td><td/><td>2</td></row>
<row><td>CommonFilesFolder</td><td/><td/><td>1</td></row>
<row><td>ISPROJECTDIR</td><td/><td/><td>1</td></row>
<row><td>ISProductFolder</td><td/><td/><td>1</td></row>
@@ -2453,8 +2453,8 @@
<row><td>win32</td><td>Comments</td><td>##IDS_Dev_Warning##</td></row>
<row><td>win32</td><td>PackageCode</td><td>{69492F41-747E-42B4-BF27-5C49212C5F24}</td></row>
<row><td>win32</td><td>ProductCode</td><td>{85262A06-2D8C-4BC1-B6ED-5A705D09CFFC}</td></row>
- <row><td>win32</td><td>ProductName</td><td>Apache HTTP Server 2.2.10</td></row>
- <row><td>win32</td><td>ProductVersion</td><td>2.2.10</td></row>
+ <row><td>win32</td><td>ProductName</td><td>Apache HTTP Server 2.2.11</td></row>
+ <row><td>win32</td><td>ProductVersion</td><td>2.2.11</td></row>
<row><td>win32</td><td>SetupFileName</td><td>setup</td></row>
<row><td>win32</td><td>Subject</td><td>##AppProduct_Description##</td></row>
<row><td>win32</td><td>Title</td><td>##IDS_Package_Title##</td></row>
@@ -2707,7 +2707,7 @@
<col def="I2">Encoded</col>
<col def="S0">Comment</col>
<col def="I4">TimeStamp</col>
- <row><td>AppProduct</td><td>1033</td><td>Apache HTTP Server 2.2.10</td><td>0</td><td>SYSTEM_GENERATED</td><td>1578731275</td></row>
+ <row><td>AppProduct</td><td>1033</td><td>Apache HTTP Server 2.2.11</td><td>0</td><td>SYSTEM_GENERATED</td><td>1578731275</td></row>
<row><td>AppProduct_Description</td><td>1033</td><td>The Apache HTTP Web Server Version 2.2</td><td>0</td><td/><td>1712964623</td></row>
<row><td>AppProduct_ShortLongName</td><td>1033</td><td>APACHE~1.2|Apache HTTP Server 2.2</td><td>0</td><td/><td>1712971342</td></row>
<row><td>AppPublisher</td><td>1033</td><td>Apache Software Foundation</td><td>0</td><td/><td>1360611656</td></row>
@@ -4588,7 +4588,7 @@
<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
<row><td>ProductCode</td><td>{8F721A14-795E-4D11-87DC-CD5778E45D05}</td><td/></row>
<row><td>ProductName</td><td>Apache HTTP Server 2.2</td><td/></row>
- <row><td>ProductVersion</td><td>2.2.10</td><td/></row>
+ <row><td>ProductVersion</td><td>2.2.11</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
<row><td>ProgressType2</td><td>installed</td><td/></row>
@@ -4658,10 +4658,10 @@
<col def="S0">Value</col>
<col def="s72">Component_</col>
<col def="I4">ISAttributes</col>
- <row><td>Registry1</td><td>2</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.10</td><td>ServerRoot</td><td>[INSTALLDIR]</td><td>ApacheAdmin</td><td>0</td></row>
+ <row><td>Registry1</td><td>2</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.11</td><td>ServerRoot</td><td>[INSTALLDIR]</td><td>ApacheAdmin</td><td>0</td></row>
<row><td>Registry10</td><td>2</td><td>SOFTWARE\Classes\sofile</td><td/><td>Apache Loadable Module</td><td>ApacheAdmin</td><td>0</td></row>
- <row><td>Registry11</td><td>1</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.10</td><td>Installed</td><td>#1</td><td>ApacheNonAdmin</td><td>0</td></row>
- <row><td>Registry2</td><td>2</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.10</td><td>Shared</td><td>#1</td><td>ApacheAdmin</td><td>0</td></row>
+ <row><td>Registry11</td><td>1</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.11</td><td>Installed</td><td>#1</td><td>ApacheNonAdmin</td><td>0</td></row>
+ <row><td>Registry2</td><td>2</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.11</td><td>Shared</td><td>#1</td><td>ApacheAdmin</td><td>0</td></row>
<row><td>Registry3</td><td>2</td><td>SOFTWARE\Classes\.conf</td><td/><td>txtfile</td><td>ApacheAdmin</td><td>0</td></row>
<row><td>Registry4</td><td>2</td><td>SOFTWARE\Classes\.conf</td><td>Content Type</td><td>text/plain</td><td>ApacheAdmin</td><td>0</td></row>
<row><td>Registry5</td><td>2</td><td>SOFTWARE\Classes\.log</td><td/><td>txtfile</td><td>ApacheAdmin</td><td>0</td></row>
Modified: httpd/httpd/win32-msi/trunk/awk/proctab.c
URL: http://svn.apache.org/viewvc/httpd/httpd/win32-msi/trunk/awk/proctab.c?rev=725016&r1=725015&r2=725016&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/awk/proctab.c (original)
+++ httpd/httpd/win32-msi/trunk/awk/proctab.c Tue Dec 9 22:57:01 2008
@@ -3,99 +3,99 @@
#include "ytab.h"
static char *printname[93] = {
- (char *) "FIRSTTOKEN", /* 258 */
- (char *) "PROGRAM", /* 259 */
- (char *) "PASTAT", /* 260 */
- (char *) "PASTAT2", /* 261 */
- (char *) "XBEGIN", /* 262 */
- (char *) "XEND", /* 263 */
- (char *) "NL", /* 264 */
- (char *) "ARRAY", /* 265 */
- (char *) "MATCH", /* 266 */
- (char *) "NOTMATCH", /* 267 */
- (char *) "MATCHOP", /* 268 */
- (char *) "FINAL", /* 269 */
- (char *) "DOT", /* 270 */
- (char *) "ALL", /* 271 */
- (char *) "CCL", /* 272 */
- (char *) "NCCL", /* 273 */
- (char *) "CHAR", /* 274 */
- (char *) "OR", /* 275 */
- (char *) "STAR", /* 276 */
- (char *) "QUEST", /* 277 */
- (char *) "PLUS", /* 278 */
- (char *) "EMPTYRE", /* 279 */
- (char *) "AND", /* 280 */
- (char *) "BOR", /* 281 */
- (char *) "APPEND", /* 282 */
- (char *) "EQ", /* 283 */
- (char *) "GE", /* 284 */
- (char *) "GT", /* 285 */
- (char *) "LE", /* 286 */
- (char *) "LT", /* 287 */
- (char *) "NE", /* 288 */
- (char *) "IN", /* 289 */
- (char *) "ARG", /* 290 */
- (char *) "BLTIN", /* 291 */
- (char *) "BREAK", /* 292 */
- (char *) "CLOSE", /* 293 */
- (char *) "CONTINUE", /* 294 */
- (char *) "DELETE", /* 295 */
- (char *) "DO", /* 296 */
- (char *) "EXIT", /* 297 */
- (char *) "FOR", /* 298 */
- (char *) "FUNC", /* 299 */
- (char *) "SUB", /* 300 */
- (char *) "GSUB", /* 301 */
- (char *) "IF", /* 302 */
- (char *) "INDEX", /* 303 */
- (char *) "LSUBSTR", /* 304 */
- (char *) "MATCHFCN", /* 305 */
- (char *) "NEXT", /* 306 */
- (char *) "NEXTFILE", /* 307 */
- (char *) "ADD", /* 308 */
- (char *) "MINUS", /* 309 */
- (char *) "MULT", /* 310 */
- (char *) "DIVIDE", /* 311 */
- (char *) "MOD", /* 312 */
- (char *) "ASSIGN", /* 313 */
- (char *) "ASGNOP", /* 314 */
- (char *) "ADDEQ", /* 315 */
- (char *) "SUBEQ", /* 316 */
- (char *) "MULTEQ", /* 317 */
- (char *) "DIVEQ", /* 318 */
- (char *) "MODEQ", /* 319 */
- (char *) "POWEQ", /* 320 */
- (char *) "PRINT", /* 321 */
- (char *) "PRINTF", /* 322 */
- (char *) "SPRINTF", /* 323 */
- (char *) "ELSE", /* 324 */
- (char *) "INTEST", /* 325 */
- (char *) "CONDEXPR", /* 326 */
- (char *) "POSTINCR", /* 327 */
- (char *) "PREINCR", /* 328 */
- (char *) "POSTDECR", /* 329 */
- (char *) "PREDECR", /* 330 */
- (char *) "VAR", /* 331 */
- (char *) "IVAR", /* 332 */
- (char *) "VARNF", /* 333 */
- (char *) "CALL", /* 334 */
- (char *) "NUMBER", /* 335 */
- (char *) "STRING", /* 336 */
- (char *) "REGEXPR", /* 337 */
- (char *) "GETLINE", /* 338 */
- (char *) "SUBSTR", /* 339 */
- (char *) "SPLIT", /* 340 */
- (char *) "RETURN", /* 341 */
- (char *) "WHILE", /* 342 */
- (char *) "CAT", /* 343 */
+ (char *) "FIRSTTOKEN", /* 257 */
+ (char *) "PROGRAM", /* 258 */
+ (char *) "PASTAT", /* 259 */
+ (char *) "PASTAT2", /* 260 */
+ (char *) "XBEGIN", /* 261 */
+ (char *) "XEND", /* 262 */
+ (char *) "NL", /* 263 */
+ (char *) "ARRAY", /* 264 */
+ (char *) "MATCH", /* 265 */
+ (char *) "NOTMATCH", /* 266 */
+ (char *) "MATCHOP", /* 267 */
+ (char *) "FINAL", /* 268 */
+ (char *) "DOT", /* 269 */
+ (char *) "ALL", /* 270 */
+ (char *) "CCL", /* 271 */
+ (char *) "NCCL", /* 272 */
+ (char *) "CHAR", /* 273 */
+ (char *) "OR", /* 274 */
+ (char *) "STAR", /* 275 */
+ (char *) "QUEST", /* 276 */
+ (char *) "PLUS", /* 277 */
+ (char *) "EMPTYRE", /* 278 */
+ (char *) "AND", /* 279 */
+ (char *) "BOR", /* 280 */
+ (char *) "APPEND", /* 281 */
+ (char *) "EQ", /* 282 */
+ (char *) "GE", /* 283 */
+ (char *) "GT", /* 284 */
+ (char *) "LE", /* 285 */
+ (char *) "LT", /* 286 */
+ (char *) "NE", /* 287 */
+ (char *) "IN", /* 288 */
+ (char *) "ARG", /* 289 */
+ (char *) "BLTIN", /* 290 */
+ (char *) "BREAK", /* 291 */
+ (char *) "CLOSE", /* 292 */
+ (char *) "CONTINUE", /* 293 */
+ (char *) "DELETE", /* 294 */
+ (char *) "DO", /* 295 */
+ (char *) "EXIT", /* 296 */
+ (char *) "FOR", /* 297 */
+ (char *) "FUNC", /* 298 */
+ (char *) "SUB", /* 299 */
+ (char *) "GSUB", /* 300 */
+ (char *) "IF", /* 301 */
+ (char *) "INDEX", /* 302 */
+ (char *) "LSUBSTR", /* 303 */
+ (char *) "MATCHFCN", /* 304 */
+ (char *) "NEXT", /* 305 */
+ (char *) "NEXTFILE", /* 306 */
+ (char *) "ADD", /* 307 */
+ (char *) "MINUS", /* 308 */
+ (char *) "MULT", /* 309 */
+ (char *) "DIVIDE", /* 310 */
+ (char *) "MOD", /* 311 */
+ (char *) "ASSIGN", /* 312 */
+ (char *) "ASGNOP", /* 313 */
+ (char *) "ADDEQ", /* 314 */
+ (char *) "SUBEQ", /* 315 */
+ (char *) "MULTEQ", /* 316 */
+ (char *) "DIVEQ", /* 317 */
+ (char *) "MODEQ", /* 318 */
+ (char *) "POWEQ", /* 319 */
+ (char *) "PRINT", /* 320 */
+ (char *) "PRINTF", /* 321 */
+ (char *) "SPRINTF", /* 322 */
+ (char *) "ELSE", /* 323 */
+ (char *) "INTEST", /* 324 */
+ (char *) "CONDEXPR", /* 325 */
+ (char *) "POSTINCR", /* 326 */
+ (char *) "PREINCR", /* 327 */
+ (char *) "POSTDECR", /* 328 */
+ (char *) "PREDECR", /* 329 */
+ (char *) "VAR", /* 330 */
+ (char *) "IVAR", /* 331 */
+ (char *) "VARNF", /* 332 */
+ (char *) "CALL", /* 333 */
+ (char *) "NUMBER", /* 334 */
+ (char *) "STRING", /* 335 */
+ (char *) "REGEXPR", /* 336 */
+ (char *) "GETLINE", /* 337 */
+ (char *) "RETURN", /* 338 */
+ (char *) "SPLIT", /* 339 */
+ (char *) "SUBSTR", /* 340 */
+ (char *) "WHILE", /* 341 */
+ (char *) "CAT", /* 342 */
+ (char *) "NOT", /* 343 */
(char *) "UMINUS", /* 344 */
- (char *) "NOT", /* 345 */
- (char *) "POWER", /* 346 */
+ (char *) "POWER", /* 345 */
+ (char *) "DECR", /* 346 */
(char *) "INCR", /* 347 */
- (char *) "DECR", /* 348 */
- (char *) "INDIRECT", /* 349 */
- (char *) "LASTTOKEN", /* 350 */
+ (char *) "INDIRECT", /* 348 */
+ (char *) "LASTTOKEN", /* 349 */
};
@@ -181,16 +181,16 @@
nullproc, /* STRING */
nullproc, /* REGEXPR */
getline, /* GETLINE */
- substr, /* SUBSTR */
- split, /* SPLIT */
jump, /* RETURN */
+ split, /* SPLIT */
+ substr, /* SUBSTR */
whilestat, /* WHILE */
cat, /* CAT */
- arith, /* UMINUS */
boolop, /* NOT */
+ arith, /* UMINUS */
arith, /* POWER */
- nullproc, /* INCR */
nullproc, /* DECR */
+ nullproc, /* INCR */
indirect, /* INDIRECT */
nullproc, /* LASTTOKEN */
};
---------------------------------------------------------------------
To unsubscribe, e-mail: win32-msi-cvs-unsubscribe@httpd.apache.org
For additional commands, e-mail: win32-msi-cvs-help@httpd.apache.org