You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by pc...@hyperreal.org on 1999/03/19 12:48:58 UTC
cvs commit: apache-1.3/src/os/win32/installer apache.iwz
pcs 99/03/19 03:48:58
Modified: src/os/win32/installer apache.iwz
Log:
Update file lists to Apache 1.3.5-dev.
Run the installer DLL before the "Setup Complete" dialog box rather than
just befoer IS exits. The Setup Complete dialog is the one that prompts
for a reboot, if necessary, so this should get make the installer run
before the reboot. See PR 3988.
Update the Apache start menu icons: add icon to shutdown Apache console
app (-k) and to uninstall Apache service (-u). Rename Start Apache to
Start Apache as console app, and add the -s option to avoid use of
the service manager.
Revision Changes Path
1.19 +73 -52 apache-1.3/src/os/win32/installer/apache.iwz
Index: apache.iwz
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/installer/apache.iwz,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- apache.iwz 1999/01/30 13:03:45 1.18
+++ apache.iwz 1999/03/19 11:48:57 1.19
@@ -36,7 +36,6 @@
Version=2.02
DevTool=Generic Windows
Platform=Win32
-DisksBuilt=1
DisksDir=apache\650MB\
TabsVisit=1111001110000111100011
LangNum=451
@@ -99,7 +98,7 @@
[Groups]
Groups=34
-Group1Size=513790
+Group1Size=519176
Group1Files=9
Group1Name=Program Executables
Group1Dir=<INSTALLDIR>
@@ -114,7 +113,7 @@
Group1File7=C:\Apache\README
Group1File8=C:\apache\Makefile.tmpl
Group1File9=C:\apache\README-NT.TXT
-Group2Size=265216
+Group2Size=265728
Group2Files=10
Group2Name=Additional Modules
Group2Dir=<INSTALLDIR>\modules
@@ -150,7 +149,7 @@
Group4TargetOS=-1
Group4File1=C:\Apache\htdocs\index.html
Group4File2=C:\apache\htdocs\apache_pb.gif
-Group5Size=284610
+Group5Size=285947
Group5Files=34
Group5Name=Manual
Group5Dir=<INSTALLDIR>\htdocs\manual
@@ -204,7 +203,7 @@
Group6File6=C:\apache\htdocs\manual\images\mod_rewrite_fig1.gif
Group6File7=C:\apache\htdocs\manual\images\mod_rewrite_fig2.fig
Group6File8=C:\apache\htdocs\manual\images\mod_rewrite_fig2.gif
-Group7Size=323537
+Group7Size=324837
Group7Files=22
Group7Name=misc
Group7Dir=[Manual]\misc
@@ -232,7 +231,7 @@
Group7File20=C:\Apache\htdocs\manual\misc\vif-info.html
Group7File21=C:\Apache\htdocs\manual\misc\windoz_keepalive.html
Group7File22=C:\apache\htdocs\manual\misc\HTTP_Features.tsv
-Group8Size=540126
+Group8Size=546303
Group8Files=48
Group8Name=mod
Group8Dir=[Manual]\mod
@@ -286,7 +285,7 @@
Group8File46=C:\Apache\htdocs\manual\mod\mod_userdir.html
Group8File47=C:\Apache\htdocs\manual\mod\mod_usertrack.html
Group8File48=C:\apache\htdocs\manual\mod\mod_mmap_static.html
-Group9Size=109856
+Group9Size=109947
Group9Files=13
Group9Name=vhosts
Group9Dir=[Manual]\vhosts
@@ -305,7 +304,7 @@
Group9File11=C:\Apache\htdocs\manual\vhosts\vhosts-in-depth.html
Group9File12=C:\Apache\htdocs\manual\vhosts\virtual-host.html
Group9File13=C:\apache\htdocs\manual\vhosts\mass.html
-Group10Size=509499
+Group10Size=516381
Group10Files=19
Group10Name=src
Group10Dir=<INSTALLDIR>\src
@@ -330,7 +329,7 @@
Group10File17=C:\apache\src\BUILD.NOTES
Group10File18=C:\apache\src\Makefile_win32.txt
Group10File19=C:\apache\src\Makefile_win32_debug.txt
-Group11Size=88267
+Group11Size=92668
Group11Files=10
Group11Name=ap
Group11Dir=[src]\ap
@@ -346,7 +345,7 @@
Group11File8=C:\Apache\src\ap\Makefile.tmpl
Group11File9=C:\apache\src\ap\ap_fnmatch.c
Group11File10=C:\apache\src\ap\ap_md5c.c
-Group12Size=253660
+Group12Size=254586
Group12Files=29
Group12Name=include
Group12Dir=[src]\include
@@ -381,7 +380,7 @@
Group12File27=C:\apache\src\include\ap_config.h
Group12File28=C:\apache\src\include\ap_ctype.h
Group12File29=C:\apache\src\include\ap_mmn.h
-Group13Size=772778
+Group13Size=786600
Group13Files=22
Group13Name=main
Group13Dir=[src]\main
@@ -440,7 +439,7 @@
Group17Update=0
Group17TargetOS=-1
Group17File1=C:\Apache\src\modules\extra\Makefile.tmpl
-Group18Size=204884
+Group18Size=205717
Group18Files=11
Group18Name=proxy
Group18Dir=[modules]\proxy
@@ -457,7 +456,7 @@
Group18File9=C:\apache\src\modules\proxy\proxy_ftp.c
Group18File10=C:\apache\src\modules\proxy\proxy_http.c
Group18File11=C:\apache\src\modules\proxy\proxy_util.c
-Group19Size=861166
+Group19Size=861768
Group19Files=36
Group19Name=standard
Group19Dir=[modules]\standard
@@ -530,47 +529,47 @@
Group20File23=C:\Apache\src\regex\tests
Group20File24=C:\Apache\src\regex\utils.h
Group20File25=C:\Apache\src\regex\WHATSNEW
-Group21Size=195047
+Group21Size=201986
Group21Files=28
Group21Name=support
Group21Dir=[src]\support
Group21Update=0
Group21TargetOS=-1
-Group21File1=C:\apache\src\support\ab.1
-Group21File2=C:\apache\src\support\ab.c
-Group21File3=C:\apache\src\support\apachectl
-Group21File4=C:\apache\src\support\apachectl.1
-Group21File5=C:\apache\src\support\apxs.8
-Group21File6=C:\apache\src\support\apxs.pl
-Group21File7=C:\apache\src\support\dbmmanage
-Group21File8=C:\apache\src\support\dbmmanage.1
-Group21File9=C:\apache\src\support\htdigest.1
-Group21File10=C:\apache\src\support\htdigest.c
-Group21File11=C:\apache\src\support\htpasswd.1
-Group21File12=C:\apache\src\support\htpasswd.c
-Group21File13=C:\apache\src\support\httpd.8
-Group21File14=C:\apache\src\support\log_server_status
-Group21File15=C:\apache\src\support\logresolve.8
-Group21File16=C:\apache\src\support\logresolve.c
-Group21File17=C:\apache\src\support\logresolve.pl
-Group21File18=C:\apache\src\support\Makefile.tmpl
-Group21File19=C:\apache\src\support\phf_abuse_log.cgi
-Group21File20=C:\apache\src\support\rotatelogs.8
-Group21File21=C:\apache\src\support\rotatelogs.c
-Group21File22=C:\apache\src\support\split-logfile
-Group21File23=C:\apache\src\support\suexec.8
-Group21File24=C:\apache\src\support\suexec.c
-Group21File25=C:\apache\src\support\suexec.h
-Group21File26=C:\apache\src\support\httpd.exp
-Group21File27=C:\apache\src\support\htpasswd.dsp
-Group21File28=C:\apache\src\support\htpasswd.mak
+Group21File1=C:\apache\src\support\ab.c
+Group21File2=C:\apache\src\support\apachectl
+Group21File3=C:\apache\src\support\apxs.8
+Group21File4=C:\apache\src\support\apxs.pl
+Group21File5=C:\apache\src\support\dbmmanage
+Group21File6=C:\apache\src\support\dbmmanage.1
+Group21File7=C:\apache\src\support\htdigest.1
+Group21File8=C:\apache\src\support\htdigest.c
+Group21File9=C:\apache\src\support\htpasswd.1
+Group21File10=C:\apache\src\support\htpasswd.c
+Group21File11=C:\apache\src\support\httpd.8
+Group21File12=C:\apache\src\support\log_server_status
+Group21File13=C:\apache\src\support\logresolve.8
+Group21File14=C:\apache\src\support\logresolve.c
+Group21File15=C:\apache\src\support\logresolve.pl
+Group21File16=C:\apache\src\support\Makefile.tmpl
+Group21File17=C:\apache\src\support\phf_abuse_log.cgi
+Group21File18=C:\apache\src\support\rotatelogs.8
+Group21File19=C:\apache\src\support\rotatelogs.c
+Group21File20=C:\apache\src\support\split-logfile
+Group21File21=C:\apache\src\support\suexec.8
+Group21File22=C:\apache\src\support\suexec.c
+Group21File23=C:\apache\src\support\suexec.h
+Group21File24=C:\apache\src\support\httpd.exp
+Group21File25=C:\apache\src\support\htpasswd.dsp
+Group21File26=C:\apache\src\support\htpasswd.mak
+Group21File27=C:\apache\src\support\ab.8
+Group21File28=C:\apache\src\support\apachectl.8
Group22Size=0
Group22Files=0
Group22Name=os
Group22Dir=[src]\os
Group22Update=0
Group22TargetOS=-1
-Group23Size=207380
+Group23Size=207484
Group23Files=43
Group23Name=win32
Group23Dir=[os]\win32
@@ -619,7 +618,7 @@
Group23File41=C:\apache\src\os\win32\service.c
Group23File42=C:\apache\src\os\win32\service.h
Group23File43=C:\apache\src\os\win32\util_win32.c
-Group24Size=54784
+Group24Size=84480
Group24Files=1
Group24Name=Installer DLL
Group24Dir=<INSTALLDIR>
@@ -740,7 +739,7 @@
Group30Dir=<INSTALLDIR>\cgi-bin
Group30Update=0
Group30TargetOS=-1
-Group31Size=35569
+Group31Size=35863
Group31Files=2
Group31Name=installer
Group31Dir=[win32]\installer
@@ -748,7 +747,7 @@
Group31TargetOS=-1
Group31File1=C:\apache\src\os\win32\installer\apache.iwz
Group31File2=C:\apache\src\os\win32\installer\README.TXT
-Group32Size=24684
+Group32Size=30356
Group32Files=4
Group32Name=installdll
Group32Dir=[installer]\installdll
@@ -797,7 +796,7 @@
Group33File31=C:\apache\icons\small\patch.gif
Group33File32=C:\apache\icons\small\ps.gif
Group33File33=C:\apache\icons\small\doc.gif
-Group34Size=17312
+Group34Size=21478
Group34Files=8
Group34Name=test
Group34Dir=[installdll]\test
@@ -897,12 +896,12 @@
Regs=5
[Icons]
-Icons=3
-Icon1Param=-d "<INSTALLDIR>"
+Icons=5
+Icon1Param=-d "<INSTALLDIR>" -s
Icon1Cmd=[Program Executables]\Apache.exe
-Icon1Description=Apache Server
+Icon1Description=Start Apache as console app
Icon1WorkingDir=[Program Executables]
-Icon1IconFile=
+Icon1IconFile=[Program Executables]\Apache.exe
Icon1RealFile=C:\Apache\Apache.exe
Icon1WhichIcon=0
Icon1KeyVirtual=0
@@ -931,12 +930,34 @@
Icon3KeyFlags=0
Icon3StartMenu=0
Icon3Window=0
+Icon4Param=-d "<INSTALLDIR>" -u
+Icon4Cmd=[Program Executables]\Apache.exe
+Icon4Description=Uninstall Apache Service (NT only)
+Icon4WorkingDir=[Program Executables]
+Icon4IconFile=
+Icon4RealFile=C:\Apache\Apache.exe
+Icon4WhichIcon=0
+Icon4KeyVirtual=0
+Icon4KeyFlags=0
+Icon4StartMenu=0
+Icon4Window=0
+Icon5Param=-d "<INSTALLDIR>" -k shutdown
+Icon5Cmd=[Program Executables]\Apache.exe
+Icon5Description=Shutdown Apache console app
+Icon5WorkingDir=[Program Executables]
+Icon5IconFile=
+Icon5RealFile=C:\Apache\Apache.exe
+Icon5WhichIcon=0
+Icon5KeyVirtual=0
+Icon5KeyFlags=0
+Icon5StartMenu=0
+Icon5Window=0
[VisualBasic]
PRJFile=
[Ext]
-Ext1Dlg=Exit Install
+Ext1Dlg=Setup Complete
Ext1Param1=[Installer DLL]\install.dll
Ext1Param2=BeforeExit
Ext1Op=DLL